/[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 1679 by schoenebeck, Tue Feb 12 14:13:46 2008 UTC revision 1853 by schoenebeck, Sun Mar 1 22:26:36 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 18  Line 18 
18   */   */
19    
20  #include <iostream>  #include <iostream>
21    #include <cstring>
22    
23  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
24  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
# Line 25  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 128  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 201  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 209  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 568  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 623  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 757  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 772  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 782  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 798  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 828  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 845  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 887  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 920  void MainWindow::on_action_help_about()
920  #ifdef ABOUT_DIALOG  #ifdef ABOUT_DIALOG
921      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
922      dialog.set_version(VERSION);      dialog.set_version(VERSION);
923      dialog.set_copyright("Copyright (C) 2006,2007 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2009 Andreas Persson");
924      dialog.set_comments(      dialog.set_comments(_(
925          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
926          "\n"          "\n"
927          "Please notice that this is still a very young instrument editor. "          "Please notice that this is still a very young instrument editor. "
928          "So better backup your Gigasampler files before editing them with "          "So better backup your Gigasampler files before editing them with "
929          "this application.\n"          "this application.\n"
930          "\n"          "\n"
931          "Please report bugs to: http://bugs.linuxsampler.org"          "Please report bugs to: http://bugs.linuxsampler.org")
932      );      );
933      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
934      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
# Line 936  void MainWindow::on_action_help_about() Line 938  void MainWindow::on_action_help_about()
938    
939  PropDialog::PropDialog()  PropDialog::PropDialog()
940      : table(2,1),      : table(2,1),
941        eName("Name"),        eName(_("Name")),
942        eCreationDate("Creation date"),        eCreationDate(_("Creation date")),
943        eComments("Comments"),        eComments(_("Comments")),
944        eProduct("Product"),        eProduct(_("Product")),
945        eCopyright("Copyright"),        eCopyright(_("Copyright")),
946        eArtists("Artists"),        eArtists(_("Artists")),
947        eGenre("Genre"),        eGenre(_("Genre")),
948        eKeywords("Keywords"),        eKeywords(_("Keywords")),
949        eEngineer("Engineer"),        eEngineer(_("Engineer")),
950        eTechnician("Technician"),        eTechnician(_("Technician")),
951        eSoftware("Software"),        eSoftware(_("Software")),
952        eMedium("Medium"),        eMedium(_("Medium")),
953        eSource("Source"),        eSource(_("Source")),
954        eSourceForm("Source form"),        eSourceForm(_("Source form")),
955        eCommissioned("Commissioned"),        eCommissioned(_("Commissioned")),
956        eSubject("Subject"),        eSubject(_("Subject")),
957        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
958        update_model(0)        update_model(0)
959  {  {
960      set_title("File Properties");      set_title(_("File Properties"));
961      eName.set_width_chars(50);      eName.set_width_chars(50);
962    
963      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
# Line 1073  void InstrumentProps::set_DimensionKeyRa Line 1075  void InstrumentProps::set_DimensionKeyRa
1075  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1076      : table(2,1),      : table(2,1),
1077        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1078        eName("Name"),        eName(_("Name")),
1079        eIsDrum("Is drum"),        eIsDrum(_("Is drum")),
1080        eMIDIBank("MIDI bank", 0, 16383),        eMIDIBank(_("MIDI bank"), 0, 16383),
1081        eMIDIProgram("MIDI program"),        eMIDIProgram(_("MIDI program")),
1082        eAttenuation("Attenuation", 0, 96, 0, 1),        eAttenuation(_("Attenuation"), 0, 96, 0, 1),
1083        eGainPlus6("Gain +6dB", eAttenuation, -6),        eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
1084        eEffectSend("Effect send", 0, 65535),        eEffectSend(_("Effect send"), 0, 65535),
1085        eFineTune("Fine tune", -8400, 8400),        eFineTune(_("Fine tune"), -8400, 8400),
1086        ePitchbendRange("Pitchbend range", 0, 12),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1087        ePianoReleaseMode("Piano release mode"),        ePianoReleaseMode(_("Piano release mode")),
1088        eDimensionKeyRangeLow("Keyswitching range low"),        eDimensionKeyRangeLow(_("Keyswitching range low")),
1089        eDimensionKeyRangeHigh("Keyswitching range high"),        eDimensionKeyRangeHigh(_("Keyswitching range high")),
1090        update_model(0)        update_model(0)
1091  {  {
1092      set_title("Instrument Properties");      set_title(_("Instrument Properties"));
1093    
1094      eDimensionKeyRangeLow.set_tip(      eDimensionKeyRangeLow.set_tip(
1095          _("start of the keyboard area which should switch the "          _("start of the keyboard area which should switch the "
# Line 1312  void MainWindow::on_action_add_instrumen Line 1314  void MainWindow::on_action_add_instrumen
1314      gig::Instrument* instrument = file->AddInstrument();      gig::Instrument* instrument = file->AddInstrument();
1315      __instrument_indexer++;      __instrument_indexer++;
1316      instrument->pInfo->Name =      instrument->pInfo->Name =
1317          "Unnamed Instrument " + ToString(__instrument_indexer);          _("Unnamed Instrument ") + ToString(__instrument_indexer);
1318      // update instrument tree view      // update instrument tree view
1319      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1320      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
# Line 1355  void MainWindow::on_action_remove_instru Line 1357  void MainWindow::on_action_remove_instru
1357  void MainWindow::on_action_sample_properties() {  void MainWindow::on_action_sample_properties() {
1358      //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
1359      Gtk::MessageDialog msg(      Gtk::MessageDialog msg(
1360          *this, "Sorry, yet to be implemented!", false, Gtk::MESSAGE_INFO          *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO
1361      );      );
1362      msg.run();      msg.run();
1363  }  }
# Line 1364  void MainWindow::on_action_add_group() { Line 1366  void MainWindow::on_action_add_group() {
1366      static int __sample_indexer = 0;      static int __sample_indexer = 0;
1367      if (!file) return;      if (!file) return;
1368      gig::Group* group = file->AddGroup();      gig::Group* group = file->AddGroup();
1369      group->Name = "Unnamed Group";      group->Name = _("Unnamed Group");
1370      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
1371      __sample_indexer++;      __sample_indexer++;
1372      // update sample tree view      // update sample tree view
# Line 1408  void MainWindow::on_action_add_sample() Line 1410  void MainWindow::on_action_add_sample()
1410      };      };
1411      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1412          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1413      soundfilter.set_name("Sound Files");      soundfilter.set_name(_("Sound Files"));
1414      Gtk::FileFilter allpassfilter; // matches every file      Gtk::FileFilter allpassfilter; // matches every file
1415      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1416      allpassfilter.set_name("All Files");      allpassfilter.set_name(_("All Files"));
1417      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1418      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1419        if (current_sample_dir != "") {
1420            dialog.set_current_folder(current_sample_dir);
1421        }
1422      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1423            current_sample_dir = dialog.get_current_folder();
1424          Glib::ustring error_files;          Glib::ustring error_files;
1425          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();
1426          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();
# Line 1425  void MainWindow::on_action_add_sample() Line 1431  void MainWindow::on_action_add_sample()
1431              info.format = 0;              info.format = 0;
1432              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
1433              try {              try {
1434                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1435                  int bitdepth;                  int bitdepth;
1436                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1437                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1441  void MainWindow::on_action_add_sample() Line 1447  void MainWindow::on_action_add_sample()
1447                          break;                          break;
1448                      default:                      default:
1449                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
1450                          throw std::string("format not supported"); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
1451                  }                  }
1452                  // add a new sample to the .gig file                  // add a new sample to the .gig file
1453                  gig::Sample* sample = file->AddSample();                  gig::Sample* sample = file->AddSample();
# Line 1532  void MainWindow::on_action_replace_all_s Line 1538  void MainWindow::on_action_replace_all_s
1538      if (!file) return;      if (!file) return;
1539      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1540                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1541      Gtk::Label description(      view::WrapLabel description(
1542          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1543            "in the current gig file by samples located in the directory chosen "            "in the current gig file by samples located in the chosen "
1544            "by you above.\n\n"            "directory.\n\n"
1545            "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 "
1546            "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 "
1547            "the sample in the gig file. Optionally you can add a filename "            "the sample in the gig file. Optionally, you can add a filename "
1548            "postfix below, which will be added to the filename expected to be "            "extension below, which will be added to the filename expected to be "
1549            "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 "
1550            "'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 "
1551            "assumes to find a sample file called 'Snare.wav' and will replace "            "expects to find a sample file called 'Snare.wav' and will replace "
1552            "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 "
1553            "postfix, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1554            "appropriate sample file could be found, will be reported and left "            "appropriate sample file could be found will be reported and left "
1555            "untouched.\n\n")            "untouched.\n")
1556      );      );
     description.set_line_wrap(true);  
1557      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1558      Gtk::Label entryLabel( _("Add Filename Extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_RIGHT);
1559      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1560      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1561      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1558  void MainWindow::on_action_replace_all_s Line 1563  void MainWindow::on_action_replace_all_s
1563      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
1564      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
1565      description.show();      description.show();
1566      entryLabel.show();      entryArea.show_all();
     postfixEntryBox.show();  
     entryArea.show();  
1567      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1568      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
1569      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
1570      // fix label width (because Gtk by design doesn't      if (current_sample_dir != "") {
1571      // know anything about the parent's size)          dialog.set_current_folder(current_sample_dir);
1572  #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  
1573      if (dialog.run() == Gtk::RESPONSE_OK)      if (dialog.run() == Gtk::RESPONSE_OK)
1574      {      {
1575            current_sample_dir = dialog.get_current_folder();
1576          Glib::ustring error_files;          Glib::ustring error_files;
1577          Glib::ustring folder = dialog.get_filename();          Glib::ustring folder = dialog.get_filename();
1578          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
# Line 1588  void MainWindow::on_action_replace_all_s Line 1586  void MainWindow::on_action_replace_all_s
1586              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
1587              try              try
1588              {              {
1589                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1590                  int bitdepth;                  int bitdepth;
1591                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1592                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1604  void MainWindow::on_action_replace_all_s Line 1602  void MainWindow::on_action_replace_all_s
1602                          break;                          break;
1603                      default:                      default:
1604                          sf_close(hFile);                          sf_close(hFile);
1605                          throw std::string("format not supported");                          throw std::string(_("format not supported"));
1606                  }                  }
1607                  SampleImportItem sched_item;                  SampleImportItem sched_item;
1608                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
# Line 1877  sigc::signal<void, gig::Region*>& MainWi Line 1875  sigc::signal<void, gig::Region*>& MainWi
1875      return region_changed_signal;      return region_changed_signal;
1876  }  }
1877    
1878    sigc::signal<void, gig::Sample*>& MainWindow::signal_sample_changed() {
1879        return sample_changed_signal;
1880    }
1881    
1882  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() {
1883      return sample_ref_changed_signal;      return sample_ref_changed_signal;
1884  }  }
Legend:
Removed from v.1679  
changed lines
  Added in v.1853
  ViewVC Help
Powered by ViewVC