/[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 1673 by schoenebeck, Wed Feb 6 22:08:29 2008 UTC revision 2344 by persson, Sun Apr 29 16:15:45 2012 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006 - 2008 Andreas Persson   * Copyright (C) 2006-2012 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 <glibmm/convert.h>
24    #include <glibmm/dispatcher.h>
25    #include <glibmm/miscutils.h>
26    #include <glibmm/stringutils.h>
27    #include <gtkmm/aboutdialog.h>
28  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
29  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
30  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
31  #include <gtkmm/targetentry.h>  #include <gtkmm/targetentry.h>
32  #include <gtkmm/main.h>  #include <gtkmm/main.h>
33    #include <gtkmm/radiomenuitem.h>
34  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
35    #if GTKMM_MAJOR_VERSION < 3
36  #include "global.h"  #include "wrapLabel.hh"
   
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
 #define ABOUT_DIALOG  
 #include <gtkmm/aboutdialog.h>  
37  #endif  #endif
38    
39  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2  #include "global.h"
40  namespace Glib {  #include "compat.h"
 Glib::ustring filename_display_basename(const std::string& filename)  
 {  
     gchar* gstr = g_path_get_basename(filename.c_str());  
     Glib::ustring str(gstr);  
     g_free(gstr);  
     return Glib::filename_to_utf8(str);  
 }  
 }  
 #endif  
41    
42  #include <stdio.h>  #include <stdio.h>
43  #include <sndfile.h>  #include <sndfile.h>
# Line 128  MainWindow::MainWindow() : Line 122  MainWindow::MainWindow() :
122      m_HPaned.add2(dimreg_vbox);      m_HPaned.add2(dimreg_vbox);
123    
124    
125      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, "Samples");      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
126      m_TreeViewNotebook.append_page(m_ScrolledWindow, "Instruments");      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
127    
128    
129      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
# Line 177  MainWindow::MainWindow() : Line 171  MainWindow::MainWindow() :
171      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
172      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
173                                           action->property_label()));                                           action->property_label()));
 #ifdef ABOUT_DIALOG  
174      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
175                       sigc::mem_fun(                       sigc::mem_fun(
176                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
 #endif  
177      actionGroup->add(      actionGroup->add(
178          Gtk::Action::create("AddInstrument", _("Add _Instrument")),          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
179          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
# Line 201  MainWindow::MainWindow() : Line 193  MainWindow::MainWindow() :
193          sigc::mem_fun(*this, &MainWindow::on_action_add_group)          sigc::mem_fun(*this, &MainWindow::on_action_add_group)
194      );      );
195      actionGroup->add(      actionGroup->add(
196          Gtk::Action::create("AddSample", _("Add _Sample(s)")),          Gtk::Action::create("AddSample", _("Add _Sample(s)...")),
197          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
198      );      );
199      actionGroup->add(      actionGroup->add(
# Line 209  MainWindow::MainWindow() : Line 201  MainWindow::MainWindow() :
201          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
202      );      );
203      actionGroup->add(      actionGroup->add(
204          Gtk::Action::create("ReplaceAllSamplesInAllGroups", _("Replace All Samples In All Groups")),          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
205                                _("Replace All Samples in All Groups...")),
206          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)
207      );      );
208    
# Line 236  MainWindow::MainWindow() : Line 229  MainWindow::MainWindow() :
229          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
230          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
231          "    </menu>"          "    </menu>"
 #ifdef ABOUT_DIALOG  
232          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
233          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
234          "    </menu>"          "    </menu>"
 #endif  
