/[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 2694 by schoenebeck, Tue Jan 6 16:08:48 2015 UTC revision 2918 by schoenebeck, Wed May 18 10:10:25 2016 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2015 Andreas Persson   * Copyright (C) 2006-2016 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 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 187  MainWindow::MainWindow() : Line 193  MainWindow::MainWindow() :
193                       sigc::mem_fun(                       sigc::mem_fun(
194                           *this, &MainWindow::on_action_view_status_bar));                           *this, &MainWindow::on_action_view_status_bar));
195    
196      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      toggle_action =
197      actionGroup->add(Gtk::Action::create("MenuHelp",          Gtk::ToggleAction::create("AutoRestoreWinDim", _("_Auto Restore Window Dimension"));
198                                           action->property_label()));      toggle_action->set_active(Settings::singleton()->autoRestoreWindowDimension);
199      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(toggle_action,
200                         sigc::mem_fun(
201                             *this, &MainWindow::on_auto_restore_win_dim));
202    
203        actionGroup->add(
204            Gtk::Action::create("RefreshAll", _("_Refresh All")),
205            sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
206        );                
207    
208        actionGroup->add(Gtk::Action::create("MenuHelp", _("_Help")));
209        actionGroup->add(Gtk::Action::create("About", _("_About")),
210                       sigc::mem_fun(                       sigc::mem_fun(
211                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
212      actionGroup->add(      actionGroup->add(
# Line 202  MainWindow::MainWindow() : Line 218  MainWindow::MainWindow() :
218          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
219      );      );
220      actionGroup->add(      actionGroup->add(
221          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveInstrument", _("_Remove")),
222          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
223      );      );
224    
# Line 225  MainWindow::MainWindow() : Line 241  MainWindow::MainWindow() :
241          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)
242      );      );
243    
244        toggle_action =
245            Gtk::ToggleAction::create("MoveRootNoteWithRegionMoved", _("Move root note with region moved"));
246        toggle_action->set_active(Settings::singleton()->moveRootNoteWithRegionMoved);
247        actionGroup->add(
248            toggle_action,
249            sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved)
250        );
251    
252    
253      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
254    
# Line 241  MainWindow::MainWindow() : Line 265  MainWindow::MainWindow() :
265    
266      // sample right-click popup actions      // sample right-click popup actions
267      actionGroup->add(      actionGroup->add(
268          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),          Gtk::Action::create("SampleProperties", _("_Properties")),
269          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)
270      );      );
271      actionGroup->add(      actionGroup->add(
# Line 253  MainWindow::MainWindow() : Line 277  MainWindow::MainWindow() :
277          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
278      );      );
279      actionGroup->add(      actionGroup->add(
280          Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveSample", _("_Remove")),
281          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
282      );      );
283      actionGroup->add(      actionGroup->add(
284            Gtk::Action::create("RemoveUnusedSamples", _("Remove _Unused Samples")),
285            sigc::mem_fun(*this, &MainWindow::on_action_remove_unused_samples)
286        );
287        actionGroup->add(
288          Gtk::Action::create("ShowSampleRefs", _("Show References...")),          Gtk::Action::create("ShowSampleRefs", _("Show References...")),
289          sigc::mem_fun(*this, &MainWindow::on_action_view_references)          sigc::mem_fun(*this, &MainWindow::on_action_view_references)
290      );      );
291      actionGroup->add(      actionGroup->add(
292            Gtk::Action::create("ReplaceSample",
293                                _("Replace Sample...")),
294            sigc::mem_fun(*this, &MainWindow::on_action_replace_sample)
295        );
296        actionGroup->add(
297          Gtk::Action::create("ReplaceAllSamplesInAllGroups",          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
298                              _("Replace All Samples in All Groups...")),                              _("Replace All Samples in All Groups...")),
299          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 313  MainWindow::MainWindow() :
313          sigc::mem_fun(*this, &MainWindow::on_action_edit_script)          sigc::mem_fun(*this, &MainWindow::on_action_edit_script)
314      );      );
315      actionGroup->add(      actionGroup->add(
316          Gtk::Action::create("RemoveScript", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveScript", _("_Remove")),
317          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
318      );      );
319    
# Line 312  MainWindow::MainWindow() : Line 345  MainWindow::MainWindow() :
345          "      <menuitem action='AddGroup'/>"          "      <menuitem action='AddGroup'/>"
346          "      <menuitem action='AddSample'/>"          "      <menuitem action='AddSample'/>"
347          "      <menuitem action='ShowSampleRefs'/>"          "      <menuitem action='ShowSampleRefs'/>"
348            "      <menuitem action='ReplaceSample' />"
349          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"
350          "      <separator/>"          "      <separator/>"
351          "      <menuitem action='RemoveSample'/>"          "      <menuitem action='RemoveSample'/>"
352            "      <menuitem action='RemoveUnusedSamples'/>"
353          "    </menu>"          "    </menu>"
354          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
355          "      <menu action='AllInstruments'>"          "      <menu action='AllInstruments'>"
# Line 337  MainWindow::MainWindow() : Line 372  MainWindow::MainWindow() :
372          "    </menu>"          "    </menu>"
373          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
374          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
375            "      <menuitem action='AutoRestoreWinDim'/>"
376            "      <separator/>"
377            "      <menuitem action='RefreshAll'/>"
378          "    </menu>"          "    </menu>"
379          "    <menu action='MenuTools'>"          "    <menu action='MenuTools'>"
380          "      <menuitem action='CombineInstruments'/>"          "      <menuitem action='CombineInstruments'/>"
# Line 345  MainWindow::MainWindow() : Line 383  MainWindow::MainWindow() :
383          "    <menu action='MenuSettings'>"          "    <menu action='MenuSettings'>"
384          "      <menuitem action='WarnUserOnExtensions'/>"          "      <menuitem action='WarnUserOnExtensions'/>"
385          "      <menuitem action='SyncSamplerInstrumentSelection'/>"          "      <menuitem action='SyncSamplerInstrumentSelection'/>"
386            "      <menuitem action='MoveRootNoteWithRegionMoved'/>"
387          "    </menu>"          "    </menu>"
388          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
389          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
# Line 364  MainWindow::MainWindow() : Line 403  MainWindow::MainWindow() :
403          "    <menuitem action='AddGroup'/>"          "    <menuitem action='AddGroup'/>"
404          "    <menuitem action='AddSample'/>"          "    <menuitem action='AddSample'/>"
405          "    <menuitem action='ShowSampleRefs'/>"          "    <menuitem action='ShowSampleRefs'/>"
406            "    <menuitem action='ReplaceSample' />"
407          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
408          "    <separator/>"          "    <separator/>"
409          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
410            "    <menuitem action='RemoveUnusedSamples'/>"
411          "  </popup>"          "  </popup>"
412          "  <popup name='ScriptPopupMenu'>"          "  <popup name='ScriptPopupMenu'>"
413          "    <menuitem action='AddScriptGroup'/>"          "    <menuitem action='AddScriptGroup'/>"
# Line 411  MainWindow::MainWindow() : Line 452  MainWindow::MainWindow() :
452      }      }
453      {      {
454          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
455                uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
456            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."));
457        }
458        {
459            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
460                uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));
461            item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));
462            // copy tooltip to popup menu
463            Gtk::MenuItem* item2 = dynamic_cast<Gtk::MenuItem*>(
464                uiManager->get_widget("/SamplePopupMenu/RemoveUnusedSamples"));
465            item2->set_tooltip_text(item->get_tooltip_text());
466        }
467        {
468            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
469                uiManager->get_widget("/MenuBar/MenuView/RefreshAll"));
470            item->set_tooltip_text(_("Reloads the currently open gig file and updates the entire graphical user interface."));
471        }
472        {
473            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
474                uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
475            item->set_tooltip_text(_("If checked, size and position of all windows will be saved and automatically restored next time."));
476        }
477        {
478            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
479              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
480          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."));
481      }      }
# Line 448  MainWindow::MainWindow() : Line 513  MainWindow::MainWindow() :
513      // Create the Tree model:      // Create the Tree model:
514      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
515      m_TreeView.set_model(m_refTreeModel);      m_TreeView.set_model(m_refTreeModel);
516      m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules."));      m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));
517      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
518          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
519      );      );
# Line 456  MainWindow::MainWindow() : Line 521  MainWindow::MainWindow() :
521      // Add the TreeView's view columns:      // Add the TreeView's view columns:
522      m_TreeView.append_column_editable("Instrument", m_Columns.m_col_name);      m_TreeView.append_column_editable("Instrument", m_Columns.m_col_name);
523      m_TreeView.set_headers_visible(false);      m_TreeView.set_headers_visible(false);
524        
525        // establish drag&drop within the instrument tree view, allowing to reorder
526        // the sequence of instruments within the gig file
527        {
528            std::vector<Gtk::TargetEntry> drag_target_instrument;
529            drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument"));
530            m_TreeView.drag_source_set(drag_target_instrument);
531            m_TreeView.drag_dest_set(drag_target_instrument);
532            m_TreeView.signal_drag_begin().connect(
533                sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_begin)
534            );
535            m_TreeView.signal_drag_data_get().connect(
536                sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_data_get)
537            );
538            m_TreeView.signal_drag_data_received().connect(
539                sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drop_drag_data_received)
540            );
541        }
542    
543      // create samples treeview (including its data model)      // create samples treeview (including its data model)
544      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);
# Line 503  MainWindow::MainWindow() : Line 586  MainWindow::MainWindow() :
586      m_TreeViewScripts.signal_button_press_event().connect_notify(      m_TreeViewScripts.signal_button_press_event().connect_notify(
587          sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release)          sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release)
588      );      );
589      //FIXME: why the heck does this double click signal_row_activated() only fired while CTRL key is pressed ?      //FIXME: why the heck does this double click signal_row_activated() only fire while CTRL key is pressed ?
590      m_TreeViewScripts.signal_row_activated().connect(      m_TreeViewScripts.signal_row_activated().connect(
591          sigc::mem_fun(*this, &MainWindow::script_double_clicked)          sigc::mem_fun(*this, &MainWindow::script_double_clicked)
592      );      );
# Line 540  MainWindow::MainWindow() : Line 623  MainWindow::MainWindow() :
623          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));
624      m_RegionChooser.signal_instrument_changed().connect(      m_RegionChooser.signal_instrument_changed().connect(
625          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
626        m_RegionChooser.signal_instrument_changed().connect(
627            sigc::mem_fun(*this, &MainWindow::region_changed));
628      m_DimRegionChooser.signal_region_changed().connect(      m_DimRegionChooser.signal_region_changed().connect(
629          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
630      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
# Line 729  void Loader::progress_callback(float fra Line 814  void Loader::progress_callback(float fra
814    
815  void Loader::thread_function()  void Loader::thread_function()
816  {  {
817      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
818               static_cast<void*>(Glib::Threads::Thread::self()));
819      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
820      try {      try {
821          RIFF::File* riff = new RIFF::File(filename);          RIFF::File* riff = new RIFF::File(filename);
# Line 751  void Loader::thread_function() Line 837  void Loader::thread_function()
837  }  }
838    
839  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
840      : filename(filename), thread(0), progress(0.f)      : filename(filename), gig(0), thread(0), progress(0.f)
841  {  {
842  }  }
843    
# Line 762  void Loader::launch() Line 848  void Loader::launch()
848  #else  #else
849      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
850  #endif  #endif
851      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
852  }  }
853    
854  float Loader::get_progress()  float Loader::get_progress()
# Line 807  void Saver::progress_callback(float frac Line 893  void Saver::progress_callback(float frac
893    
894  void Saver::thread_function()  void Saver::thread_function()
895  {  {
896      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
897               static_cast<void*>(Glib::Threads::Thread::self()));
898      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
899      try {      try {
900          gig::progress_t progress;          gig::progress_t progress;
# Line 844  void Saver::launch() Line 931  void Saver::launch()
931  #else  #else
932      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));
933  #endif  #endif
934      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
935  }  }
936    
937  float Saver::get_progress()  float Saver::get_progress()
# Line 941  bool MainWindow::close_confirmation_dial Line 1028  bool MainWindow::close_confirmation_dial
1028      g_free(msg);      g_free(msg);
1029      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."));
1030      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
1031      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1032      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);
1033      dialog.set_default_response(Gtk::RESPONSE_YES);      dialog.set_default_response(Gtk::RESPONSE_YES);
1034      int response = dialog.run();      int response = dialog.run();
1035      dialog.hide();      dialog.hide();
# Line 973  bool MainWindow::leaving_shared_mode_dia Line 1060  bool MainWindow::leaving_shared_mode_dia
1060            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
1061            "load it."));            "load it."));
1062      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
1063      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1064      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
1065      int response = dialog.run();      int response = dialog.run();
1066      dialog.hide();      dialog.hide();
# Line 987  void MainWindow::on_action_file_open() Line 1074  void MainWindow::on_action_file_open()
1074      if (file_is_shared && !leaving_shared_mode_dialog()) return;      if (file_is_shared && !leaving_shared_mode_dialog()) return;
1075    
1076      Gtk::FileChooserDialog dialog(*this, _("Open file"));      Gtk::FileChooserDialog dialog(*this, _("Open file"));
1077      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1078      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
1079      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
1080  #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
1081      Gtk::FileFilter filter;      Gtk::FileFilter filter;
# Line 1004  void MainWindow::on_action_file_open() Line 1091  void MainWindow::on_action_file_open()
1091      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1092          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
1093          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
1094          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());          printf("on_action_file_open self=%p\n",
1095                   static_cast<void*>(Glib::Threads::Thread::self()));
1096          load_file(filename.c_str());          load_file(filename.c_str());
1097          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
1098      }      }
# Line 1074  void MainWindow::on_loader_progress() Line 1162  void MainWindow::on_loader_progress()
1162  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
1163  {  {
1164      printf("Loader finished!\n");      printf("Loader finished!\n");
1165      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());      printf("on_loader_finished self=%p\n",
1166               static_cast<void*>(Glib::Threads::Thread::self()));
1167      load_gig(loader->gig, loader->filename.c_str());      load_gig(loader->gig, loader->filename.c_str());
1168      progress_dialog->hide();      progress_dialog->hide();
1169  }  }
# Line 1169  void MainWindow::on_saver_finished() Line 1258  void MainWindow::on_saver_finished()
1258    
1259      file_structure_changed_signal.emit(this->file);      file_structure_changed_signal.emit(this->file);
1260    
1261      load_gig(this->file, this->filename.c_str());      __refreshEntireGUI();
1262      progress_dialog->hide();      progress_dialog->hide();
1263  }  }
1264    
# Line 1181  void MainWindow::on_action_file_save_as( Line 1270  void MainWindow::on_action_file_save_as(
1270    
1271  bool MainWindow::file_save_as()  bool MainWindow::file_save_as()
1272  {  {
1273      Gtk::FileChooserDialog dialog(*this, _("Save as"), Gtk::FILE_CHOOSER_ACTION_SAVE);      Gtk::FileChooserDialog dialog(*this, _("Save As"), Gtk::FILE_CHOOSER_ACTION_SAVE);
1274      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1275      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(_("_Save"), Gtk::RESPONSE_OK);
1276      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
1277      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
1278    
# Line 1214  bool MainWindow::file_save_as() Line 1303  bool MainWindow::file_save_as()
1303      // show warning in the dialog      // show warning in the dialog
1304      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
1305      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
1306      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
1307        warningIcon.set_from_icon_name("dialog-warning",
1308                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
1309      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
1310  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
1311      view::WrapLabel description;      view::WrapLabel description;
# Line 1266  bool MainWindow::file_save_as() Line 1357  bool MainWindow::file_save_as()
1357  void MainWindow::__import_queued_samples() {  void MainWindow::__import_queued_samples() {
1358      std::cout << "Starting sample import\n" << std::flush;      std::cout << "Starting sample import\n" << std::flush;
1359      Glib::ustring error_files;      Glib::ustring error_files;
1360      printf("Samples to import: %d\n", m_SampleImportQueue.size());      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));
1361      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
1362           iter != m_SampleImportQueue.end(); ) {           iter != m_SampleImportQueue.end(); ) {
1363          printf("Importing sample %s\n",(*iter).sample_path.c_str());          printf("Importing sample %s\n",(*iter).sample_path.c_str());
# Line 1372  void MainWindow::on_action_sync_sampler_ Line 1463  void MainWindow::on_action_sync_sampler_
1463          !Settings::singleton()->syncSamplerInstrumentSelection;          !Settings::singleton()->syncSamplerInstrumentSelection;
1464  }  }
1465    
1466    void MainWindow::on_action_move_root_note_with_region_moved() {
1467        Settings::singleton()->moveRootNoteWithRegionMoved =
1468            !Settings::singleton()->moveRootNoteWithRegionMoved;
1469    }
1470    
1471  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
1472  {  {
1473      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
# Line 1381  void MainWindow::on_action_help_about() Line 1477  void MainWindow::on_action_help_about()
1477      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
1478  #endif  #endif
1479      dialog.set_version(VERSION);      dialog.set_version(VERSION);
1480      dialog.set_copyright("Copyright (C) 2006-2015 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2016 Andreas Persson");
1481      const std::string sComment =      const std::string sComment =
1482          _("Built " __DATE__ "\nUsing ") +          _("Built " __DATE__ "\nUsing ") +
1483          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
# Line 1418  PropDialog::PropDialog() Line 1514  PropDialog::PropDialog()
1514        eSourceForm(_("Source form")),        eSourceForm(_("Source form")),
1515        eCommissioned(_("Commissioned")),        eCommissioned(_("Commissioned")),
1516        eSubject(_("Subject")),        eSubject(_("Subject")),
1517        quitButton(Gtk::Stock::CLOSE),        quitButton(_("_Close"), true),
1518        table(2, 1),        table(2, 1),
1519        m_file(NULL)        m_file(NULL)
1520  {  {
# Line 1541  void InstrumentProps::set_MIDIProgram(ui Line 1637  void InstrumentProps::set_MIDIProgram(ui
1637  }  }
1638    
1639  InstrumentProps::InstrumentProps() :  InstrumentProps::InstrumentProps() :
1640      quitButton(Gtk::Stock::CLOSE),      quitButton(_("_Close"), true),
1641      table(2,1),      table(2,1),
1642      eName(_("Name")),      eName(_("Name")),
1643      eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
# Line 1664  void MainWindow::load_gig(gig::File* gig Line 1760  void MainWindow::load_gig(gig::File* gig
1760      file = 0;      file = 0;
1761      set_file_is_shared(isSharedInstrument);      set_file_is_shared(isSharedInstrument);
1762    
1763      this->filename = filename ? filename : _("Unsaved Gig File");      this->filename =
1764            (filename && strlen(filename) > 0) ?
1765                filename : (!gig->GetFileName().empty()) ?
1766                    gig->GetFileName() : _("Unsaved Gig File");
1767      set_title(Glib::filename_display_basename(this->filename));      set_title(Glib::filename_display_basename(this->filename));
1768      file_has_name = filename;      file_has_name = filename;
1769      file_is_changed = false;      file_is_changed = false;
# Line 1818  void MainWindow::show_script_slots() { Line 1917  void MainWindow::show_script_slots() {
1917      window->show();      window->show();
1918  }  }
1919    
1920    void MainWindow::on_action_refresh_all() {
1921        __refreshEntireGUI();
1922    }
1923    
1924  void MainWindow::on_action_view_status_bar() {  void MainWindow::on_action_view_status_bar() {
1925      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1926          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
# Line 1829  void MainWindow::on_action_view_status_b Line 1932  void MainWindow::on_action_view_status_b
1932      else                    m_StatusBar.hide();      else                    m_StatusBar.hide();
1933  }  }
1934    
1935    void MainWindow::on_auto_restore_win_dim() {
1936        Gtk::CheckMenuItem* item =
1937            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
1938        if (!item) {
1939            std::cerr << "/MenuBar/MenuView/AutoRestoreWinDim == NULL\n";
1940            return;
1941        }
1942        Settings::singleton()->autoRestoreWindowDimension = item->get_active();
1943    }
1944    
1945  bool MainWindow::is_copy_samples_unity_note_enabled() const {  bool MainWindow::is_copy_samples_unity_note_enabled() const {
1946      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1947          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
# Line 1893  void MainWindow::on_instrument_selection Line 2006  void MainWindow::on_instrument_selection
2006      }      }
2007  }  }
2008    
2009    void MainWindow::select_instrument(gig::Instrument* instrument) {
2010        if (!instrument) return;
2011    
2012        Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
2013        for (int i = 0; i < model->children().size(); ++i) {
2014            Gtk::TreeModel::Row row = model->children()[i];
2015            if (row[m_Columns.m_col_instr] == instrument) {
2016                // select and show the respective instrument in the list view
2017                show_intruments_tab();
2018                m_TreeView.get_selection()->select(model->children()[i]);
2019                Gtk::TreePath path(
2020                    m_TreeView.get_selection()->get_selected()
2021                );
2022                m_TreeView.scroll_to_row(path);
2023                on_sel_change(); // the regular instrument selection change callback
2024            }
2025        }
2026    }
2027    
2028    /// Returns true if requested dimension region was successfully selected and scrolled to in the list view, false on error.
2029    bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) {
2030        gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
2031        gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
2032    
2033        Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
2034        for (int i = 0; i < model->children().size(); ++i) {
2035            Gtk::TreeModel::Row row = model->children()[i];
2036            if (row[m_Columns.m_col_instr] == pInstrument) {
2037                // select and show the respective instrument in the list view
2038                show_intruments_tab();
2039                m_TreeView.get_selection()->select(model->children()[i]);
2040                Gtk::TreePath path(
2041                    m_TreeView.get_selection()->get_selected()
2042                );
2043                m_TreeView.scroll_to_row(path);
2044                on_sel_change(); // the regular instrument selection change callback
2045    
2046                // select respective region in the region selector
2047                m_RegionChooser.set_region(pRegion);
2048    
2049                // select and show the respective dimension region in the editor
2050                //update_dimregs();
2051                if (!m_DimRegionChooser.select_dimregion(dimRgn)) return false;
2052                //dimreg_edit.set_dim_region(dimRgn);
2053    
2054                return true;
2055            }
2056        }
2057    
2058        return false;
2059    }
2060    
2061  void MainWindow::select_sample(gig::Sample* sample) {  void MainWindow::select_sample(gig::Sample* sample) {
2062      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewSamples.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewSamples.get_model();
2063      for (int g = 0; g < model->children().size(); ++g) {      for (int g = 0; g < model->children().size(); ++g) {
# Line 2199  void MainWindow::on_action_edit_script() Line 2364  void MainWindow::on_action_edit_script()
2364      if (!script) return;      if (!script) return;
2365    
2366      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
2367        editor->signal_script_to_be_changed.connect(
2368            signal_script_to_be_changed.make_slot()
2369        );
2370        editor->signal_script_changed.connect(
2371            signal_script_changed.make_slot()
2372        );
2373      editor->setScript(script);      editor->setScript(script);
2374      //editor->reparent(*this);      //editor->reparent(*this);
2375      editor->show();      editor->show();
# Line 2264  void MainWindow::on_action_add_group() { Line 2435  void MainWindow::on_action_add_group() {
2435      file_changed();      file_changed();
2436  }  }
2437    
2438    void MainWindow::on_action_replace_sample() {
2439        add_or_replace_sample(true);
2440    }
2441    
2442  void MainWindow::on_action_add_sample() {  void MainWindow::on_action_add_sample() {
2443        add_or_replace_sample(false);
2444    }
2445    
2446    void MainWindow::add_or_replace_sample(bool replace) {
2447      if (!file) return;      if (!file) return;
2448      // get selected group  
2449        // get selected group (and probably selected sample)
2450      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2451      Gtk::TreeModel::iterator it = sel->get_selected();      Gtk::TreeModel::iterator it = sel->get_selected();
2452      if (!it) return;      if (!it) return;
2453      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
2454        gig::Sample* sample = NULL;
2455      gig::Group* group = row[m_SamplesModel.m_col_group];      gig::Group* group = row[m_SamplesModel.m_col_group];
2456      if (!group) { // not a group, but a sample is selected (probably)      if (!group) { // not a group, but a sample is selected (probably)
2457          gig::Sample* sample = row[m_SamplesModel.m_col_sample];          if (replace) sample = row[m_SamplesModel.m_col_sample];
2458          if (!sample) return;          if (!row[m_SamplesModel.m_col_sample]) return;
2459          it = row.parent(); // resolve parent (that is the sample's group)          it = row.parent(); // resolve parent (that is the sample's group)
2460          if (!it) return;          if (!it) return;
2461          row = *it;          if (!replace) row = *it;
2462          group = row[m_SamplesModel.m_col_group];          group = (*it)[m_SamplesModel.m_col_group];
2463          if (!group) return;          if (!group) return;
2464      }      }
2465        if (replace && !sample) return;
2466    
2467      // show 'browse for file' dialog      // show 'browse for file' dialog
2468      Gtk::FileChooserDialog dialog(*this, _("Add Sample(s)"));      Gtk::FileChooserDialog dialog(*this, replace ? _("Replace Sample with") : _("Add Sample(s)"));
2469      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
2470      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
2471      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
2472    
2473      // matches all file types supported by libsndfile      // matches all file types supported by libsndfile
2474  #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 2356  void MainWindow::on_action_add_sample() Line 2539  void MainWindow::on_action_add_sample()
2539                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
2540                          throw std::string(_("format not supported")); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
2541                  }                  }
2542                  // add a new sample to the .gig file                  // add a new sample to the .gig file (if adding is requested actually)
2543                  gig::Sample* sample = file->AddSample();                  if (!replace) sample = file->AddSample();
2544                  // file name without path                  // file name without path
2545                  Glib::ustring filename = Glib::filename_display_basename(*iter);                  Glib::ustring filename = Glib::filename_display_basename(*iter);
2546                  // remove file extension if there is one                  // remove file extension if there is one
# Line 2408  void MainWindow::on_action_add_sample() Line 2591  void MainWindow::on_action_add_sample()
2591                  // physically when File::Save() is called)                  // physically when File::Save() is called)
2592                  sample->Resize(info.frames);                  sample->Resize(info.frames);
2593                  // make sure sample is part of the selected group                  // make sure sample is part of the selected group
2594                  group->AddSample(sample);                  if (!replace) group->AddSample(sample);
2595                  // schedule that physical resize and sample import                  // schedule that physical resize and sample import
2596                  // (data copying), performed when "Save" is requested                  // (data copying), performed when "Save" is requested
2597                  SampleImportItem sched_item;                  SampleImportItem sched_item;
# Line 2416  void MainWindow::on_action_add_sample() Line 2599  void MainWindow::on_action_add_sample()
2599                  sched_item.sample_path = *iter;                  sched_item.sample_path = *iter;
2600                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue.push_back(sched_item);
2601                  // add sample to the tree view                  // add sample to the tree view
2602                  Gtk::TreeModel::iterator iterSample =                  if (replace) {
2603                      m_refSamplesTreeModel->append(row.children());                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);
2604                  Gtk::TreeModel::Row rowSample = *iterSample;                  } else {
2605                  rowSample[m_SamplesModel.m_col_name] =                      Gtk::TreeModel::iterator iterSample =
2606                      gig_to_utf8(sample->pInfo->Name);                          m_refSamplesTreeModel->append(row.children());
2607                  rowSample[m_SamplesModel.m_col_sample] = sample;                      Gtk::TreeModel::Row rowSample = *iterSample;
2608                  rowSample[m_SamplesModel.m_col_group]  = NULL;                      rowSample[m_SamplesModel.m_col_name] =
2609                            gig_to_utf8(sample->pInfo->Name);
2610                        rowSample[m_SamplesModel.m_col_sample] = sample;
2611                        rowSample[m_SamplesModel.m_col_group]  = NULL;
2612                    }
2613                  // close sound file                  // close sound file
2614                  sf_close(hFile);                  sf_close(hFile);
2615                  file_changed();                  file_changed();
# Line 2433  void MainWindow::on_action_add_sample() Line 2620  void MainWindow::on_action_add_sample()
2620          }          }
2621          // 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
2622          if (!error_files.empty()) {          if (!error_files.empty()) {
2623              Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;              Glib::ustring txt =
2624                    (replace
2625                        ? _("Failed to replace sample with:\n")
2626                        : _("Could not add the following sample(s):\n"))
2627                    + error_files;
2628              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
2629              msg.run();              msg.run();
2630          }          }
# Line 2476  void MainWindow::on_action_replace_all_s Line 2667  void MainWindow::on_action_replace_all_s
2667      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
2668      description.show();      description.show();
2669      entryArea.show_all();      entryArea.show_all();
2670      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
2671      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
2672      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
2673      if (current_sample_dir != "") {      if (current_sample_dir != "") {
# Line 2500  void MainWindow::on_action_replace_all_s Line 2691  void MainWindow::on_action_replace_all_s
2691              try              try
2692              {              {
2693                  if (!hFile) throw std::string(_("could not open file"));                  if (!hFile) throw std::string(_("could not open file"));
                 int bitdepth;  
2694                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
2695                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
2696                      case SF_FORMAT_PCM_16:                      case SF_FORMAT_PCM_16:
2697                      case SF_FORMAT_PCM_U8:                      case SF_FORMAT_PCM_U8:
                         bitdepth = 16;  
                         break;  
2698                      case SF_FORMAT_PCM_24:                      case SF_FORMAT_PCM_24:
2699                      case SF_FORMAT_PCM_32:                      case SF_FORMAT_PCM_32:
2700                      case SF_FORMAT_FLOAT:                      case SF_FORMAT_FLOAT:
2701                      case SF_FORMAT_DOUBLE:                      case SF_FORMAT_DOUBLE:
                         bitdepth = 24;  
2702                          break;                          break;
2703                      default:                      default:
2704                          sf_close(hFile);                          sf_close(hFile);
# Line 2617  void MainWindow::on_action_remove_sample Line 2804  void MainWindow::on_action_remove_sample
2804      }      }
2805  }  }
2806    
2807    void MainWindow::on_action_remove_unused_samples() {
2808        if (!file) return;
2809    
2810        // collect all samples that are not referenced by any instrument
2811        std::list<gig::Sample*> lsamples;
2812        for (int iSample = 0; file->GetSample(iSample); ++iSample) {
2813            gig::Sample* sample = file->GetSample(iSample);
2814            bool isUsed = false;
2815            for (gig::Instrument* instrument = file->GetFirstInstrument(); instrument;
2816                                  instrument = file->GetNextInstrument())
2817            {
2818                for (gig::Region* rgn = instrument->GetFirstRegion(); rgn;
2819                                  rgn = instrument->GetNextRegion())
2820                {
2821                    for (int i = 0; i < 256; ++i) {
2822                        if (!rgn->pDimensionRegions[i]) continue;
2823                        if (rgn->pDimensionRegions[i]->pSample != sample) continue;
2824                        isUsed = true;
2825                        goto endOfRefSearch;
2826                    }
2827                }
2828            }
2829            endOfRefSearch:
2830            if (!isUsed) lsamples.push_back(sample);
2831        }
2832    
2833        if (lsamples.empty()) return;
2834    
2835        // notify everybody that we're going to remove these samples
2836        samples_to_be_removed_signal.emit(lsamples);
2837    
2838        // remove collected samples
2839        try {
2840            for (std::list<gig::Sample*>::iterator itSample = lsamples.begin();
2841                 itSample != lsamples.end(); ++itSample)
2842            {
2843                gig::Sample* sample = *itSample;
2844                // remove sample from the .gig file
2845                file->DeleteSample(sample);
2846                // if sample was just previously added, remove it fro the import queue
2847                for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
2848                     iter != m_SampleImportQueue.end(); ++iter)
2849                {
2850                    if ((*iter).gig_sample == sample) {
2851                        printf("Removing previously added sample '%s'\n",
2852                               (*iter).sample_path.c_str());
2853                        m_SampleImportQueue.erase(iter);
2854                        break;
2855                    }
2856                }
2857            }
2858        } catch (RIFF::Exception e) {
2859            // show error message
2860            Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
2861            msg.run();
2862        }
2863    
2864        // notify everybody that we're done with removal
2865        samples_removed_signal.emit();
2866    
2867        dimreg_changed();
2868        file_changed();
2869        __refreshEntireGUI();
2870    }
2871    
2872  // see comment on on_sample_treeview_drag_begin()  // see comment on on_sample_treeview_drag_begin()
2873  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)
2874  {  {
# Line 2643  void MainWindow::on_scripts_treeview_dra Line 2895  void MainWindow::on_scripts_treeview_dra
2895                         sizeof(script)/*length of data in bytes*/);                         sizeof(script)/*length of data in bytes*/);
2896  }  }
2897    
2898    // see comment on on_sample_treeview_drag_begin()
2899    void MainWindow::on_instruments_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
2900    {
2901        first_call_to_drag_data_get = true;
2902    }
2903    
2904    void MainWindow::on_instruments_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
2905                                                           Gtk::SelectionData& selection_data, guint, guint)
2906    {
2907        if (!first_call_to_drag_data_get) return;
2908        first_call_to_drag_data_get = false;
2909    
2910        // get selected source instrument
2911        gig::Instrument* src = NULL;
2912        {
2913            Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
2914            Gtk::TreeModel::iterator it = sel->get_selected();
2915            if (it) {
2916                Gtk::TreeModel::Row row = *it;
2917                src = row[m_Columns.m_col_instr];
2918            }
2919        }
2920        if (!src) return;
2921    
2922        // pass the source gig::Instrument as pointer
2923        selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&src,
2924                           sizeof(src)/*length of data in bytes*/);
2925    }
2926    
2927    void MainWindow::on_instruments_treeview_drop_drag_data_received(
2928        const Glib::RefPtr<Gdk::DragContext>& context, int x, int y,
2929        const Gtk::SelectionData& selection_data, guint, guint time)
2930    {
2931        gig::Instrument* src = *((gig::Instrument**) selection_data.get_data());
2932        if (!src || selection_data.get_length() != sizeof(gig::Instrument*))
2933            return;
2934    
2935        gig::Instrument* dst = NULL;
2936        {
2937            Gtk::TreeModel::Path path;
2938            const bool found = m_TreeView.get_path_at_pos(x, y, path);
2939            if (!found) return;
2940    
2941            Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path);
2942            if (!iter) return;
2943            Gtk::TreeModel::Row row = *iter;
2944            dst = row[m_Columns.m_col_instr];
2945        }
2946        if (!dst) return;
2947    
2948        //printf("dragdrop received src=%s dst=%s\n", src->pInfo->Name.c_str(), dst->pInfo->Name.c_str());
2949        src->MoveTo(dst);
2950        __refreshEntireGUI();
2951        select_instrument(src);
2952    }
2953    
2954  // For some reason drag_data_get gets called two times for each  // For some reason drag_data_get gets called two times for each
2955  // drag'n'drop (at least when target is an Entry). This work-around  // drag'n'drop (at least when target is an Entry). This work-around
2956  // makes sure the code in drag_data_get and drop_drag_data_received is  // makes sure the code in drag_data_get and drop_drag_data_received is
# Line 2804  void MainWindow::script_double_clicked(c Line 3112  void MainWindow::script_double_clicked(c
3112      if (!script) return;      if (!script) return;
3113    
3114      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
3115        editor->signal_script_to_be_changed.connect(
3116            signal_script_to_be_changed.make_slot()
3117        );
3118        editor->signal_script_changed.connect(
3119            signal_script_changed.make_slot()
3120        );
3121      editor->setScript(script);      editor->setScript(script);
3122      //editor->reparent(*this);      //editor->reparent(*this);
3123      editor->show();      editor->show();
# Line 2865  void MainWindow::on_action_view_referenc Line 3179  void MainWindow::on_action_view_referenc
3179    
3180      ReferencesView* d = new ReferencesView(*this);      ReferencesView* d = new ReferencesView(*this);
3181      d->setSample(sample);      d->setSample(sample);
3182        d->dimension_region_selected.connect(
3183            sigc::mem_fun(*this, &MainWindow::select_dimension_region)
3184        );
3185      d->show_all();      d->show_all();
3186      d->resize(500, 400);      d->resize(500, 400);
3187      d->run();      d->run();
# Line 2976  void MainWindow::on_action_merge_files() Line 3293  void MainWindow::on_action_merge_files()
3293      }      }
3294    
3295      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));
3296      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
3297      dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);      dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);
3298      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
3299  #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 2995  void MainWindow::on_action_merge_files() Line 3312  void MainWindow::on_action_merge_files()
3312      // show warning in the file picker dialog      // show warning in the file picker dialog
3313      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
3314      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
3315      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
3316        warningIcon.set_from_icon_name("dialog-warning",
3317                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
3318      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
3319  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
3320      view::WrapLabel description;      view::WrapLabel description;
# Line 3018  void MainWindow::on_action_merge_files() Line 3337  void MainWindow::on_action_merge_files()
3337      descriptionArea.show_all();      descriptionArea.show_all();
3338    
3339      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
3340          printf("on_action_merge_files self=%x\n", Glib::Threads::Thread::self());          printf("on_action_merge_files self=%p\n",
3341                   static_cast<void*>(Glib::Threads::Thread::self()));
3342          std::vector<std::string> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
3343    
3344          // merge the selected files to the currently open .gig file          // merge the selected files to the currently open .gig file
# Line 3030  void MainWindow::on_action_merge_files() Line 3350  void MainWindow::on_action_merge_files()
3350          }          }
3351    
3352          // update GUI          // update GUI
3353          __refreshEntireGUI();                  __refreshEntireGUI();
3354      }      }
3355  }  }
3356    
Legend:
Removed from v.2694  
changed lines
  Added in v.2918
  ViewVC Help
Powered by ViewVC