/[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 2701 by schoenebeck, Mon Jan 12 23:28:04 2015 UTC revision 2845 by persson, Sun Sep 20 10:18:22 2015 UTC
# Line 20  Line 20 
20  #include <iostream>  #include <iostream>
21  #include <cstring>  #include <cstring>
22    
23    #include <glibmmconfig.h>
24    // threads.h must be included first to be able to build with
25    // G_DISABLE_DEPRECATED
26    #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \
27        (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION > 31) || GLIBMM_MAJOR_VERSION > 2
28    #include <glibmm/threads.h>
29    #endif
30    
31  #include <glibmm/convert.h>  #include <glibmm/convert.h>
32  #include <glibmm/dispatcher.h>  #include <glibmm/dispatcher.h>
33  #include <glibmm/miscutils.h>  #include <glibmm/miscutils.h>
# Line 27  Line 35 
35  #include <gtkmm/aboutdialog.h>  #include <gtkmm/aboutdialog.h>
36  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
37  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.h>  
38  #include <gtkmm/targetentry.h>  #include <gtkmm/targetentry.h>
39  #include <gtkmm/main.h>  #include <gtkmm/main.h>
40  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
# Line 110  MainWindow::MainWindow() : Line 117  MainWindow::MainWindow() :
117      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
118    
119      actionGroup->add(Gtk::Action::create("MenuFile", _("_File")));      actionGroup->add(Gtk::Action::create("MenuFile", _("_File")));
120      actionGroup->add(Gtk::Action::create("New", Gtk::Stock::NEW),      actionGroup->add(Gtk::Action::create("New", _("_New")),
121                         Gtk::AccelKey("<control>n"),
122                       sigc::mem_fun(                       sigc::mem_fun(
123                           *this, &MainWindow::on_action_file_new));                           *this, &MainWindow::on_action_file_new));
124      Glib::RefPtr<Gtk::Action> action =      actionGroup->add(Gtk::Action::create("Open", _("_Open...")),
125          Gtk::Action::create("Open", Gtk::Stock::OPEN);                       Gtk::AccelKey("<control>o"),
     action->property_label() = action->property_label() + "...";  
     actionGroup->add(action,  
126                       sigc::mem_fun(                       sigc::mem_fun(
127                           *this, &MainWindow::on_action_file_open));                           *this, &MainWindow::on_action_file_open));
128      actionGroup->add(Gtk::Action::create("Save", Gtk::Stock::SAVE),      actionGroup->add(Gtk::Action::create("Save", _("_Save")),
129                         Gtk::AccelKey("<control>s"),
130                       sigc::mem_fun(                       sigc::mem_fun(
131                           *this, &MainWindow::on_action_file_save));                           *this, &MainWindow::on_action_file_save));
132      action = Gtk::Action::create("SaveAs", Gtk::Stock::SAVE_AS);      actionGroup->add(Gtk::Action::create("SaveAs", _("Save _As...")),
     action->property_label() = action->property_label() + "...";  
     actionGroup->add(action,  
133                       Gtk::AccelKey("<shift><control>s"),                       Gtk::AccelKey("<shift><control>s"),
134                       sigc::mem_fun(                       sigc::mem_fun(
135                           *this, &MainWindow::on_action_file_save_as));                           *this, &MainWindow::on_action_file_save_as));
136      actionGroup->add(Gtk::Action::create("Properties",      actionGroup->add(Gtk::Action::create("Properties",
137                                           Gtk::Stock::PROPERTIES),                                           _("_Properties")),
138                       sigc::mem_fun(                       sigc::mem_fun(
139                           *this, &MainWindow::on_action_file_properties));                           *this, &MainWindow::on_action_file_properties));
140      actionGroup->add(Gtk::Action::create("InstrProperties",      actionGroup->add(Gtk::Action::create("InstrProperties",
141                                           Gtk::Stock::PROPERTIES),                                           _("_Properties")),
142                       sigc::mem_fun(                       sigc::mem_fun(
143                           *this, &MainWindow::show_instr_props));                           *this, &MainWindow::show_instr_props));
144      actionGroup->add(Gtk::Action::create("MidiRules",      actionGroup->add(Gtk::Action::create("MidiRules",
# Line 144  MainWindow::MainWindow() : Line 149  MainWindow::MainWindow() :
149                                           _("_Script Slots...")),                                           _("_Script Slots...")),
150                       sigc::mem_fun(                       sigc::mem_fun(
151                           *this, &MainWindow::show_script_slots));                           *this, &MainWindow::show_script_slots));
152      actionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),      actionGroup->add(Gtk::Action::create("Quit", _("_Quit")),
153                         Gtk::AccelKey("<control>q"),
154                       sigc::mem_fun(                       sigc::mem_fun(
155                           *this, &MainWindow::on_action_quit));                           *this, &MainWindow::on_action_quit));
156      actionGroup->add(      actionGroup->add(
# Line 186  MainWindow::MainWindow() : Line 192  MainWindow::MainWindow() :
192      actionGroup->add(toggle_action,      actionGroup->add(toggle_action,
193                       sigc::mem_fun(                       sigc::mem_fun(
194                           *this, &MainWindow::on_action_view_status_bar));                           *this, &MainWindow::on_action_view_status_bar));
195        actionGroup->add(
196            Gtk::Action::create("RefreshAll", _("_Refresh All")),
197            sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
198        );                
199    
200      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      actionGroup->add(Gtk::Action::create("MenuHelp", _("_Help")));
201      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("About", _("_About")),
                                          action->property_label()));  
     actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),  