235          "  </menubar>"          "  </menubar>"
236          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
237          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
# Line 269  MainWindow::MainWindow() : Line 260  MainWindow::MainWindow() :
260      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
261      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
262    
263        set_file_is_shared(false);
264    
265      // Status Bar:      // Status Bar:
266      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
267      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
# Line 305  MainWindow::MainWindow() : Line 298  MainWindow::MainWindow() :
298      );      );
299    
300      // establish drag&drop between samples tree view and dimension region 'Sample' text entry      // establish drag&drop between samples tree view and dimension region 'Sample' text entry
301      std::list<Gtk::TargetEntry> drag_target_gig_sample;      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
302      drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
303      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
304      m_TreeViewSamples.signal_drag_begin().connect(      m_TreeViewSamples.signal_drag_begin().connect(
305          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)
# Line 371  MainWindow::MainWindow() : Line 364  MainWindow::MainWindow() :
364    
365      file = 0;      file = 0;
366      file_is_changed = false;      file_is_changed = false;
     set_file_is_shared(false);  
367    
368      show_all_children();      show_all_children();
369    
# Line 475  void loader_progress_callback(gig::progr Line 467  void loader_progress_callback(gig::progr
467  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
468  {  {
469      {      {
470          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
471          progress = fraction;          progress = fraction;
472      }      }
473      progress_dispatcher();      progress_dispatcher();
# Line 483  void Loader::progress_callback(float fra Line 475  void Loader::progress_callback(float fra
475    
476  void Loader::thread_function()  void Loader::thread_function()
477  {  {
478      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
479      printf("Start %s\n", filename);      printf("Start %s\n", filename);
480      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
481      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 497  void Loader::thread_function() Line 489  void Loader::thread_function()
489  }  }
490    
491  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
492      : thread(0), filename(filename)      : filename(filename), thread(0)
493  {  {
494  }  }
495    
496  void Loader::launch()  void Loader::launch()
497  {  {
498    #ifdef OLD_THREADS
499      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
500    #else
501        thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
502    #endif
503      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
504  }  }
505    
# Line 511  float Loader::get_progress() Line 507  float Loader::get_progress()
507  {  {
508      float res;      float res;
509      {      {
510          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
511          res = progress;          res = progress;
512      }      }
513      return res;      return res;
# Line 541  void MainWindow::__clear() { Line 537  void MainWindow::__clear() {
537      Gtk::MenuItem* instrument_menu =      Gtk::MenuItem* instrument_menu =
538          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
539      instrument_menu->hide();      instrument_menu->hide();
540      for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {      Gtk::Menu* menu = instrument_menu->get_submenu();
541          delete &instrument_menu->get_submenu()->items()[i];      while (menu->get_children().size()) {
542            Gtk::Widget* child = *menu->get_children().begin();
543            menu->remove(*child);
544            delete child;
545      }      }
     instrument_menu->get_submenu()->items().clear();  
546      // forget all samples that ought to be imported      // forget all samples that ought to be imported
547      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
548      // clear the samples and instruments tree views      // clear the samples and instruments tree views
# Line 568  void MainWindow::on_action_file_new() Line 566  void MainWindow::on_action_file_new()
566      gig::File* pFile = new gig::File;      gig::File* pFile = new gig::File;
567      // already add one new instrument by default      // already add one new instrument by default
568      gig::Instrument* pInstrument = pFile->AddInstrument();      gig::Instrument* pInstrument = pFile->AddInstrument();
569      pInstrument->pInfo->Name = "Unnamed Instrument";      pInstrument->pInfo->Name = _("Unnamed Instrument");
570      // update GUI with that new gig::File      // update GUI with that new gig::File
571      load_gig(pFile, 0 /*no file name yet*/);      load_gig(pFile, 0 /*no file name yet*/);
572  }  }
# Line 579  bool MainWindow::close_confirmation_dial Line 577  bool MainWindow::close_confirmation_dial
577                                   Glib::filename_display_basename(filename).c_str());                                   Glib::filename_display_basename(filename).c_str());
578      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
579      g_free(msg);      g_free(msg);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
580      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));
 #endif  
