/[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 2325 by persson, Sun Mar 4 09:01:40 2012 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006 - 2008 Andreas Persson   * Copyright (C) 2006-2011 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    #include "wrapLabel.hh"
36    
37  #include "global.h"  #include "global.h"
38    #include "compat.h"
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
 #define ABOUT_DIALOG  
 #include <gtkmm/aboutdialog.h>  
 #endif  
   
 #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2  
 namespace Glib {  
 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  
39    
40  #include <stdio.h>  #include <stdio.h>
41  #include <sndfile.h>  #include <sndfile.h>
# Line 128  MainWindow::MainWindow() : Line 120  MainWindow::MainWindow() :
120      m_HPaned.add2(dimreg_vbox);      m_HPaned.add2(dimreg_vbox);
121    
122    
123      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, "Samples");      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
124      m_TreeViewNotebook.append_page(m_ScrolledWindow, "Instruments");      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
125    
126    
127      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
# Line 177  MainWindow::MainWindow() : Line 169  MainWindow::MainWindow() :
169      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
170      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
171                                           action->property_label()));                                           action->property_label()));
 #ifdef ABOUT_DIALOG  
172      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
173                       sigc::mem_fun(                       sigc::mem_fun(
174                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
 #endif  
175      actionGroup->add(      actionGroup->add(
176          Gtk::Action::create("AddInstrument", _("Add _Instrument")),          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
177          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
# Line 201  MainWindow::MainWindow() : Line 191  MainWindow::MainWindow() :
191          sigc::mem_fun(*this, &MainWindow::on_action_add_group)          sigc::mem_fun(*this, &MainWindow::on_action_add_group)
192      );      );
193      actionGroup->add(      actionGroup->add(
194          Gtk::Action::create("AddSample", _("Add _Sample(s)")),          Gtk::Action::create("AddSample", _("Add _Sample(s)...")),
195          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
196      );      );
197      actionGroup->add(      actionGroup->add(
# Line 209  MainWindow::MainWindow() : Line 199  MainWindow::MainWindow() :
199          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
200      );      );
201      actionGroup->add(      actionGroup->add(
202          Gtk::Action::create("ReplaceAllSamplesInAllGroups", _("Replace All Samples In All Groups")),          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
203                                _("Replace All Samples in All Groups...")),
204          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)
205      );      );
206    
# Line 236  MainWindow::MainWindow() : Line 227  MainWindow::MainWindow() :
227          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
228          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
229          "    </menu>"          "    </menu>"
 #ifdef ABOUT_DIALOG  
230          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
231          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
232          "    </menu>"          "    </menu>"
 #endif  
