/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1714 by persson, Thu Mar 6 20:50:04 2008 UTC revision 1959 by persson, Fri Jul 31 10:15:27 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006 - 2008 Andreas Persson   * Copyright (C) 2006-2009 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 26  Line 26 
26  #include <gtkmm/targetentry.h>  #include <gtkmm/targetentry.h>
27  #include <gtkmm/main.h>  #include <gtkmm/main.h>
28  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
29    #include "wrapLabel.hh"
30    
31  #include "global.h"  #include "global.h"
32    
# Line 129  MainWindow::MainWindow() : Line 130  MainWindow::MainWindow() :
130      m_HPaned.add2(dimreg_vbox);      m_HPaned.add2(dimreg_vbox);
131    
132    
133      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, "Samples");      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
134      m_TreeViewNotebook.append_page(m_ScrolledWindow, "Instruments");      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
135    
136    
137      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
# Line 202  MainWindow::MainWindow() : Line 203  MainWindow::MainWindow() :
203          sigc::mem_fun(*this, &MainWindow::on_action_add_group)          sigc::mem_fun(*this, &MainWindow::on_action_add_group)
204      );      );
205      actionGroup->add(      actionGroup->add(
206          Gtk::Action::create("AddSample", _("Add _Sample(s)")),          Gtk::Action::create("AddSample", _("Add _Sample(s)...")),
207          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
208      );      );
209      actionGroup->add(      actionGroup->add(
# Line 210  MainWindow::MainWindow() : Line 211  MainWindow::MainWindow() :
211          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
212      );      );
213      actionGroup->add(      actionGroup->add(
214          Gtk::Action::create("ReplaceAllSamplesInAllGroups", _("Replace All Samples In All Groups")),          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
215                                _("Replace All Samples in All Groups...")),
216          sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)          sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
217      );      );
218    
# Line 569  void MainWindow::on_action_file_new() Line 571  void MainWindow::on_action_file_new()
571      gig::File* pFile = new gig::File;      gig::File* pFile = new gig::File;
572      // already add one new instrument by default      // already add one new instrument by default
573      gig::Instrument* pInstrument = pFile->AddInstrument();      gig::Instrument* pInstrument = pFile->AddInstrument();
574      pInstrument->pInfo->Name = "Unnamed Instrument";      pInstrument->pInfo->Name = _("Unnamed Instrument");
575      // update GUI with that new gig::File      // update GUI with that new gig::File
576      load_gig(pFile, 0 /*no file name yet*/);      load_gig(pFile, 0 /*no file name yet*/);
577  }  }
# Line 624  void MainWindow::on_action_file_open() Line 626  void MainWindow::on_action_file_open()
626      Gtk::FileFilter filter;      Gtk::FileFilter filter;
627      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
628      dialog.set_filter(filter);      dialog.set_filter(filter);
629      if (current_dir != "") {      if (current_gig_dir != "") {
630          dialog.set_current_folder(current_dir);          dialog.set_current_folder(current_gig_dir);
631      }      }
632      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
633          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
634          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
635          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Thread::self());
636          load_file(filename.c_str());          load_file(filename.c_str());
637          current_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
638      }      }
639  }  }
640    
641  void MainWindow::load_file(const char* name)  void MainWindow::load_file(const char* name)
642  {  {
643      __clear();      __clear();
644      load_dialog = new LoadDialog("Loading...", *this);      load_dialog = new LoadDialog(_("Loading..."), *this);
645      load_dialog->show_all();      load_dialog->show_all();
646      loader = new Loader(strdup(name));      loader = new Loader(strdup(name));
647      loader->signal_progress().connect(      loader->signal_progress().connect(
# Line 758  bool MainWindow::file_save_as() Line 760  bool MainWindow::file_save_as()
760      {      {
761          std::string basename = Glib::path_get_basename(filename);          std::string basename = Glib::path_get_basename(filename);
762          std::string dir = Glib::path_get_dirname(filename);          std::string dir = Glib::path_get_dirname(filename);
763          basename = std::string("copy_of_") + basename;          basename = std::string(_("copy_of_")) + basename;
764          Glib::ustring copyFileName = Glib::build_filename(dir, basename);          Glib::ustring copyFileName = Glib::build_filename(dir, basename);
765          if (Glib::path_is_absolute(filename)) {          if (Glib::path_is_absolute(filename)) {
766              dialog.set_filename(copyFileName);              dialog.set_filename(copyFileName);
767          } else {          } else {
768              if (current_dir != "") dialog.set_current_folder(current_dir);              if (current_gig_dir != "") dialog.set_current_folder(current_gig_dir);
769          }          }
770          dialog.set_current_name(Glib::filename_display_basename(copyFileName));          dialog.set_current_name(Glib::filename_display_basename(copyFileName));
771      }      }
# Line 773  bool MainWindow::file_save_as() Line 775  bool MainWindow::file_save_as()
775      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
776      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
777      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
778      warningIcon.show();      view::WrapLabel description;
     Gtk::Label description;  
779      description.set_markup(      description.set_markup(
780          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
781            "<span style=\"italic\">\"Save\"</span> dialog instead of "            "<span style=\"italic\">\"Save\"</span> dialog instead of "
# Line 783  bool MainWindow::file_save_as() Line 784  bool MainWindow::file_save_as()
784            "<span style=\"italic\">\"Save As...\"</span> for writing to the "            "<span style=\"italic\">\"Save As...\"</span> for writing to the "
785            "same .gig file will end up in corrupted sample wave data!\n")            "same .gig file will end up in corrupted sample wave data!\n")
786      );      );
787      description.set_line_wrap(true);      descriptionArea.pack_start(description);
     descriptionArea.pack_start(description, Gtk::PACK_SHRINK);  
     description.show();  
788      dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
789      descriptionArea.show();      descriptionArea.show_all();
790    
791      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
792          file_structure_to_be_changed_signal.emit(this->file);          file_structure_to_be_changed_signal.emit(this->file);
# Line 799  bool MainWindow::file_save_as() Line 798  bool MainWindow::file_save_as()
798              printf("filename=%s\n", filename.c_str());              printf("filename=%s\n", filename.c_str());
799              file->Save(filename);              file->Save(filename);
800              this->filename = filename;              this->filename = filename;
801              current_dir = Glib::path_get_dirname(filename);              current_gig_dir = Glib::path_get_dirname(filename);
802              set_title(Glib::filename_display_basename(filename));              set_title(Glib::filename_display_basename(filename));
803              file_has_name = true;              file_has_name = true;
804              file_is_changed = false;              file_is_changed = false;
# Line 829  void MainWindow::__import_queued_samples Line 828  void MainWindow::__import_queued_samples
828          info.format = 0;          info.format = 0;
829          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
830          try {          try {
831              if (!hFile) throw std::string("could not open file");              if (!hFile) throw std::string(_("could not open file"));
832              // determine sample's bit depth              // determine sample's bit depth
833              int bitdepth;              int bitdepth;
834              switch (info.format & 0xff) {              switch (info.format & 0xff) {
# Line 846  void MainWindow::__import_queued_samples Line 845  void MainWindow::__import_queued_samples
845                      break;                      break;
846                  default:                  default:
847                      sf_close(hFile); // close sound file                      sf_close(hFile); // close sound file
848                      throw std::string("format not supported"); // unsupported subformat (yet?)                      throw std::string(_("format not supported")); // unsupported subformat (yet?)
849              }              }
850    
851              const int bufsize = 10000;              const int bufsize = 10000;
# Line 888  void MainWindow::__import_queued_samples Line 887  void MainWindow::__import_queued_samples
887              }              }
888              // cleanup              // cleanup
889              sf_close(hFile);              sf_close(hFile);
890                // let the sampler re-cache the sample if needed
891                sample_changed_signal.emit(iter->gig_sample);
892              // on success we remove the sample from the import queue,              // on success we remove the sample from the import queue,
893              // otherwise keep it, maybe it works the next time ?              // otherwise keep it, maybe it works the next time ?
894              std::list<SampleImportItem>::iterator cur = iter;              std::list<SampleImportItem>::iterator cur = iter;
# Line 918  void MainWindow::on_action_help_about() Line 919  void MainWindow::on_action_help_about()
919  {  {
920  #ifdef ABOUT_DIALOG  #ifdef ABOUT_DIALOG
921      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
922    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
923        dialog.set_program_name("Gigedit");
924    #else
925        dialog.set_name("Gigedit");
926    #endif
927      dialog.set_version(VERSION);      dialog.set_version(VERSION);
928      dialog.set_copyright("Copyright (C) 2006,2007 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2009 Andreas Persson");
929      dialog.set_comments(      dialog.set_comments(_(
930          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
931          "\n"          "\n"
932          "Please notice that this is still a very young instrument editor. "          "Please notice that this is still a very young instrument editor. "
933          "So better backup your Gigasampler files before editing them with "          "So better backup your Gigasampler files before editing them with "
934          "this application.\n"          "this application.\n"
935          "\n"          "\n"
936          "Please report bugs to: http://bugs.linuxsampler.org"          "Please report bugs to: http://bugs.linuxsampler.org")
937      );      );
938      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
939      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
# Line 937  void MainWindow::on_action_help_about() Line 943  void MainWindow::on_action_help_about()
943    
944  PropDialog::PropDialog()  PropDialog::PropDialog()
945      : table(2,1),      : table(2,1),
946        eName("Name"),        eName(_("Name")),
947        eCreationDate("Creation date"),        eCreationDate(_("Creation date")),
948        eComments("Comments"),        eComments(_("Comments")),
949        eProduct("Product"),        eProduct(_("Product")),
950        eCopyright("Copyright"),        eCopyright(_("Copyright")),
951        eArtists("Artists"),        eArtists(_("Artists")),
952        eGenre("Genre"),        eGenre(_("Genre")),
953        eKeywords("Keywords"),        eKeywords(_("Keywords")),
954        eEngineer("Engineer"),        eEngineer(_("Engineer")),
955        eTechnician("Technician"),        eTechnician(_("Technician")),
956        eSoftware("Software"),        eSoftware(_("Software")),
957        eMedium("Medium"),        eMedium(_("Medium")),
958        eSource("Source"),        eSource(_("Source")),
959        eSourceForm("Source form"),        eSourceForm(_("Source form")),
960        eCommissioned("Commissioned"),        eCommissioned(_("Commissioned")),
961        eSubject("Subject"),        eSubject(_("Subject")),
962        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
963        update_model(0)        update_model(0)
964  {  {
965      set_title("File Properties");      set_title(_("File Properties"));
966      eName.set_width_chars(50);      eName.set_width_chars(50);
967    
968      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
# Line 1074  void InstrumentProps::set_DimensionKeyRa Line 1080  void InstrumentProps::set_DimensionKeyRa
1080  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1081      : table(2,1),      : table(2,1),
1082        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1083        eName("Name"),        eName(_("Name")),
1084        eIsDrum("Is drum"),        eIsDrum(_("Is drum")),
1085        eMIDIBank("MIDI bank", 0, 16383),        eMIDIBank(_("MIDI bank"), 0, 16383),
1086        eMIDIProgram("MIDI program"),        eMIDIProgram(_("MIDI program")),
1087        eAttenuation("Attenuation", 0, 96, 0, 1),        eAttenuation(_("Attenuation"), 0, 96, 0, 1),
1088        eGainPlus6("Gain +6dB", eAttenuation, -6),        eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
1089        eEffectSend("Effect send", 0, 65535),        eEffectSend(_("Effect send"), 0, 65535),
1090        eFineTune("Fine tune", -8400, 8400),        eFineTune(_("Fine tune"), -8400, 8400),
1091        ePitchbendRange("Pitchbend range", 0, 12),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1092        ePianoReleaseMode("Piano release mode"),        ePianoReleaseMode(_("Piano release mode")),
1093        eDimensionKeyRangeLow("Keyswitching range low"),        eDimensionKeyRangeLow(_("Keyswitching range low")),
1094        eDimensionKeyRangeHigh("Keyswitching range high"),        eDimensionKeyRangeHigh(_("Keyswitching range high")),
1095        update_model(0)        update_model(0)
1096  {  {
1097      set_title("Instrument Properties");      set_title(_("Instrument Properties"));
1098    
1099      eDimensionKeyRangeLow.set_tip(      eDimensionKeyRangeLow.set_tip(
1100          _("start of the keyboard area which should switch the "          _("start of the keyboard area which should switch the "
# Line 1313  void MainWindow::on_action_add_instrumen Line 1319  void MainWindow::on_action_add_instrumen
1319      gig::Instrument* instrument = file->AddInstrument();      gig::Instrument* instrument = file->AddInstrument();
1320      __instrument_indexer++;      __instrument_indexer++;
1321      instrument->pInfo->Name =      instrument->pInfo->Name =
1322          "Unnamed Instrument " + ToString(__instrument_indexer);          _("Unnamed Instrument ") + ToString(__instrument_indexer);
1323      // update instrument tree view      // update instrument tree view
1324      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1325      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
# Line 1356  void MainWindow::on_action_remove_instru Line 1362  void MainWindow::on_action_remove_instru
1362  void MainWindow::on_action_sample_properties() {  void MainWindow::on_action_sample_properties() {
1363      //TODO: show a dialog where the selected sample's properties can be edited      //TODO: show a dialog where the selected sample's properties can be edited
1364      Gtk::MessageDialog msg(      Gtk::MessageDialog msg(
1365          *this, "Sorry, yet to be implemented!", false, Gtk::MESSAGE_INFO          *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO
1366      );      );
1367      msg.run();      msg.run();
1368  }  }
# Line 1365  void MainWindow::on_action_add_group() { Line 1371  void MainWindow::on_action_add_group() {
1371      static int __sample_indexer = 0;      static int __sample_indexer = 0;
1372      if (!file) return;      if (!file) return;
1373      gig::Group* group = file->AddGroup();      gig::Group* group = file->AddGroup();
1374      group->Name = "Unnamed Group";      group->Name = _("Unnamed Group");
1375      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
1376      __sample_indexer++;      __sample_indexer++;
1377      // update sample tree view      // update sample tree view
# Line 1409  void MainWindow::on_action_add_sample() Line 1415  void MainWindow::on_action_add_sample()
1415      };      };
1416      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1417          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1418      soundfilter.set_name("Sound Files");      soundfilter.set_name(_("Sound Files"));
1419      Gtk::FileFilter allpassfilter; // matches every file      Gtk::FileFilter allpassfilter; // matches every file
1420      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1421      allpassfilter.set_name("All Files");      allpassfilter.set_name(_("All Files"));
1422      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1423      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1424        if (current_sample_dir != "") {
1425            dialog.set_current_folder(current_sample_dir);
1426        }
1427      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1428            current_sample_dir = dialog.get_current_folder();
1429          Glib::ustring error_files;          Glib::ustring error_files;
1430          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();
1431          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();
# Line 1426  void MainWindow::on_action_add_sample() Line 1436  void MainWindow::on_action_add_sample()
1436              info.format = 0;              info.format = 0;
1437              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
1438              try {              try {
1439                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1440                  int bitdepth;                  int bitdepth;
1441                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1442                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1442  void MainWindow::on_action_add_sample() Line 1452  void MainWindow::on_action_add_sample()
1452                          break;                          break;
1453                      default:                      default:
1454                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
1455                          throw std::string("format not supported"); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
1456                  }                  }
1457                  // add a new sample to the .gig file                  // add a new sample to the .gig file
1458                  gig::Sample* sample = file->AddSample();                  gig::Sample* sample = file->AddSample();
# Line 1533  void MainWindow::on_action_replace_all_s Line 1543  void MainWindow::on_action_replace_all_s
1543      if (!file) return;      if (!file) return;
1544      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1545                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1546      Gtk::Label description(      view::WrapLabel description(
1547          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1548            "in the current gig file by samples located in the directory chosen "            "in the current gig file by samples located in the chosen "
1549            "by you above.\n\n"            "directory.\n\n"
1550            "It works like this: For each sample in the gig file it tries to "            "It works like this: For each sample in the gig file, it tries to "
1551            "find a sample file in the selected directory with the same name as "            "find a sample file in the selected directory with the same name as "
1552            "the sample in the gig file. Optionally you can add a filename "            "the sample in the gig file. Optionally, you can add a filename "
1553            "postfix below, which will be added to the filename expected to be "            "extension below, which will be added to the filename expected to be "
1554            "found. That is, assume you have a gig file with a sample called "            "found. That is, assume you have a gig file with a sample called "
1555            "'Snare', if you enter '.wav' below (like it's done by default), it "            "'Snare', if you enter '.wav' below (like it's done by default), it "
1556            "assumes to find a sample file called 'Snare.wav' and will replace "            "expects to find a sample file called 'Snare.wav' and will replace "
1557            "the sample in the gig file accordingly. If you don't need such a "            "the sample in the gig file accordingly. If you don't need an "
1558            "postfix, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1559            "appropriate sample file could be found, will be reported and left "            "appropriate sample file could be found will be reported and left "
1560            "untouched.\n\n")            "untouched.\n")
1561      );      );
     description.set_line_wrap(true);  
1562      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1563      Gtk::Label entryLabel( _("Add Filename Extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_RIGHT);
1564      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1565      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1566      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1559  void MainWindow::on_action_replace_all_s Line 1568  void MainWindow::on_action_replace_all_s
1568      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
1569      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
1570      description.show();      description.show();
1571      entryLabel.show();      entryArea.show_all();
     postfixEntryBox.show();  
     entryArea.show();  
1572      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1573      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
1574      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
1575      // fix label width (because Gtk by design doesn't      if (current_sample_dir != "") {
1576      // know anything about the parent's size)          dialog.set_current_folder(current_sample_dir);
1577  #if 0 //FIXME: doesn't work      }
     int dialogW, dialogH, labelW, labelH;  
     dialog.get_size_request(dialogW, dialogH);  
     description.get_size_request(labelW, labelH);  
     std::cout << "dialog(" << dialogW << "," << dialogH << ")\nlabel(" << labelW << "," << labelH << ")\n" << std::flush;  
     description.set_size_request(dialogW, labelH);  
 #endif  
1578      if (dialog.run() == Gtk::RESPONSE_OK)      if (dialog.run() == Gtk::RESPONSE_OK)
1579      {      {
1580            current_sample_dir = dialog.get_current_folder();
1581          Glib::ustring error_files;          Glib::ustring error_files;
1582          Glib::ustring folder = dialog.get_filename();          Glib::ustring folder = dialog.get_filename();
1583          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
# Line 1589  void MainWindow::on_action_replace_all_s Line 1591  void MainWindow::on_action_replace_all_s
1591              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
1592              try              try
1593              {              {
1594                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1595                  int bitdepth;                  int bitdepth;
1596                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1597                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1605  void MainWindow::on_action_replace_all_s Line 1607  void MainWindow::on_action_replace_all_s
1607                          break;                          break;
1608                      default:                      default:
1609                          sf_close(hFile);                          sf_close(hFile);
1610                          throw std::string("format not supported");                          throw std::string(_("format not supported"));
1611                  }                  }
1612                  SampleImportItem sched_item;                  SampleImportItem sched_item;
1613                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
# Line 1878  sigc::signal<void, gig::Region*>& MainWi Line 1880  sigc::signal<void, gig::Region*>& MainWi
1880      return region_changed_signal;      return region_changed_signal;
1881  }  }
1882    
1883    sigc::signal<void, gig::Sample*>& MainWindow::signal_sample_changed() {
1884        return sample_changed_signal;
1885    }
1886    
1887  sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& MainWindow::signal_sample_ref_changed() {  sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& MainWindow::signal_sample_ref_changed() {
1888      return sample_ref_changed_signal;      return sample_ref_changed_signal;
1889  }  }
Legend:
Removed from v.1714  
changed lines
  Added in v.1959
  ViewVC Help
Powered by ViewVC