202                       sigc::mem_fun(                       sigc::mem_fun(
203                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
204      actionGroup->add(      actionGroup->add(
# Line 202  MainWindow::MainWindow() : Line 210  MainWindow::MainWindow() :
210          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
211      );      );
212      actionGroup->add(      actionGroup->add(
213          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveInstrument", _("_Remove")),
214          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
215      );      );
216    
# Line 225  MainWindow::MainWindow() : Line 233  MainWindow::MainWindow() :
233          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)
234      );      );
235    
236        toggle_action =
237            Gtk::ToggleAction::create("MoveRootNoteWithRegionMoved", _("Move root note with region moved"));
238        toggle_action->set_active(Settings::singleton()->moveRootNoteWithRegionMoved);
239        actionGroup->add(
240            toggle_action,
241            sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved)
242        );
243    
244    
245      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
246    
# Line 241  MainWindow::MainWindow() : Line 257  MainWindow::MainWindow() :
257    
258      // sample right-click popup actions      // sample right-click popup actions
259      actionGroup->add(      actionGroup->add(
260          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),          Gtk::Action::create("SampleProperties", _("_Properties")),
261          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)
262      );      );
263      actionGroup->add(      actionGroup->add(
# Line 253  MainWindow::MainWindow() : Line 269  MainWindow::MainWindow() :
269          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
270      );      );
271      actionGroup->add(      actionGroup->add(
272          Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveSample", _("_Remove")),
273          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
274      );      );
275      actionGroup->add(      actionGroup->add(
276            Gtk::Action::create("RemoveUnusedSamples", _("Remove _Unused Samples")),
277            sigc::mem_fun(*this, &MainWindow::on_action_remove_unused_samples)
278        );
279        actionGroup->add(
280          Gtk::Action::create("ShowSampleRefs", _("Show References...")),          Gtk::Action::create("ShowSampleRefs", _("Show References...")),
281          sigc::mem_fun(*this, &MainWindow::on_action_view_references)          sigc::mem_fun(*this, &MainWindow::on_action_view_references)
282      );      );
283      actionGroup->add(      actionGroup->add(
284            Gtk::Action::create("ReplaceSample",
285                                _("Replace Sample...")),
286            sigc::mem_fun(*this, &MainWindow::on_action_replace_sample)
287        );
288        actionGroup->add(
289          Gtk::Action::create("ReplaceAllSamplesInAllGroups",          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
290                              _("Replace All Samples in All Groups...")),                              _("Replace All Samples in All Groups...")),
291          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)
# Line 280  MainWindow::MainWindow() : Line 305  MainWindow::MainWindow() :
305          sigc::mem_fun(*this, &MainWindow::on_action_edit_script)          sigc::mem_fun(*this, &MainWindow::on_action_edit_script)
306      );      );
307      actionGroup->add(      actionGroup->add(
308          Gtk::Action::create("RemoveScript", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveScript", _("_Remove")),
309          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
310      );      );
311    
# Line 312  MainWindow::MainWindow() : Line 337  MainWindow::MainWindow() :
337          "      <menuitem action='AddGroup'/>"          "      <menuitem action='AddGroup'/>"
338          "      <menuitem action='AddSample'/>"          "      <menuitem action='AddSample'/>"
339          "      <menuitem action='ShowSampleRefs'/>"          "      <menuitem action='ShowSampleRefs'/>"
340            "      <menuitem action='ReplaceSample' />"
341          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"
342          "      <separator/>"          "      <separator/>"
343          "      <menuitem action='RemoveSample'/>"          "      <menuitem action='RemoveSample'/>"
344            "      <menuitem action='RemoveUnusedSamples'/>"
345          "    </menu>"          "    </menu>"
346          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
347          "      <menu action='AllInstruments'>"          "      <menu action='AllInstruments'>"
# Line 337  MainWindow::MainWindow() : Line 364  MainWindow::MainWindow() :
364          "    </menu>"          "    </menu>"
365          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
366          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
367            "      <separator/>"
368            "      <menuitem action='RefreshAll'/>"
369          "    </menu>"          "    </menu>"
370          "    <menu action='MenuTools'>"          "    <menu action='MenuTools'>"
371          "      <menuitem action='CombineInstruments'/>"          "      <menuitem action='CombineInstruments'/>"
# Line 345  MainWindow::MainWindow() : Line 374  MainWindow::MainWindow() :
374          "    <menu action='MenuSettings'>"          "    <menu action='MenuSettings'>"
375          "      <menuitem action='WarnUserOnExtensions'/>"          "      <menuitem action='WarnUserOnExtensions'/>"
376          "      <menuitem action='SyncSamplerInstrumentSelection'/>"          "      <menuitem action='SyncSamplerInstrumentSelection'/>"
377            "      <menuitem action='MoveRootNoteWithRegionMoved'/>"
378          "    </menu>"          "    </menu>"
379          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
380          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
# Line 364  MainWindow::MainWindow() : Line 394  MainWindow::MainWindow() :
394          "    <menuitem action='AddGroup'/>"          "    <menuitem action='AddGroup'/>"
395          "    <menuitem action='AddSample'/>"          "    <menuitem action='AddSample'/>"
396          "    <menuitem action='ShowSampleRefs'/>"          "    <menuitem action='ShowSampleRefs'/>"
397            "    <menuitem action='ReplaceSample' />"
398          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
399          "    <separator/>"          "    <separator/>"
400          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
401            "    <menuitem action='RemoveUnusedSamples'/>"
402          "  </popup>"          "  </popup>"
403          "  <popup name='ScriptPopupMenu'>"          "  <popup name='ScriptPopupMenu'>"
404          "    <menuitem action='AddScriptGroup'/>"          "    <menuitem action='AddScriptGroup'/>"
# Line 411  MainWindow::MainWindow() : Line 443  MainWindow::MainWindow() :
443      }      }
444      {      {
445          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
446                uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
447            item->set_tooltip_text(_("If checked, and when a region is moved by dragging it around on the virtual keyboard, the keybord position dependent pitch will move exactly with the amount of semi tones the region was moved around."));
448        }
449        {
450            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
451                uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));
452            item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));
453            // copy tooltip to popup menu
454            Gtk::MenuItem* item2 = dynamic_cast<Gtk::MenuItem*>(
455                uiManager->get_widget("/SamplePopupMenu/RemoveUnusedSamples"));
456            item2->set_tooltip_text(item->get_tooltip_text());
457        }
458        {
459            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
460                uiManager->get_widget("/MenuBar/MenuView/RefreshAll"));
461            item->set_tooltip_text(_("Reloads the currently open gig file and updates the entire graphical user interface."));
462        }
463        {
464            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
465              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
466          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));
467      }      }
# Line 558  MainWindow::MainWindow() : Line 609  MainWindow::MainWindow() :
609          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));
610      m_RegionChooser.signal_instrument_changed().connect(      m_RegionChooser.signal_instrument_changed().connect(
611          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
612        m_RegionChooser.signal_instrument_changed().connect(
613            sigc::mem_fun(*this, &MainWindow::region_changed));
614      m_DimRegionChooser.signal_region_changed().connect(      m_DimRegionChooser.signal_region_changed().connect(
615          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
616      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
# Line 747  void Loader::progress_callback(float fra Line 800  void Loader::progress_callback(float fra
800    
801  void Loader::thread_function()  void Loader::thread_function()
802  {  {
803      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
804               static_cast<void*>(Glib::Threads::Thread::self()));
805      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
806      try {      try {
807          RIFF::File* riff = new RIFF::File(filename);          RIFF::File* riff = new RIFF::File(filename);
# Line 769  void Loader::thread_function() Line 823  void Loader::thread_function()
823  }  }
824    
825  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
826      : filename(filename), thread(0), progress(0.f)      : filename(filename), gig(0), thread(0), progress(0.f)
827  {  {
828  }  }
829    
# Line 780  void Loader::launch() Line 834  void Loader::launch()
834  #else  #else
835      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
836  #endif  #endif
837      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
838  }  }
839    
840  float Loader::get_progress()  float Loader::get_progress()
# Line 825  void Saver::progress_callback(float frac Line 879  void Saver::progress_callback(float frac
879    
880  void Saver::thread_function()  void Saver::thread_function()
881  {  {
882      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
883               static_cast<void*>(Glib::Threads::Thread::self()));
884      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
885      try {      try {
886          gig::progress_t progress;          gig::progress_t progress;
# Line 862  void Saver::launch() Line 917  void Saver::launch()
917  #else  #else
918      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));
919  #endif  #endif
920      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
921  }  }
922    
923  float Saver::get_progress()  float Saver::get_progress()
# Line 959  bool MainWindow::close_confirmation_dial Line 1014  bool MainWindow::close_confirmation_dial
1014      g_free(msg);      g_free(msg);
1015      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."));
1016      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
1017      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1018      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);      dialog.add_button(file_has_name ? _("_Save") : _("Save _As"), Gtk::RESPONSE_YES);
1019      dialog.set_default_response(Gtk::RESPONSE_YES);      dialog.set_default_response(Gtk::RESPONSE_YES);
1020      int response = dialog.run();      int response = dialog.run();
1021      dialog.hide();      dialog.hide();
# Line 991  bool MainWindow::leaving_shared_mode_dia Line 1046  bool MainWindow::leaving_shared_mode_dia
1046            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
1047            "load it."));            "load it."));
1048      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
1049      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1050      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
1051      int response = dialog.run();      int response = dialog.run();
1052      dialog.hide();      dialog.hide();
# Line 1005  void MainWindow::on_action_file_open() Line 1060  void MainWindow::on_action_file_open()
1060      if (file_is_shared && !leaving_shared_mode_dialog()) return;      if (file_is_shared && !leaving_shared_mode_dialog()) return;
1061    
1062      Gtk::FileChooserDialog dialog(*this, _("Open file"));      Gtk::FileChooserDialog dialog(*this, _("Open file"));
1063      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1064      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
1065      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
1066  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1067      Gtk::FileFilter filter;      Gtk::FileFilter filter;
# Line 1022  void MainWindow::on_action_file_open() Line 1077  void MainWindow::on_action_file_open()
1077      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1078          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
1079          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
1080          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());          printf("on_action_file_open self=%p\n",
1081                   static_cast<void*>(Glib::Threads::Thread::self()));
1082          load_file(filename.c_str());          load_file(filename.c_str());
1083          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
1084      }      }
# Line 1092  void MainWindow::on_loader_progress() Line 1148  void MainWindow::on_loader_progress()
1148  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
1149  {  {
1150      printf("Loader finished!\n");      printf("Loader finished!\n");
1151      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());      printf("on_loader_finished self=%p\n",
1152               static_cast<void*>(Glib::Threads::Thread::self()));
1153      load_gig(loader->gig, loader->filename.c_str());      load_gig(loader->gig, loader->filename.c_str());
1154      progress_dialog->hide();      progress_dialog->hide();
1155  }  }
# Line 1199  void MainWindow::on_action_file_save_as( Line 1256  void MainWindow::on_action_file_save_as(
1256    
1257  bool MainWindow::file_save_as()  bool MainWindow::file_save_as()
1258  {  {
1259      Gtk::FileChooserDialog dialog(*this, _("Save as"), Gtk::FILE_CHOOSER_ACTION_SAVE);      Gtk::FileChooserDialog dialog(*this, _("Save As"), Gtk::FILE_CHOOSER_ACTION_SAVE);
1260      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1261      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(_("_Save"), Gtk::RESPONSE_OK);
1262      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
1263      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
1264    
# Line 1232  bool MainWindow::file_save_as() Line 1289  bool MainWindow::file_save_as()
1289      // show warning in the dialog      // show warning in the dialog
1290      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
1291      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
1292      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
1293        warningIcon.set_from_icon_name("dialog-warning",
1294                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
1295      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
1296  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
1297      view::WrapLabel description;      view::WrapLabel description;
# Line 1284  bool MainWindow::file_save_as() Line 1343  bool MainWindow::file_save_as()
1343  void MainWindow::__import_queued_samples() {  void MainWindow::__import_queued_samples() {
1344      std::cout << "Starting sample import\n" << std::flush;      std::cout << "Starting sample import\n" << std::flush;
1345      Glib::ustring error_files;      Glib::ustring error_files;
1346      printf("Samples to import: %d\n", m_SampleImportQueue.size());      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));
1347      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
1348           iter != m_SampleImportQueue.end(); ) {           iter != m_SampleImportQueue.end(); ) {
1349          printf("Importing sample %s\n",(*iter).sample_path.c_str());          printf("Importing sample %s\n",(*iter).sample_path.c_str());
# Line 1390  void MainWindow::on_action_sync_sampler_ Line 1449  void MainWindow::on_action_sync_sampler_
1449          !Settings::singleton()->syncSamplerInstrumentSelection;          !Settings::singleton()->syncSamplerInstrumentSelection;
1450  }  }
1451    
1452    void MainWindow::on_action_move_root_note_with_region_moved() {
1453        Settings::singleton()->moveRootNoteWithRegionMoved =
1454            !Settings::singleton()->moveRootNoteWithRegionMoved;
1455    }
1456    
1457  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
1458  {  {
1459      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
# Line 1436  PropDialog::PropDialog() Line 1500  PropDialog::PropDialog()
1500        eSourceForm(_("Source form")),        eSourceForm(_("Source form")),
1501        eCommissioned(_("Commissioned")),        eCommissioned(_("Commissioned")),
1502        eSubject(_("Subject")),        eSubject(_("Subject")),
1503        quitButton(Gtk::Stock::CLOSE),        quitButton(_("_Close"), true),
1504        table(2, 1),        table(2, 1),
1505        m_file(NULL)        m_file(NULL)
1506  {  {
# Line 1559  void InstrumentProps::set_MIDIProgram(ui Line 1623  void InstrumentProps::set_MIDIProgram(ui
1623  }  }
1624    
1625  InstrumentProps::InstrumentProps() :  InstrumentProps::InstrumentProps() :
1626      quitButton(Gtk::Stock::CLOSE),      quitButton(_("_Close"), true),
1627      table(2,1),      table(2,1),
1628      eName(_("Name")),      eName(_("Name")),
1629      eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
# Line 1682  void MainWindow::load_gig(gig::File* gig Line 1746  void MainWindow::load_gig(gig::File* gig
1746      file = 0;      file = 0;
1747      set_file_is_shared(isSharedInstrument);      set_file_is_shared(isSharedInstrument);
1748    
1749      this->filename = filename ? filename : _("Unsaved Gig File");      this->filename =
1750            (filename && strlen(filename) > 0) ?
1751                filename : (!gig->GetFileName().empty()) ?
1752                    gig->GetFileName() : _("Unsaved Gig File");
1753      set_title(Glib::filename_display_basename(this->filename));      set_title(Glib::filename_display_basename(this->filename));
1754      file_has_name = filename;      file_has_name = filename;
1755      file_is_changed = false;      file_is_changed = false;
# Line 1836  void MainWindow::show_script_slots() { Line 1903  void MainWindow::show_script_slots() {
1903      window->show();      window->show();
1904  }  }
1905    
1906    void MainWindow::on_action_refresh_all() {
1907        __refreshEntireGUI();
1908    }
1909    
1910  void MainWindow::on_action_view_status_bar() {  void MainWindow::on_action_view_status_bar() {
1911      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1912          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
# Line 2334  void MainWindow::on_action_add_group() { Line 2405  void MainWindow::on_action_add_group() {
2405      file_changed();      file_changed();
2406  }  }
2407    
2408    void MainWindow::on_action_replace_sample() {
2409        add_or_replace_sample(true);
2410    }
2411    
2412  void MainWindow::on_action_add_sample() {  void MainWindow::on_action_add_sample() {
2413        add_or_replace_sample(false);
2414    }
2415    
2416    void MainWindow::add_or_replace_sample(bool replace) {
2417      if (!file) return;      if (!file) return;
2418      // get selected group  
2419        // get selected group (and probably selected sample)
2420      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2421      Gtk::TreeModel::iterator it = sel->get_selected();      Gtk::TreeModel::iterator it = sel->get_selected();
2422      if (!it) return;      if (!it) return;
2423      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
2424        gig::Sample* sample = NULL;
2425      gig::Group* group = row[m_SamplesModel.m_col_group];      gig::Group* group = row[m_SamplesModel.m_col_group];
2426      if (!group) { // not a group, but a sample is selected (probably)      if (!group) { // not a group, but a sample is selected (probably)
2427          gig::Sample* sample = row[m_SamplesModel.m_col_sample];          if (replace) sample = row[m_SamplesModel.m_col_sample];
2428          if (!sample) return;          if (!row[m_SamplesModel.m_col_sample]) return;
2429          it = row.parent(); // resolve parent (that is the sample's group)          it = row.parent(); // resolve parent (that is the sample's group)
2430          if (!it) return;          if (!it) return;
2431          row = *it;          if (!replace) row = *it;
2432          group = row[m_SamplesModel.m_col_group];          group = (*it)[m_SamplesModel.m_col_group];
2433          if (!group) return;          if (!group) return;
2434      }      }
2435        if (replace && !sample) return;
2436    
2437      // show 'browse for file' dialog      // show 'browse for file' dialog
2438      Gtk::FileChooserDialog dialog(*this, _("Add Sample(s)"));      Gtk::FileChooserDialog dialog(*this, replace ? _("Replace Sample with") : _("Add Sample(s)"));
2439      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
2440      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
2441      dialog.set_select_multiple(true);      dialog.set_select_multiple(!replace); // allow multi audio file selection only when adding new samples, does not make sense when replacing a specific sample
2442    
2443      // matches all file types supported by libsndfile      // matches all file types supported by libsndfile
2444  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
# Line 2426  void MainWindow::on_action_add_sample() Line 2509  void MainWindow::on_action_add_sample()
2509                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
2510                          throw std::string(_("format not supported")); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
2511                  }                  }
2512                  // add a new sample to the .gig file                  // add a new sample to the .gig file (if adding is requested actually)
2513                  gig::Sample* sample = file->AddSample();                  if (!replace) sample = file->AddSample();
2514                  // file name without path                  // file name without path
2515                  Glib::ustring filename = Glib::filename_display_basename(*iter);                  Glib::ustring filename = Glib::filename_display_basename(*iter);
2516                  // remove file extension if there is one                  // remove file extension if there is one
# Line 2478  void MainWindow::on_action_add_sample() Line 2561  void MainWindow::on_action_add_sample()
2561                  // physically when File::Save() is called)                  // physically when File::Save() is called)
2562                  sample->Resize(info.frames);                  sample->Resize(info.frames);
2563                  // make sure sample is part of the selected group                  // make sure sample is part of the selected group
2564                  group->AddSample(sample);                  if (!replace) group->AddSample(sample);
2565                  // schedule that physical resize and sample import                  // schedule that physical resize and sample import
2566                  // (data copying), performed when "Save" is requested                  // (data copying), performed when "Save" is requested
2567                  SampleImportItem sched_item;                  SampleImportItem sched_item;
# Line 2486  void MainWindow::on_action_add_sample() Line 2569  void MainWindow::on_action_add_sample()
2569                  sched_item.sample_path = *iter;                  sched_item.sample_path = *iter;
2570                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue.push_back(sched_item);
2571                  // add sample to the tree view                  // add sample to the tree view
2572                  Gtk::TreeModel::iterator iterSample =                  if (replace) {
2573                      m_refSamplesTreeModel->append(row.children());                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);
2574                  Gtk::TreeModel::Row rowSample = *iterSample;                  } else {
2575                  rowSample[m_SamplesModel.m_col_name] =                      Gtk::TreeModel::iterator iterSample =
2576                      gig_to_utf8(sample->pInfo->Name);                          m_refSamplesTreeModel->append(row.children());
2577                  rowSample[m_SamplesModel.m_col_sample] = sample;                      Gtk::TreeModel::Row rowSample = *iterSample;
2578                  rowSample[m_SamplesModel.m_col_group]  = NULL;                      rowSample[m_SamplesModel.m_col_name] =
2579                            gig_to_utf8(sample->pInfo->Name);
2580                        rowSample[m_SamplesModel.m_col_sample] = sample;
2581                        rowSample[m_SamplesModel.m_col_group]  = NULL;
2582                    }
2583                  // close sound file                  // close sound file
2584                  sf_close(hFile);                  sf_close(hFile);
2585                  file_changed();                  file_changed();
# Line 2503  void MainWindow::on_action_add_sample() Line 2590  void MainWindow::on_action_add_sample()
2590          }          }
2591          // show error message box when some file(s) could not be opened / added          // show error message box when some file(s) could not be opened / added
2592          if (!error_files.empty()) {          if (!error_files.empty()) {
2593              Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;              Glib::ustring txt =
2594                    (replace
2595                        ? _("Failed to replace sample with:\n")
2596                        : _("Could not add the following sample(s):\n"))
2597                    + error_files;
2598              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
2599              msg.run();              msg.run();
2600          }          }
# Line 2546  void MainWindow::on_action_replace_all_s Line 2637  void MainWindow::on_action_replace_all_s
2637      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
2638      description.show();      description.show();
2639      entryArea.show_all();      entryArea.show_all();
2640      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
2641      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
2642      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
2643      if (current_sample_dir != "") {      if (current_sample_dir != "") {
# Line 2570  void MainWindow::on_action_replace_all_s Line 2661  void MainWindow::on_action_replace_all_s
2661              try              try
2662              {              {
2663                  if (!hFile) throw std::string(_("could not open file"));                  if (!hFile) throw std::string(_("could not open file"));
                 int bitdepth;  
2664                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
2665                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
2666                      case SF_FORMAT_PCM_16:                      case SF_FORMAT_PCM_16:
2667                      case SF_FORMAT_PCM_U8:                      case SF_FORMAT_PCM_U8:
                         bitdepth = 16;  
                         break;  
2668                      case SF_FORMAT_PCM_24:                      case SF_FORMAT_PCM_24:
2669                      case SF_FORMAT_PCM_32:                      case SF_FORMAT_PCM_32:
2670                      case SF_FORMAT_FLOAT:                      case SF_FORMAT_FLOAT:
2671                      case SF_FORMAT_DOUBLE:                      case SF_FORMAT_DOUBLE:
                         bitdepth = 24;  
2672                          break;                          break;
2673                      default:                      default:
2674                          sf_close(hFile);                          sf_close(hFile);
# Line 2687  void MainWindow::on_action_remove_sample Line 2774  void MainWindow::on_action_remove_sample
2774      }      }
2775  }  }
2776    
2777    void MainWindow::on_action_remove_unused_samples() {
2778        if (!file) return;
2779    
2780        // collect all samples that are not referenced by any instrument
2781        std::list<gig::Sample*> lsamples;
2782        for (int iSample = 0; file->GetSample(iSample); ++iSample) {
2783            gig::Sample* sample = file->GetSample(iSample);
2784            bool isUsed = false;
2785            for (gig::Instrument* instrument = file->GetFirstInstrument(); instrument;
2786                                  instrument = file->GetNextInstrument())
2787            {
2788                for (gig::Region* rgn = instrument->GetFirstRegion(); rgn;
2789                                  rgn = instrument->GetNextRegion())
2790                {
2791                    for (int i = 0; i < 256; ++i) {
2792                        if (!rgn->pDimensionRegions[i]) continue;
2793                        if (rgn->pDimensionRegions[i]->pSample != sample) continue;
2794                        isUsed = true;
2795                        goto endOfRefSearch;
2796                    }
2797                }
2798            }
2799            endOfRefSearch:
2800            if (!isUsed) lsamples.push_back(sample);
2801        }
2802    
2803        if (lsamples.empty()) return;
2804    
2805        // notify everybody that we're going to remove these samples
2806        samples_to_be_removed_signal.emit(lsamples);
2807    
2808        // remove collected samples
2809        try {
2810            for (std::list<gig::Sample*>::iterator itSample = lsamples.begin();
2811                 itSample != lsamples.end(); ++itSample)
2812            {
2813                gig::Sample* sample = *itSample;
2814                // remove sample from the .gig file
2815                file->DeleteSample(sample);
2816                // if sample was just previously added, remove it fro the import queue
2817                for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
2818                     iter != m_SampleImportQueue.end(); ++iter)
2819                {
2820                    if ((*iter).gig_sample == sample) {
2821                        printf("Removing previously added sample '%s'\n",
2822                               (*iter).sample_path.c_str());
2823                        m_SampleImportQueue.erase(iter);
2824                        break;
2825                    }
2826                }
2827            }
2828        } catch (RIFF::Exception e) {
2829            // show error message
2830            Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
2831            msg.run();
2832        }
2833    
2834        // notify everybody that we're done with removal
2835        samples_removed_signal.emit();
2836    
2837        dimreg_changed();
2838        file_changed();
2839        __refreshEntireGUI();
2840    }
2841    
2842  // see comment on on_sample_treeview_drag_begin()  // see comment on on_sample_treeview_drag_begin()
2843  void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)  void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
2844  {  {
# Line 3105  void MainWindow::on_action_merge_files() Line 3257  void MainWindow::on_action_merge_files()
3257      }      }
3258    
3259      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));
3260      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
3261      dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);      dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);
3262      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
3263  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
# Line 3124  void MainWindow::on_action_merge_files() Line 3276  void MainWindow::on_action_merge_files()
3276      // show warning in the file picker dialog      // show warning in the file picker dialog
3277      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
3278      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
3279      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
3280        warningIcon.set_from_icon_name("dialog-warning",
3281                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
3282      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
3283  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
3284      view::WrapLabel description;      view::WrapLabel description;
# Line 3147  void MainWindow::on_action_merge_files() Line 3301  void MainWindow::on_action_merge_files()
3301      descriptionArea.show_all();      descriptionArea.show_all();
3302    
3303      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
3304          printf("on_action_merge_files self=%x\n", Glib::Threads::Thread::self());          printf("on_action_merge_files self=%p\n",
3305                   static_cast<void*>(Glib::Threads::Thread::self()));
3306          std::vector<std::string> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
3307    
3308          // merge the selected files to the currently open .gig file          // merge the selected files to the currently open .gig file
# Line 3159  void MainWindow::on_action_merge_files() Line 3314  void MainWindow::on_action_merge_files()
3314          }          }
3315    
3316          // update GUI          // update GUI
3317          __refreshEntireGUI();                  __refreshEntireGUI();
3318      }      }
3319  }  }
3320    
Legend:
Removed from v.2701  
changed lines
  Added in v.2845
  ViewVC Help
Powered by ViewVC