581      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
582      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
583      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);
# Line 595  bool MainWindow::close_confirmation_dial Line 591  bool MainWindow::close_confirmation_dial
591  bool MainWindow::leaving_shared_mode_dialog() {  bool MainWindow::leaving_shared_mode_dialog() {
592      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
593      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
594      dialog.set_secondary_text(      dialog.set_secondary_text(
595          _("If you proceed to work on another instrument file, it won't be "          _("If you proceed to work on another instrument file, it won't be "
596            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
597            "load it.")            "load it."));
    );  
 #endif  
598      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
599      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
600      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
# Line 620  void MainWindow::on_action_file_open() Line 613  void MainWindow::on_action_file_open()
613      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
614      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
615      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
616    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
617      Gtk::FileFilter filter;      Gtk::FileFilter filter;
618      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
619    #else
620        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
621        filter->add_pattern("*.gig");
622    #endif
623      dialog.set_filter(filter);      dialog.set_filter(filter);
624      if (current_dir != "") {      if (current_gig_dir != "") {
625          dialog.set_current_folder(current_dir);          dialog.set_current_folder(current_gig_dir);
626      }      }
627      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
628          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
629          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
630          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
631          load_file(filename.c_str());          load_file(filename.c_str());
632          current_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
633      }      }
634  }  }
635    
636  void MainWindow::load_file(const char* name)  void MainWindow::load_file(const char* name)
637  {  {
638      __clear();      __clear();
639      load_dialog = new LoadDialog("Loading...", *this);      load_dialog = new LoadDialog(_("Loading..."), *this);
640      load_dialog->show_all();      load_dialog->show_all();
641      loader = new Loader(strdup(name));      loader = new Loader(strdup(name));
642      loader->signal_progress().connect(      loader->signal_progress().connect(
# Line 671  void MainWindow::on_loader_progress() Line 669  void MainWindow::on_loader_progress()
669  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
670  {  {
671      printf("Loader finished!\n");      printf("Loader finished!\n");
672      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
673      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
674      load_dialog->hide();      load_dialog->hide();
675  }  }
# Line 743  bool MainWindow::file_save_as() Line 741  bool MainWindow::file_save_as()
741      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
742      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
743      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
   
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 8) || GTKMM_MAJOR_VERSION > 2  
744      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
745      // TODO: an overwrite dialog for gtkmm < 2.8  
746  #endif  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
747      Gtk::FileFilter filter;      Gtk::FileFilter filter;
748      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
749    #else
750        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
751        filter->add_pattern("*.gig");
752    #endif
753      dialog.set_filter(filter);      dialog.set_filter(filter);
754    
755      if (Glib::path_is_absolute(filename)) {      // set initial dir and filename of the Save As dialog
756          dialog.set_filename(filename);      // and prepare that initial filename as a copy of the gig
757      } else if (current_dir != "") {      {
758          dialog.set_current_folder(current_dir);          std::string basename = Glib::path_get_basename(filename);
759      }          std::string dir = Glib::path_get_dirname(filename);
760      dialog.set_current_name(Glib::filename_display_basename(filename));          basename = std::string(_("copy_of_")) + basename;
761            Glib::ustring copyFileName = Glib::build_filename(dir, basename);
762            if (Glib::path_is_absolute(filename)) {
763                dialog.set_filename(copyFileName);
764            } else {
765                if (current_gig_dir != "") dialog.set_current_folder(current_gig_dir);
766            }
767            dialog.set_current_name(Glib::filename_display_basename(copyFileName));
768        }
769    
770        // show warning in the dialog
771        Gtk::HBox descriptionArea;
772        descriptionArea.set_spacing(15);
773        Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
774        descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
775    #if GTKMM_MAJOR_VERSION < 3
776        view::WrapLabel description;
777    #else
778        Gtk::Label description;
779        description.set_line_wrap();
780    #endif
781        description.set_markup(
782            _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
783              "<span style=\"italic\">\"Save\"</span> dialog instead of "
784              "<span style=\"italic\">\"Save As...\"</span> if you want to save "
785              "to the same .gig file. Using "
786              "<span style=\"italic\">\"Save As...\"</span> for writing to the "
787              "same .gig file will end up in corrupted sample wave data!\n")
788        );
789        descriptionArea.pack_start(description);
790        dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
791        descriptionArea.show_all();
792    
793      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
794          file_structure_to_be_changed_signal.emit(this->file);          file_structure_to_be_changed_signal.emit(this->file);
# Line 769  bool MainWindow::file_save_as() Line 800  bool MainWindow::file_save_as()
800              printf("filename=%s\n", filename.c_str());              printf("filename=%s\n", filename.c_str());
801              file->Save(filename);              file->Save(filename);
802              this->filename = filename;              this->filename = filename;
803              current_dir = Glib::path_get_dirname(filename);              current_gig_dir = Glib::path_get_dirname(filename);
804              set_title(Glib::filename_display_basename(filename));              set_title(Glib::filename_display_basename(filename));
805              file_has_name = true;              file_has_name = true;
806              file_is_changed = false;              file_is_changed = false;
# Line 799  void MainWindow::__import_queued_samples Line 830  void MainWindow::__import_queued_samples
830          info.format = 0;          info.format = 0;
831          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
832          try {          try {
833              if (!hFile) throw std::string("could not open file");              if (!hFile) throw std::string(_("could not open file"));
834              // determine sample's bit depth              // determine sample's bit depth
835              int bitdepth;              int bitdepth;
836              switch (info.format & 0xff) {              switch (info.format & 0xff) {
# Line 816  void MainWindow::__import_queued_samples Line 847  void MainWindow::__import_queued_samples
847                      break;                      break;
848                  default:                  default:
849                      sf_close(hFile); // close sound file                      sf_close(hFile); // close sound file
850                      throw std::string("format not supported"); // unsupported subformat (yet?)                      throw std::string(_("format not supported")); // unsupported subformat (yet?)
851              }              }
852    
853              const int bufsize = 10000;              const int bufsize = 10000;
# Line 858  void MainWindow::__import_queued_samples Line 889  void MainWindow::__import_queued_samples
889              }              }
890              // cleanup              // cleanup
891              sf_close(hFile);              sf_close(hFile);
892                // let the sampler re-cache the sample if needed
893                sample_changed_signal.emit(iter->gig_sample);
894              // on success we remove the sample from the import queue,              // on success we remove the sample from the import queue,
895              // otherwise keep it, maybe it works the next time ?              // otherwise keep it, maybe it works the next time ?
896              std::list<SampleImportItem>::iterator cur = iter;              std::list<SampleImportItem>::iterator cur = iter;
# Line 886  void MainWindow::on_action_file_properti Line 919  void MainWindow::on_action_file_properti
919    
920  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
921  {  {
 #ifdef ABOUT_DIALOG  
922      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
923    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
924        dialog.set_program_name("Gigedit");
925    #else
926        dialog.set_name("Gigedit");
927    #endif
928      dialog.set_version(VERSION);      dialog.set_version(VERSION);
929      dialog.set_copyright("Copyright (C) 2006,2007 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2012 Andreas Persson");
930      dialog.set_comments(      dialog.set_comments(_(
931          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
932          "\n"          "\n"
933          "Please notice that this is still a very young instrument editor. "          "Please notice that this is still a very young instrument editor. "
934          "So better backup your Gigasampler files before editing them with "          "So better backup your Gigasampler files before editing them with "
935          "this application.\n"          "this application.\n"
936          "\n"          "\n"
937          "Please report bugs to: http://bugs.linuxsampler.org"          "Please report bugs to: http://bugs.linuxsampler.org")
938      );      );
939      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
940      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
941      dialog.run();      dialog.run();
 #endif  
942  }  }
943    
944  PropDialog::PropDialog()  PropDialog::PropDialog()
945      : table(2,1),      : eName(_("Name")),
946        eName("Name"),        eCreationDate(_("Creation date")),
947        eCreationDate("Creation date"),        eComments(_("Comments")),
948        eComments("Comments"),        eProduct(_("Product")),
949        eProduct("Product"),        eCopyright(_("Copyright")),
950        eCopyright("Copyright"),        eArtists(_("Artists")),
951        eArtists("Artists"),        eGenre(_("Genre")),
952        eGenre("Genre"),        eKeywords(_("Keywords")),
953        eKeywords("Keywords"),        eEngineer(_("Engineer")),
954        eEngineer("Engineer"),        eTechnician(_("Technician")),
955        eTechnician("Technician"),        eSoftware(_("Software")),
956        eSoftware("Software"),        eMedium(_("Medium")),
957        eMedium("Medium"),        eSource(_("Source")),
958        eSource("Source"),        eSourceForm(_("Source form")),
959        eSourceForm("Source form"),        eCommissioned(_("Commissioned")),
960        eCommissioned("Commissioned"),        eSubject(_("Subject")),
       eSubject("Subject"),  
961        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
962          table(2, 1),
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 972  PropDialog::PropDialog() Line 1008  PropDialog::PropDialog()
1008      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1009      buttonBox.show();      buttonBox.show();
1010      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1011      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1012      quitButton.grab_focus();      quitButton.grab_focus();
1013      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
1014          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
# Line 1042  void InstrumentProps::set_DimensionKeyRa Line 1078  void InstrumentProps::set_DimensionKeyRa
1078  }  }
1079    
1080  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1081      : table(2,1),      : update_model(0),
1082        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1083        eName("Name"),        table(2,1),
1084        eIsDrum("Is drum"),        eName(_("Name")),
1085        eMIDIBank("MIDI bank", 0, 16383),        eIsDrum(_("Is drum")),
1086        eMIDIProgram("MIDI program"),        eMIDIBank(_("MIDI bank"), 0, 16383),
1087        eAttenuation("Attenuation", 0, 96, 0, 1),        eMIDIProgram(_("MIDI program")),
1088        eGainPlus6("Gain +6dB", eAttenuation, -6),        eAttenuation(_("Attenuation"), 0, 96, 0, 1),
1089        eEffectSend("Effect send", 0, 65535),        eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
1090        eFineTune("Fine tune", -8400, 8400),        eEffectSend(_("Effect send"), 0, 65535),
1091        ePitchbendRange("Pitchbend range", 0, 12),        eFineTune(_("Fine tune"), -8400, 8400),
1092        ePianoReleaseMode("Piano release mode"),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1093        eDimensionKeyRangeLow("Keyswitching range low"),        ePianoReleaseMode(_("Piano release mode")),
1094        eDimensionKeyRangeHigh("Keyswitching range high"),        eDimensionKeyRangeLow(_("Keyswitching range low")),
1095        update_model(0)        eDimensionKeyRangeHigh(_("Keyswitching range high"))
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 1107  InstrumentProps::InstrumentProps() Line 1143  InstrumentProps::InstrumentProps()
1143      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1144      buttonBox.show();      buttonBox.show();
1145      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1146      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1147      quitButton.grab_focus();      quitButton.grab_focus();
1148    
1149      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
# Line 1283  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 1326  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 1335  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 1369  void MainWindow::on_action_add_sample() Line 1405  void MainWindow::on_action_add_sample()
1405      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1406      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1407      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1408      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile  
1409        // matches all file types supported by libsndfile
1410    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1411        Gtk::FileFilter soundfilter;
1412    #else
1413        Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
1414    #endif
1415      const char* const supportedFileTypes[] = {      const char* const supportedFileTypes[] = {
1416          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1417          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
# Line 1377  void MainWindow::on_action_add_sample() Line 1419  void MainWindow::on_action_add_sample()
1419          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1420          "*.caf", "*.CAF", NULL          "*.caf", "*.CAF", NULL
1421      };      };
1422        const char* soundfiles = _("Sound Files");
1423        const char* allfiles = _("All Files");
1424    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1425      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1426          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1427      soundfilter.set_name("Sound Files");      soundfilter.set_name(soundfiles);
1428      Gtk::FileFilter allpassfilter; // matches every file  
1429        // matches every file
1430        Gtk::FileFilter allpassfilter;
1431      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1432      allpassfilter.set_name("All Files");      allpassfilter.set_name(allfiles);
1433    #else
1434        for (int i = 0; supportedFileTypes[i]; i++)
1435            soundfilter->add_pattern(supportedFileTypes[i]);
1436        soundfilter->set_name(soundfiles);
1437    
1438        // matches every file
1439        Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
1440        allpassfilter->add_pattern("*.*");
1441        allpassfilter->set_name(allfiles);
1442    #endif
1443      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1444      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1445        if (current_sample_dir != "") {
1446            dialog.set_current_folder(current_sample_dir);
1447        }
1448      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1449            current_sample_dir = dialog.get_current_folder();
1450          Glib::ustring error_files;          Glib::ustring error_files;
1451          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
1452          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (std::vector<std::string>::iterator iter = filenames.begin();
1453               iter != filenames.end(); ++iter) {               iter != filenames.end(); ++iter) {
1454              printf("Adding sample %s\n",(*iter).c_str());              printf("Adding sample %s\n",(*iter).c_str());
1455              // use libsndfile to retrieve file informations              // use libsndfile to retrieve file informations
# Line 1396  void MainWindow::on_action_add_sample() Line 1457  void MainWindow::on_action_add_sample()
1457              info.format = 0;              info.format = 0;
1458              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
1459              try {              try {
1460                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1461                  int bitdepth;                  int bitdepth;
1462                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1463                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1412  void MainWindow::on_action_add_sample() Line 1473  void MainWindow::on_action_add_sample()
1473                          break;                          break;
1474                      default:                      default:
1475                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
1476                          throw std::string("format not supported"); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
1477                  }                  }
1478                  // add a new sample to the .gig file                  // add a new sample to the .gig file
1479                  gig::Sample* sample = file->AddSample();                  gig::Sample* sample = file->AddSample();
# Line 1503  void MainWindow::on_action_replace_all_s Line 1564  void MainWindow::on_action_replace_all_s
1564      if (!file) return;      if (!file) return;
1565      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1566                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1567      Gtk::Label description(      const char* str =
1568          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1569            "in the current gig file by samples located in the directory chosen "            "in the current gig file by samples located in the chosen "
1570            "by you above.\n\n"            "directory.\n\n"
1571            "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 "
1572            "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 "
1573            "the sample in the gig file. Optionally you can add a filename "            "the sample in the gig file. Optionally, you can add a filename "
1574            "postfix below, which will be added to the filename expected to be "            "extension below, which will be added to the filename expected to be "
1575            "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 "
1576            "'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 "
1577            "assumes to find a sample file called 'Snare.wav' and will replace "            "expects to find a sample file called 'Snare.wav' and will replace "
1578            "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 "
1579            "postfix, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1580            "appropriate sample file could be found, will be reported and left "            "appropriate sample file could be found will be reported and left "
1581            "untouched.\n\n")            "untouched.\n");
1582      );  #if GTKMM_MAJOR_VERSION < 3
1583      description.set_line_wrap(true);      view::WrapLabel description(str);
1584    #else
1585        Gtk::Label description(str);
1586        description.set_line_wrap();
1587    #endif
1588      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1589      Gtk::Label entryLabel( _("Add Filename Extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1590      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1591      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1592      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1529  void MainWindow::on_action_replace_all_s Line 1594  void MainWindow::on_action_replace_all_s
1594      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
1595      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
1596      description.show();      description.show();
1597      entryLabel.show();      entryArea.show_all();
     postfixEntryBox.show();  
     entryArea.show();  
1598      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1599      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
1600      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
1601      // fix label width (because Gtk by design doesn't      if (current_sample_dir != "") {
1602      // know anything about the parent's size)          dialog.set_current_folder(current_sample_dir);
1603  #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  
1604      if (dialog.run() == Gtk::RESPONSE_OK)      if (dialog.run() == Gtk::RESPONSE_OK)
1605      {      {
1606            current_sample_dir = dialog.get_current_folder();
1607          Glib::ustring error_files;          Glib::ustring error_files;
1608          Glib::ustring folder = dialog.get_filename();          std::string folder = dialog.get_filename();
1609          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
1610               sample; sample = file->GetNextSample())               sample; sample = file->GetNextSample())
1611          {          {
# Line 1559  void MainWindow::on_action_replace_all_s Line 1617  void MainWindow::on_action_replace_all_s
1617              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
1618              try              try
1619              {              {
1620                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1621                  int bitdepth;                  int bitdepth;
1622                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1623                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1575  void MainWindow::on_action_replace_all_s Line 1633  void MainWindow::on_action_replace_all_s
1633                          break;                          break;
1634                      default:                      default:
1635                          sf_close(hFile);                          sf_close(hFile);
1636                          throw std::string("format not supported");                          throw std::string(_("format not supported"));
1637                  }                  }
1638                  SampleImportItem sched_item;                  SampleImportItem sched_item;
1639                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
# Line 1848  sigc::signal<void, gig::Region*>& MainWi Line 1906  sigc::signal<void, gig::Region*>& MainWi
1906      return region_changed_signal;      return region_changed_signal;
1907  }  }
1908    
1909    sigc::signal<void, gig::Sample*>& MainWindow::signal_sample_changed() {
1910        return sample_changed_signal;
1911    }
1912    
1913  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() {
1914      return sample_ref_changed_signal;      return sample_ref_changed_signal;
1915  }  }

Legend:
Removed from v.1673  
changed lines
  Added in v.2344

  ViewVC Help
Powered by ViewVC