233          "  </menubar>"          "  </menubar>"
234          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
235          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
# Line 269  MainWindow::MainWindow() : Line 258  MainWindow::MainWindow() :
258      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
259      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
260    
261        set_file_is_shared(false);
262    
263      // Status Bar:      // Status Bar:
264      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
265      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
# Line 305  MainWindow::MainWindow() : Line 296  MainWindow::MainWindow() :
296      );      );
297    
298      // 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
299      std::list<Gtk::TargetEntry> drag_target_gig_sample;      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
300      drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
301      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
302      m_TreeViewSamples.signal_drag_begin().connect(      m_TreeViewSamples.signal_drag_begin().connect(
303          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 362  MainWindow::MainWindow() :
362    
363      file = 0;      file = 0;
364      file_is_changed = false;      file_is_changed = false;
     set_file_is_shared(false);  
365    
366      show_all_children();      show_all_children();
367    
# Line 475  void loader_progress_callback(gig::progr Line 465  void loader_progress_callback(gig::progr
465  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
466  {  {
467      {      {
468          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
469          progress = fraction;          progress = fraction;
470      }      }
471      progress_dispatcher();      progress_dispatcher();
# Line 483  void Loader::progress_callback(float fra Line 473  void Loader::progress_callback(float fra
473    
474  void Loader::thread_function()  void Loader::thread_function()
475  {  {
476      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
477      printf("Start %s\n", filename);      printf("Start %s\n", filename);
478      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
479      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 497  void Loader::thread_function() Line 487  void Loader::thread_function()
487  }  }
488    
489  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
490      : thread(0), filename(filename)      : filename(filename), thread(0)
491  {  {
492  }  }
493    
494  void Loader::launch()  void Loader::launch()
495  {  {
496      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
497      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
498  }  }
499    
# Line 511  float Loader::get_progress() Line 501  float Loader::get_progress()
501  {  {
502      float res;      float res;
503      {      {
504          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
505          res = progress;          res = progress;
506      }      }
507      return res;      return res;
# Line 541  void MainWindow::__clear() { Line 531  void MainWindow::__clear() {
531      Gtk::MenuItem* instrument_menu =      Gtk::MenuItem* instrument_menu =
532          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
533      instrument_menu->hide();      instrument_menu->hide();
534      for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {      Gtk::Menu* menu = instrument_menu->get_submenu();
535          delete &instrument_menu->get_submenu()->items()[i];      while (menu->get_children().size()) {
536            Gtk::Widget* child = *menu->get_children().begin();
537            menu->remove(*child);
538            delete child;
539      }      }
     instrument_menu->get_submenu()->items().clear();  
540      // forget all samples that ought to be imported      // forget all samples that ought to be imported
541      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
542      // clear the samples and instruments tree views      // clear the samples and instruments tree views
# Line 568  void MainWindow::on_action_file_new() Line 560  void MainWindow::on_action_file_new()
560      gig::File* pFile = new gig::File;      gig::File* pFile = new gig::File;
561      // already add one new instrument by default      // already add one new instrument by default
562      gig::Instrument* pInstrument = pFile->AddInstrument();      gig::Instrument* pInstrument = pFile->AddInstrument();
563      pInstrument->pInfo->Name = "Unnamed Instrument";      pInstrument->pInfo->Name = _("Unnamed Instrument");
564      // update GUI with that new gig::File      // update GUI with that new gig::File
565      load_gig(pFile, 0 /*no file name yet*/);      load_gig(pFile, 0 /*no file name yet*/);
566  }  }
# Line 579  bool MainWindow::close_confirmation_dial Line 571  bool MainWindow::close_confirmation_dial
571                                   Glib::filename_display_basename(filename).c_str());                                   Glib::filename_display_basename(filename).c_str());
572      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
573      g_free(msg);      g_free(msg);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
574      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  
575      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
576      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
577      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 585  bool MainWindow::close_confirmation_dial
585  bool MainWindow::leaving_shared_mode_dialog() {  bool MainWindow::leaving_shared_mode_dialog() {
586      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
587      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  
588      dialog.set_secondary_text(      dialog.set_secondary_text(
589          _("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 "
590            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
591            "load it.")            "load it."));
    );  
 #endif  
592      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
593      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
594      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
# Line 620  void MainWindow::on_action_file_open() Line 607  void MainWindow::on_action_file_open()
607      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
608      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
609      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
610    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
611      Gtk::FileFilter filter;      Gtk::FileFilter filter;
612      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
613    #else
614        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
615        filter->add_pattern("*.gig");
616    #endif
617      dialog.set_filter(filter);      dialog.set_filter(filter);
618      if (current_dir != "") {      if (current_gig_dir != "") {
619          dialog.set_current_folder(current_dir);          dialog.set_current_folder(current_gig_dir);
620      }      }
621      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
622          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
623          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
624          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
625          load_file(filename.c_str());          load_file(filename.c_str());
626          current_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
627      }      }
628  }  }
629    
630  void MainWindow::load_file(const char* name)  void MainWindow::load_file(const char* name)
631  {  {
632      __clear();      __clear();
633      load_dialog = new LoadDialog("Loading...", *this);      load_dialog = new LoadDialog(_("Loading..."), *this);
634      load_dialog->show_all();      load_dialog->show_all();
635      loader = new Loader(strdup(name));      loader = new Loader(strdup(name));
636      loader->signal_progress().connect(      loader->signal_progress().connect(
# Line 671  void MainWindow::on_loader_progress() Line 663  void MainWindow::on_loader_progress()
663  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
664  {  {
665      printf("Loader finished!\n");      printf("Loader finished!\n");
666      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
667      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
668      load_dialog->hide();      load_dialog->hide();
669  }  }
# Line 743  bool MainWindow::file_save_as() Line 735  bool MainWindow::file_save_as()
735      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
736      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
737      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  
738      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
739      // TODO: an overwrite dialog for gtkmm < 2.8  
740  #endif  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
741      Gtk::FileFilter filter;      Gtk::FileFilter filter;
742      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
743    #else
744        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
745        filter->add_pattern("*.gig");
746    #endif
747      dialog.set_filter(filter);      dialog.set_filter(filter);
748    
749      if (Glib::path_is_absolute(filename)) {      // set initial dir and filename of the Save As dialog
750          dialog.set_filename(filename);      // and prepare that initial filename as a copy of the gig
751      } else if (current_dir != "") {      {
752          dialog.set_current_folder(current_dir);          std::string basename = Glib::path_get_basename(filename);
753      }          std::string dir = Glib::path_get_dirname(filename);
754      dialog.set_current_name(Glib::filename_display_basename(filename));          basename = std::string(_("copy_of_")) + basename;
755            Glib::ustring copyFileName = Glib::build_filename(dir, basename);
756            if (Glib::path_is_absolute(filename)) {
757                dialog.set_filename(copyFileName);
758            } else {
759                if (current_gig_dir != "") dialog.set_current_folder(current_gig_dir);
760            }
761            dialog.set_current_name(Glib::filename_display_basename(copyFileName));
762        }
763    
764        // show warning in the dialog
765        Gtk::HBox descriptionArea;
766        descriptionArea.set_spacing(15);
767        Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
768        descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
769        view::WrapLabel description;
770        description.set_markup(
771            _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
772              "<span style=\"italic\">\"Save\"</span> dialog instead of "
773              "<span style=\"italic\">\"Save As...\"</span> if you want to save "
774              "to the same .gig file. Using "
775              "<span style=\"italic\">\"Save As...\"</span> for writing to the "
776              "same .gig file will end up in corrupted sample wave data!\n")
777        );
778        descriptionArea.pack_start(description);
779        dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
780        descriptionArea.show_all();
781    
782      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
783          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 789  bool MainWindow::file_save_as()
789              printf("filename=%s\n", filename.c_str());              printf("filename=%s\n", filename.c_str());
790              file->Save(filename);              file->Save(filename);
791              this->filename = filename;              this->filename = filename;
792              current_dir = Glib::path_get_dirname(filename);              current_gig_dir = Glib::path_get_dirname(filename);
793              set_title(Glib::filename_display_basename(filename));              set_title(Glib::filename_display_basename(filename));
794              file_has_name = true;              file_has_name = true;
795              file_is_changed = false;              file_is_changed = false;
# Line 799  void MainWindow::__import_queued_samples Line 819  void MainWindow::__import_queued_samples
819          info.format = 0;          info.format = 0;
820          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
821          try {          try {
822              if (!hFile) throw std::string("could not open file");              if (!hFile) throw std::string(_("could not open file"));
823              // determine sample's bit depth              // determine sample's bit depth
824              int bitdepth;              int bitdepth;
825              switch (info.format & 0xff) {              switch (info.format & 0xff) {
# Line 816  void MainWindow::__import_queued_samples Line 836  void MainWindow::__import_queued_samples
836                      break;                      break;
837                  default:                  default:
838                      sf_close(hFile); // close sound file                      sf_close(hFile); // close sound file
839                      throw std::string("format not supported"); // unsupported subformat (yet?)                      throw std::string(_("format not supported")); // unsupported subformat (yet?)
840              }              }
841    
842              const int bufsize = 10000;              const int bufsize = 10000;
# Line 858  void MainWindow::__import_queued_samples Line 878  void MainWindow::__import_queued_samples
878              }              }
879              // cleanup              // cleanup
880              sf_close(hFile);              sf_close(hFile);
881                // let the sampler re-cache the sample if needed
882                sample_changed_signal.emit(iter->gig_sample);
883              // on success we remove the sample from the import queue,              // on success we remove the sample from the import queue,
884              // otherwise keep it, maybe it works the next time ?              // otherwise keep it, maybe it works the next time ?
885              std::list<SampleImportItem>::iterator cur = iter;              std::list<SampleImportItem>::iterator cur = iter;
# Line 886  void MainWindow::on_action_file_properti Line 908  void MainWindow::on_action_file_properti
908    
909  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
910  {  {
 #ifdef ABOUT_DIALOG  
911      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
912    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
913        dialog.set_program_name("Gigedit");
914    #else
915        dialog.set_name("Gigedit");
916    #endif
917      dialog.set_version(VERSION);      dialog.set_version(VERSION);
918      dialog.set_copyright("Copyright (C) 2006,2007 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2011 Andreas Persson");
919      dialog.set_comments(      dialog.set_comments(_(
920          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
921          "\n"          "\n"
922          "Please notice that this is still a very young instrument editor. "          "Please notice that this is still a very young instrument editor. "
923          "So better backup your Gigasampler files before editing them with "          "So better backup your Gigasampler files before editing them with "
924          "this application.\n"          "this application.\n"
925          "\n"          "\n"
926          "Please report bugs to: http://bugs.linuxsampler.org"          "Please report bugs to: http://bugs.linuxsampler.org")
927      );      );
928      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
929      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
930      dialog.run();      dialog.run();
 #endif  
931  }  }
932    
933  PropDialog::PropDialog()  PropDialog::PropDialog()
934      : table(2,1),      : eName(_("Name")),
935        eName("Name"),        eCreationDate(_("Creation date")),
936        eCreationDate("Creation date"),        eComments(_("Comments")),
937        eComments("Comments"),        eProduct(_("Product")),
938        eProduct("Product"),        eCopyright(_("Copyright")),
939        eCopyright("Copyright"),        eArtists(_("Artists")),
940        eArtists("Artists"),        eGenre(_("Genre")),
941        eGenre("Genre"),        eKeywords(_("Keywords")),
942        eKeywords("Keywords"),        eEngineer(_("Engineer")),
943        eEngineer("Engineer"),        eTechnician(_("Technician")),
944        eTechnician("Technician"),        eSoftware(_("Software")),
945        eSoftware("Software"),        eMedium(_("Medium")),
946        eMedium("Medium"),        eSource(_("Source")),
947        eSource("Source"),        eSourceForm(_("Source form")),
948        eSourceForm("Source form"),        eCommissioned(_("Commissioned")),
949        eCommissioned("Commissioned"),        eSubject(_("Subject")),
       eSubject("Subject"),  
950        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
951          table(2, 1),
952        update_model(0)        update_model(0)
953  {  {
954      set_title("File Properties");      set_title(_("File Properties"));
955      eName.set_width_chars(50);      eName.set_width_chars(50);
956    
957      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
# Line 972  PropDialog::PropDialog() Line 997  PropDialog::PropDialog()
997      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
998      buttonBox.show();      buttonBox.show();
999      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1000      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1001      quitButton.grab_focus();      quitButton.grab_focus();
1002      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
1003          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
# Line 1042  void InstrumentProps::set_DimensionKeyRa Line 1067  void InstrumentProps::set_DimensionKeyRa
1067  }  }
1068    
1069  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1070      : table(2,1),      : update_model(0),
1071        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1072        eName("Name"),        table(2,1),
1073        eIsDrum("Is drum"),        eName(_("Name")),
1074        eMIDIBank("MIDI bank", 0, 16383),        eIsDrum(_("Is drum")),
1075        eMIDIProgram("MIDI program"),        eMIDIBank(_("MIDI bank"), 0, 16383),
1076        eAttenuation("Attenuation", 0, 96, 0, 1),        eMIDIProgram(_("MIDI program")),
1077        eGainPlus6("Gain +6dB", eAttenuation, -6),        eAttenuation(_("Attenuation"), 0, 96, 0, 1),
1078        eEffectSend("Effect send", 0, 65535),        eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
1079        eFineTune("Fine tune", -8400, 8400),        eEffectSend(_("Effect send"), 0, 65535),
1080        ePitchbendRange("Pitchbend range", 0, 12),        eFineTune(_("Fine tune"), -8400, 8400),
1081        ePianoReleaseMode("Piano release mode"),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1082        eDimensionKeyRangeLow("Keyswitching range low"),        ePianoReleaseMode(_("Piano release mode")),
1083        eDimensionKeyRangeHigh("Keyswitching range high"),        eDimensionKeyRangeLow(_("Keyswitching range low")),
1084        update_model(0)        eDimensionKeyRangeHigh(_("Keyswitching range high"))
1085  {  {
1086      set_title("Instrument Properties");      set_title(_("Instrument Properties"));
1087    
1088      eDimensionKeyRangeLow.set_tip(      eDimensionKeyRangeLow.set_tip(
1089          _("start of the keyboard area which should switch the "          _("start of the keyboard area which should switch the "
# Line 1107  InstrumentProps::InstrumentProps() Line 1132  InstrumentProps::InstrumentProps()
1132      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1133      buttonBox.show();      buttonBox.show();
1134      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1135      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1136      quitButton.grab_focus();      quitButton.grab_focus();
1137    
1138      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
# Line 1283  void MainWindow::on_action_add_instrumen Line 1308  void MainWindow::on_action_add_instrumen
1308      gig::Instrument* instrument = file->AddInstrument();      gig::Instrument* instrument = file->AddInstrument();
1309      __instrument_indexer++;      __instrument_indexer++;
1310      instrument->pInfo->Name =      instrument->pInfo->Name =
1311          "Unnamed Instrument " + ToString(__instrument_indexer);          _("Unnamed Instrument ") + ToString(__instrument_indexer);
1312      // update instrument tree view      // update instrument tree view
1313      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1314      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
# Line 1326  void MainWindow::on_action_remove_instru Line 1351  void MainWindow::on_action_remove_instru
1351  void MainWindow::on_action_sample_properties() {  void MainWindow::on_action_sample_properties() {
1352      //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
1353      Gtk::MessageDialog msg(      Gtk::MessageDialog msg(
1354          *this, "Sorry, yet to be implemented!", false, Gtk::MESSAGE_INFO          *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO
1355      );      );
1356      msg.run();      msg.run();
1357  }  }
# Line 1335  void MainWindow::on_action_add_group() { Line 1360  void MainWindow::on_action_add_group() {
1360      static int __sample_indexer = 0;      static int __sample_indexer = 0;
1361      if (!file) return;      if (!file) return;
1362      gig::Group* group = file->AddGroup();      gig::Group* group = file->AddGroup();
1363      group->Name = "Unnamed Group";      group->Name = _("Unnamed Group");
1364      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
1365      __sample_indexer++;      __sample_indexer++;
1366      // update sample tree view      // update sample tree view
# Line 1369  void MainWindow::on_action_add_sample() Line 1394  void MainWindow::on_action_add_sample()
1394      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1395      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1396      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1397      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile  
1398        // matches all file types supported by libsndfile
1399    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1400        Gtk::FileFilter soundfilter;
1401    #else
1402        Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
1403    #endif
1404      const char* const supportedFileTypes[] = {      const char* const supportedFileTypes[] = {
1405          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1406          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
# Line 1377  void MainWindow::on_action_add_sample() Line 1408  void MainWindow::on_action_add_sample()
1408          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1409          "*.caf", "*.CAF", NULL          "*.caf", "*.CAF", NULL
1410      };      };
1411        const char* soundfiles = _("Sound Files");
1412        const char* allfiles = _("All Files");
1413    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1414      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1415          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1416      soundfilter.set_name("Sound Files");      soundfilter.set_name(soundfiles);
1417      Gtk::FileFilter allpassfilter; // matches every file  
1418        // matches every file
1419        Gtk::FileFilter allpassfilter;
1420      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1421      allpassfilter.set_name("All Files");      allpassfilter.set_name(allfiles);
1422    #else
1423        for (int i = 0; supportedFileTypes[i]; i++)
1424            soundfilter->add_pattern(supportedFileTypes[i]);
1425        soundfilter->set_name(soundfiles);
1426    
1427        // matches every file
1428        Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
1429        allpassfilter->add_pattern("*.*");
1430        allpassfilter->set_name(allfiles);
1431    #endif
1432      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1433      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1434        if (current_sample_dir != "") {
1435            dialog.set_current_folder(current_sample_dir);
1436        }
1437      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1438            current_sample_dir = dialog.get_current_folder();
1439          Glib::ustring error_files;          Glib::ustring error_files;
1440          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
1441          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (std::vector<std::string>::iterator iter = filenames.begin();
1442               iter != filenames.end(); ++iter) {               iter != filenames.end(); ++iter) {
1443              printf("Adding sample %s\n",(*iter).c_str());              printf("Adding sample %s\n",(*iter).c_str());
1444              // use libsndfile to retrieve file informations              // use libsndfile to retrieve file informations
# Line 1396  void MainWindow::on_action_add_sample() Line 1446  void MainWindow::on_action_add_sample()
1446              info.format = 0;              info.format = 0;
1447              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
1448              try {              try {
1449                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1450                  int bitdepth;                  int bitdepth;
1451                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1452                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1412  void MainWindow::on_action_add_sample() Line 1462  void MainWindow::on_action_add_sample()
1462                          break;                          break;
1463                      default:                      default:
1464                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
1465                          throw std::string("format not supported"); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
1466                  }                  }
1467                  // add a new sample to the .gig file                  // add a new sample to the .gig file
1468                  gig::Sample* sample = file->AddSample();                  gig::Sample* sample = file->AddSample();
# Line 1503  void MainWindow::on_action_replace_all_s Line 1553  void MainWindow::on_action_replace_all_s
1553      if (!file) return;      if (!file) return;
1554      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1555                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1556      Gtk::Label description(      view::WrapLabel description(
1557          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1558            "in the current gig file by samples located in the directory chosen "            "in the current gig file by samples located in the chosen "
1559            "by you above.\n\n"            "directory.\n\n"
1560            "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 "
1561            "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 "
1562            "the sample in the gig file. Optionally you can add a filename "            "the sample in the gig file. Optionally, you can add a filename "
1563            "postfix below, which will be added to the filename expected to be "            "extension below, which will be added to the filename expected to be "
1564            "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 "
1565            "'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 "
1566            "assumes to find a sample file called 'Snare.wav' and will replace "            "expects to find a sample file called 'Snare.wav' and will replace "
1567            "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 "
1568            "postfix, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1569            "appropriate sample file could be found, will be reported and left "            "appropriate sample file could be found will be reported and left "
1570            "untouched.\n\n")            "untouched.\n")
1571      );      );
     description.set_line_wrap(true);  
1572      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1573      Gtk::Label entryLabel( _("Add Filename Extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1574      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1575      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1576      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1529  void MainWindow::on_action_replace_all_s Line 1578  void MainWindow::on_action_replace_all_s
1578      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
1579      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
1580      description.show();      description.show();
1581      entryLabel.show();      entryArea.show_all();
     postfixEntryBox.show();  
     entryArea.show();  
1582      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1583      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
1584      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
1585      // fix label width (because Gtk by design doesn't      if (current_sample_dir != "") {
1586      // know anything about the parent's size)          dialog.set_current_folder(current_sample_dir);
1587  #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  
1588      if (dialog.run() == Gtk::RESPONSE_OK)      if (dialog.run() == Gtk::RESPONSE_OK)
1589      {      {
1590            current_sample_dir = dialog.get_current_folder();
1591          Glib::ustring error_files;          Glib::ustring error_files;
1592          Glib::ustring folder = dialog.get_filename();          std::string folder = dialog.get_filename();
1593          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
1594               sample; sample = file->GetNextSample())               sample; sample = file->GetNextSample())
1595          {          {
# Line 1559  void MainWindow::on_action_replace_all_s Line 1601  void MainWindow::on_action_replace_all_s
1601              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
1602              try              try
1603              {              {
1604                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1605                  int bitdepth;                  int bitdepth;
1606                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1607                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1575  void MainWindow::on_action_replace_all_s Line 1617  void MainWindow::on_action_replace_all_s
1617                          break;                          break;
1618                      default:                      default:
1619                          sf_close(hFile);                          sf_close(hFile);
1620                          throw std::string("format not supported");                          throw std::string(_("format not supported"));
1621                  }                  }
1622                  SampleImportItem sched_item;                  SampleImportItem sched_item;
1623                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
# Line 1848  sigc::signal<void, gig::Region*>& MainWi Line 1890  sigc::signal<void, gig::Region*>& MainWi
1890      return region_changed_signal;      return region_changed_signal;
1891  }  }
1892    
1893    sigc::signal<void, gig::Sample*>& MainWindow::signal_sample_changed() {
1894        return sample_changed_signal;
1895    }
1896    
1897  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() {
1898      return sample_ref_changed_signal;      return sample_ref_changed_signal;
1899  }  }

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

  ViewVC Help
Powered by ViewVC