/[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 2695 by schoenebeck, Tue Jan 6 18:11:27 2015 UTC revision 3089 by schoenebeck, Sun Jan 15 19:18:39 2017 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2015 Andreas Persson   * Copyright (C) 2006-2017 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        toggle_action =
204            Gtk::ToggleAction::create("SaveWithTemporaryFile", _("Save with _temporary file"));
205        toggle_action->set_active(Settings::singleton()->saveWithTemporaryFile);
206        actionGroup->add(toggle_action,
207                         sigc::mem_fun(
208                             *this, &MainWindow::on_save_with_temporary_file));
209    
210        actionGroup->add(
211            Gtk::Action::create("RefreshAll", _("_Refresh All")),
212            sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
213        );                
214    
215        actionGroup->add(Gtk::Action::create("MenuHelp", _("_Help")));
216        actionGroup->add(Gtk::Action::create("About", _("_About")),
217                       sigc::mem_fun(                       sigc::mem_fun(
218                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
219      actionGroup->add(      actionGroup->add(
# Line 202  MainWindow::MainWindow() : Line 225  MainWindow::MainWindow() :
225          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
226      );      );
227      actionGroup->add(      actionGroup->add(
228          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveInstrument", _("_Remove")),
229          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
230      );      );
231    
# Line 225  MainWindow::MainWindow() : Line 248  MainWindow::MainWindow() :
248          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)
249      );      );
250    
251        toggle_action =
252            Gtk::ToggleAction::create("MoveRootNoteWithRegionMoved", _("Move root note with region moved"));
253        toggle_action->set_active(Settings::singleton()->moveRootNoteWithRegionMoved);
254        actionGroup->add(
255            toggle_action,
256            sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved)
257        );
258    
259    
260      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
261    
# Line 241  MainWindow::MainWindow() : Line 272  MainWindow::MainWindow() :
272    
273      // sample right-click popup actions      // sample right-click popup actions
274      actionGroup->add(      actionGroup->add(
275          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),          Gtk::Action::create("SampleProperties", _("_Properties")),
276          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)
277      );      );
278      actionGroup->add(      actionGroup->add(
# Line 253  MainWindow::MainWindow() : Line 284  MainWindow::MainWindow() :
284          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
285      );      );
286      actionGroup->add(      actionGroup->add(
287          Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveSample", _("_Remove")),
288          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
289      );      );
290      actionGroup->add(      actionGroup->add(
291            Gtk::Action::create("RemoveUnusedSamples", _("Remove _Unused Samples")),
292            sigc::mem_fun(*this, &MainWindow::on_action_remove_unused_samples)
293        );
294        actionGroup->add(
295          Gtk::Action::create("ShowSampleRefs", _("Show References...")),          Gtk::Action::create("ShowSampleRefs", _("Show References...")),
296          sigc::mem_fun(*this, &MainWindow::on_action_view_references)          sigc::mem_fun(*this, &MainWindow::on_action_view_references)
297      );      );
298      actionGroup->add(      actionGroup->add(
299            Gtk::Action::create("ReplaceSample",
300                                _("Replace Sample...")),
301            sigc::mem_fun(*this, &MainWindow::on_action_replace_sample)
302        );
303        actionGroup->add(
304          Gtk::Action::create("ReplaceAllSamplesInAllGroups",          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
305                              _("Replace All Samples in All Groups...")),                              _("Replace All Samples in All Groups...")),
306          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 320  MainWindow::MainWindow() :
320          sigc::mem_fun(*this, &MainWindow::on_action_edit_script)          sigc::mem_fun(*this, &MainWindow::on_action_edit_script)
321      );      );
322      actionGroup->add(      actionGroup->add(
323          Gtk::Action::create("RemoveScript", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveScript", _("_Remove")),
324          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
325      );      );
326    
# Line 312  MainWindow::MainWindow() : Line 352  MainWindow::MainWindow() :
352          "      <menuitem action='AddGroup'/>"          "      <menuitem action='AddGroup'/>"
353          "      <menuitem action='AddSample'/>"          "      <menuitem action='AddSample'/>"
354          "      <menuitem action='ShowSampleRefs'/>"          "      <menuitem action='ShowSampleRefs'/>"
355            "      <menuitem action='ReplaceSample' />"
356          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"
357          "      <separator/>"          "      <separator/>"
358          "      <menuitem action='RemoveSample'/>"          "      <menuitem action='RemoveSample'/>"
359            "      <menuitem action='RemoveUnusedSamples'/>"
360          "    </menu>"          "    </menu>"
361          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
362          "      <menu action='AllInstruments'>"          "      <menu action='AllInstruments'>"
# Line 337  MainWindow::MainWindow() : Line 379  MainWindow::MainWindow() :
379          "    </menu>"          "    </menu>"
380          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
381          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
382            "      <menuitem action='AutoRestoreWinDim'/>"
383            "      <separator/>"
384            "      <menuitem action='RefreshAll'/>"
385          "    </menu>"          "    </menu>"
386          "    <menu action='MenuTools'>"          "    <menu action='MenuTools'>"
387          "      <menuitem action='CombineInstruments'/>"          "      <menuitem action='CombineInstruments'/>"
# Line 345  MainWindow::MainWindow() : Line 390  MainWindow::MainWindow() :
390          "    <menu action='MenuSettings'>"          "    <menu action='MenuSettings'>"
391          "      <menuitem action='WarnUserOnExtensions'/>"          "      <menuitem action='WarnUserOnExtensions'/>"
392          "      <menuitem action='SyncSamplerInstrumentSelection'/>"          "      <menuitem action='SyncSamplerInstrumentSelection'/>"
393            "      <menuitem action='MoveRootNoteWithRegionMoved'/>"
394            "      <menuitem action='SaveWithTemporaryFile'/>"
395          "    </menu>"          "    </menu>"
396          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
397          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
# Line 364  MainWindow::MainWindow() : Line 411  MainWindow::MainWindow() :
411          "    <menuitem action='AddGroup'/>"          "    <menuitem action='AddGroup'/>"
412          "    <menuitem action='AddSample'/>"          "    <menuitem action='AddSample'/>"
413          "    <menuitem action='ShowSampleRefs'/>"          "    <menuitem action='ShowSampleRefs'/>"
414            "    <menuitem action='ReplaceSample' />"
415          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
416          "    <separator/>"          "    <separator/>"
417          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
418            "    <menuitem action='RemoveUnusedSamples'/>"
419          "  </popup>"          "  </popup>"
420          "  <popup name='ScriptPopupMenu'>"          "  <popup name='ScriptPopupMenu'>"
421          "    <menuitem action='AddScriptGroup'/>"          "    <menuitem action='AddScriptGroup'/>"
# Line 411  MainWindow::MainWindow() : Line 460  MainWindow::MainWindow() :
460      }      }
461      {      {
462          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
463                uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
464            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."));
465        }
466        {
467            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
468                uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));
469            item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));
470            // copy tooltip to popup menu
471            Gtk::MenuItem* item2 = dynamic_cast<Gtk::MenuItem*>(
472                uiManager->get_widget("/SamplePopupMenu/RemoveUnusedSamples"));
473            item2->set_tooltip_text(item->get_tooltip_text());
474        }
475        {
476            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
477                uiManager->get_widget("/MenuBar/MenuView/RefreshAll"));
478            item->set_tooltip_text(_("Reloads the currently open gig file and updates the entire graphical user interface."));
479        }
480        {
481            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
482                uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
483            item->set_tooltip_text(_("If checked, size and position of all windows will be saved and automatically restored next time."));
484        }
485        {
486            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
487              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
488          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."));
489      }      }
# Line 448  MainWindow::MainWindow() : Line 521  MainWindow::MainWindow() :
521      // Create the Tree model:      // Create the Tree model:
522      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
523      m_TreeView.set_model(m_refTreeModel);      m_TreeView.set_model(m_refTreeModel);
524      m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules."));      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
525        m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));
526      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
527          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
528      );      );
529    
530      // Add the TreeView's view columns:      // Add the TreeView's view columns:
531      m_TreeView.append_column_editable("Instrument", m_Columns.m_col_name);      m_TreeView.append_column(_("Nr"), m_Columns.m_col_nr);
532      m_TreeView.set_headers_visible(false);      m_TreeView.append_column_editable(_("Instrument"), m_Columns.m_col_name);
533        m_TreeView.set_headers_visible(true);
534        
535        // establish drag&drop within the instrument tree view, allowing to reorder
536        // the sequence of instruments within the gig file
537        {
538            std::vector<Gtk::TargetEntry> drag_target_instrument;
539            drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument"));
540            m_TreeView.drag_source_set(drag_target_instrument);
541            m_TreeView.drag_dest_set(drag_target_instrument);
542            m_TreeView.signal_drag_begin().connect(
543                sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_begin)
544            );
545            m_TreeView.signal_drag_data_get().connect(
546                sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_data_get)
547            );
548            m_TreeView.signal_drag_data_received().connect(
549                sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drop_drag_data_received)
550            );
551        }
552    
553      // create samples treeview (including its data model)      // create samples treeview (including its data model)
554      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);
555      m_TreeViewSamples.set_model(m_refSamplesTreeModel);      m_TreeViewSamples.set_model(m_refSamplesTreeModel);
556        m_TreeViewSamples.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
557      m_TreeViewSamples.set_tooltip_text(_("To actually use a sample, drag it from this list view to \"Sample\" -> \"Sample:\" on the region's settings pane on the right.\n\nRight click here for more actions on samples."));      m_TreeViewSamples.set_tooltip_text(_("To actually use a sample, drag it from this list view to \"Sample\" -> \"Sample:\" on the region's settings pane on the right.\n\nRight click here for more actions on samples."));
558      // m_TreeViewSamples.set_reorderable();      // m_TreeViewSamples.set_reorderable();
559      m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name);      m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name);
# Line 540  MainWindow::MainWindow() : Line 634  MainWindow::MainWindow() :
634          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));
635      m_RegionChooser.signal_instrument_changed().connect(      m_RegionChooser.signal_instrument_changed().connect(
636          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
637        m_RegionChooser.signal_instrument_changed().connect(
638            sigc::mem_fun(*this, &MainWindow::region_changed));
639      m_DimRegionChooser.signal_region_changed().connect(      m_DimRegionChooser.signal_region_changed().connect(
640          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
641      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
# Line 635  void MainWindow::region_changed() Line 731  void MainWindow::region_changed()
731  gig::Instrument* MainWindow::get_instrument()  gig::Instrument* MainWindow::get_instrument()
732  {  {
733      gig::Instrument* instrument = 0;      gig::Instrument* instrument = 0;
734      Gtk::TreeModel::const_iterator it =      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
735          m_TreeView.get_selection()->get_selected();      if (rows.empty()) return NULL;
736        Gtk::TreeModel::const_iterator it = m_refTreeModel->get_iter(rows[0]);
737      if (it) {      if (it) {
738          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
739          instrument = row[m_Columns.m_col_instr];          instrument = row[m_Columns.m_col_instr];
# Line 679  void MainWindow::update_dimregs() Line 776  void MainWindow::update_dimregs()
776              add_region_to_dimregs(region, stereo, all_dimregs);              add_region_to_dimregs(region, stereo, all_dimregs);
777          }          }
778      }      }
779    
780        m_DimRegionChooser.setModifyAllRegions(all_regions);
781        m_DimRegionChooser.setModifyAllDimensionRegions(all_dimregs);
782        m_DimRegionChooser.setModifyBothChannels(stereo);
783  }  }
784    
785  void MainWindow::dimreg_all_dimregs_toggled()  void MainWindow::dimreg_all_dimregs_toggled()
# Line 696  void MainWindow::dimreg_changed() Line 797  void MainWindow::dimreg_changed()
797  void MainWindow::on_sel_change()  void MainWindow::on_sel_change()
798  {  {
799      // select item in instrument menu      // select item in instrument menu
800      Gtk::TreeModel::iterator it = m_TreeView.get_selection()->get_selected();      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
801      if (it) {      if (!rows.empty()) {
802          Gtk::TreePath path(it);          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
803          int index = path[0];          if (it) {
804          const std::vector<Gtk::Widget*> children =              Gtk::TreePath path(it);
805              instrument_menu->get_children();              int index = path[0];
806          static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();              const std::vector<Gtk::Widget*> children =
807                    instrument_menu->get_children();
808                static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
809            }
810      }      }
811    
812      m_RegionChooser.set_instrument(get_instrument());      m_RegionChooser.set_instrument(get_instrument());
# Line 727  void Loader::progress_callback(float fra Line 831  void Loader::progress_callback(float fra
831      progress_dispatcher();      progress_dispatcher();
832  }  }
833    
834    #if defined(WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
835    // make sure stack is 16-byte aligned for SSE instructions
836    __attribute__((force_align_arg_pointer))
837    #endif
838  void Loader::thread_function()  void Loader::thread_function()
839  {  {
840      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
841               static_cast<void*>(Glib::Threads::Thread::self()));
842      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
843      try {      try {
844          RIFF::File* riff = new RIFF::File(filename);          RIFF::File* riff = new RIFF::File(filename);
# Line 751  void Loader::thread_function() Line 860  void Loader::thread_function()
860  }  }
861    
862  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
863      : filename(filename), thread(0), progress(0.f)      : filename(filename), gig(0), thread(0), progress(0.f)
864  {  {
865  }  }
866    
# Line 762  void Loader::launch() Line 871  void Loader::launch()
871  #else  #else
872      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
873  #endif  #endif
874      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
875  }  }
876    
877  float Loader::get_progress()  float Loader::get_progress()
# Line 805  void Saver::progress_callback(float frac Line 914  void Saver::progress_callback(float frac
914      progress_dispatcher.emit();      progress_dispatcher.emit();
915  }  }
916    
917    #if defined(WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
918    // make sure stack is 16-byte aligned for SSE instructions
919    __attribute__((force_align_arg_pointer))
920    #endif
921  void Saver::thread_function()  void Saver::thread_function()
922  {  {
923      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
924               static_cast<void*>(Glib::Threads::Thread::self()));
925      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
926      try {      try {
927          gig::progress_t progress;          gig::progress_t progress;
# Line 816  void Saver::thread_function() Line 930  void Saver::thread_function()
930    
931          // if no filename was provided, that means "save", if filename was provided means "save as"          // if no filename was provided, that means "save", if filename was provided means "save as"
932          if (filename.empty()) {          if (filename.empty()) {
933              gig->Save(&progress);              if (!Settings::singleton()->saveWithTemporaryFile) {
934                    // save directly over the existing .gig file
935                    // (requires less disk space than solution below
936                    // but may be slower)
937                    gig->Save(&progress);
938                } else {
939                    // save the file as separate temporary file first,
940                    // then move the saved file over the old file
941                    // (may result in performance speedup during save)
942                    String tmpname = filename + ".TMP";
943                    gig->Save(tmpname, &progress);
944                    #if defined(WIN32)
945                    if (!DeleteFile(filename.c_str())) {
946                        throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file).");
947                    }
948                    #else // POSIX ...
949                    if (unlink(filename.c_str())) {
950                        throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + String(strerror(errno)));
951                    }
952                    #endif
953                    if (rename(tmpname.c_str(), filename.c_str())) {
954                        #if defined(WIN32)
955                        throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");
956                        #else
957                        throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + String(strerror(errno)));
958                        #endif
959                    }
960                }
961          } else {          } else {
962              gig->Save(filename, &progress);              gig->Save(filename, &progress);
963          }          }
# Line 844  void Saver::launch() Line 985  void Saver::launch()
985  #else  #else
986      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));
987  #endif  #endif
988      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
989  }  }
990    
991  float Saver::get_progress()  float Saver::get_progress()
# Line 941  bool MainWindow::close_confirmation_dial Line 1082  bool MainWindow::close_confirmation_dial
1082      g_free(msg);      g_free(msg);
1083      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."));
1084      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
1085      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1086      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);
1087      dialog.set_default_response(Gtk::RESPONSE_YES);      dialog.set_default_response(Gtk::RESPONSE_YES);
1088      int response = dialog.run();      int response = dialog.run();
1089      dialog.hide();      dialog.hide();
# Line 973  bool MainWindow::leaving_shared_mode_dia Line 1114  bool MainWindow::leaving_shared_mode_dia
1114            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
1115            "load it."));            "load it."));
1116      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
1117      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1118      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
1119      int response = dialog.run();      int response = dialog.run();
1120      dialog.hide();      dialog.hide();
# Line 987  void MainWindow::on_action_file_open() Line 1128  void MainWindow::on_action_file_open()
1128      if (file_is_shared && !leaving_shared_mode_dialog()) return;      if (file_is_shared && !leaving_shared_mode_dialog()) return;
1129    
1130      Gtk::FileChooserDialog dialog(*this, _("Open file"));      Gtk::FileChooserDialog dialog(*this, _("Open file"));
1131      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1132      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
1133      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
1134  #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
1135      Gtk::FileFilter filter;      Gtk::FileFilter filter;
# Line 1004  void MainWindow::on_action_file_open() Line 1145  void MainWindow::on_action_file_open()
1145      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1146          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
1147          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
1148          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());          printf("on_action_file_open self=%p\n",
1149                   static_cast<void*>(Glib::Threads::Thread::self()));
1150          load_file(filename.c_str());          load_file(filename.c_str());
1151          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
1152      }      }
# Line 1074  void MainWindow::on_loader_progress() Line 1216  void MainWindow::on_loader_progress()
1216  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
1217  {  {
1218      printf("Loader finished!\n");      printf("Loader finished!\n");
1219      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());      printf("on_loader_finished self=%p\n",
1220               static_cast<void*>(Glib::Threads::Thread::self()));
1221      load_gig(loader->gig, loader->filename.c_str());      load_gig(loader->gig, loader->filename.c_str());
1222      progress_dialog->hide();      progress_dialog->hide();
1223  }  }
# Line 1169  void MainWindow::on_saver_finished() Line 1312  void MainWindow::on_saver_finished()
1312    
1313      file_structure_changed_signal.emit(this->file);      file_structure_changed_signal.emit(this->file);
1314    
1315      load_gig(this->file, this->filename.c_str());      __refreshEntireGUI();
1316      progress_dialog->hide();      progress_dialog->hide();
1317  }  }
1318    
# Line 1181  void MainWindow::on_action_file_save_as( Line 1324  void MainWindow::on_action_file_save_as(
1324    
1325  bool MainWindow::file_save_as()  bool MainWindow::file_save_as()
1326  {  {
1327      Gtk::FileChooserDialog dialog(*this, _("Save as"), Gtk::FILE_CHOOSER_ACTION_SAVE);      Gtk::FileChooserDialog dialog(*this, _("Save As"), Gtk::FILE_CHOOSER_ACTION_SAVE);
1328      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
1329      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(_("_Save"), Gtk::RESPONSE_OK);
1330      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
1331      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
1332    
# Line 1214  bool MainWindow::file_save_as() Line 1357  bool MainWindow::file_save_as()
1357      // show warning in the dialog      // show warning in the dialog
1358      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
1359      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
1360      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
1361        warningIcon.set_from_icon_name("dialog-warning",
1362                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
1363      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
1364  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
1365      view::WrapLabel description;      view::WrapLabel description;
# Line 1266  bool MainWindow::file_save_as() Line 1411  bool MainWindow::file_save_as()
1411  void MainWindow::__import_queued_samples() {  void MainWindow::__import_queued_samples() {
1412      std::cout << "Starting sample import\n" << std::flush;      std::cout << "Starting sample import\n" << std::flush;
1413      Glib::ustring error_files;      Glib::ustring error_files;
1414      printf("Samples to import: %d\n", m_SampleImportQueue.size());      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));
1415      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
1416           iter != m_SampleImportQueue.end(); ) {           iter != m_SampleImportQueue.end(); ) {
1417          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 1517  void MainWindow::on_action_sync_sampler_
1517          !Settings::singleton()->syncSamplerInstrumentSelection;          !Settings::singleton()->syncSamplerInstrumentSelection;
1518  }  }
1519    
1520    void MainWindow::on_action_move_root_note_with_region_moved() {
1521        Settings::singleton()->moveRootNoteWithRegionMoved =
1522            !Settings::singleton()->moveRootNoteWithRegionMoved;
1523    }
1524    
1525  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
1526  {  {
1527      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
# Line 1381  void MainWindow::on_action_help_about() Line 1531  void MainWindow::on_action_help_about()
1531      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
1532  #endif  #endif
1533      dialog.set_version(VERSION);      dialog.set_version(VERSION);
1534      dialog.set_copyright("Copyright (C) 2006-2015 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2017 Andreas Persson");
1535      const std::string sComment =      const std::string sComment =
1536          _("Built " __DATE__ "\nUsing ") +          _("Built " __DATE__ "\nUsing ") +
1537          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
# Line 1418  PropDialog::PropDialog() Line 1568  PropDialog::PropDialog()
1568        eSourceForm(_("Source form")),        eSourceForm(_("Source form")),
1569        eCommissioned(_("Commissioned")),        eCommissioned(_("Commissioned")),
1570        eSubject(_("Subject")),        eSubject(_("Subject")),
1571        quitButton(Gtk::Stock::CLOSE),        quitButton(_("_Close"), true),
1572        table(2, 1),        table(2, 1),
1573        m_file(NULL)        m_file(NULL)
1574  {  {
# Line 1541  void InstrumentProps::set_MIDIProgram(ui Line 1691  void InstrumentProps::set_MIDIProgram(ui
1691  }  }
1692    
1693  InstrumentProps::InstrumentProps() :  InstrumentProps::InstrumentProps() :
1694      quitButton(Gtk::Stock::CLOSE),      quitButton(_("_Close"), true),
1695      table(2,1),      table(2,1),
1696      eName(_("Name")),      eName(_("Name")),
1697      eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
# Line 1664  void MainWindow::load_gig(gig::File* gig Line 1814  void MainWindow::load_gig(gig::File* gig
1814      file = 0;      file = 0;
1815      set_file_is_shared(isSharedInstrument);      set_file_is_shared(isSharedInstrument);
1816    
1817      this->filename = filename ? filename : _("Unsaved Gig File");      this->filename =
1818            (filename && strlen(filename) > 0) ?
1819                filename : (!gig->GetFileName().empty()) ?
1820                    gig->GetFileName() : _("Unsaved Gig File");
1821      set_title(Glib::filename_display_basename(this->filename));      set_title(Glib::filename_display_basename(this->filename));
1822      file_has_name = filename;      file_has_name = filename;
1823      file_is_changed = false;      file_is_changed = false;
# Line 1673  void MainWindow::load_gig(gig::File* gig Line 1826  void MainWindow::load_gig(gig::File* gig
1826      propDialog.set_info(gig->pInfo);      propDialog.set_info(gig->pInfo);
1827    
1828      instrument_name_connection.block();      instrument_name_connection.block();
1829        int index = 0;
1830      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
1831           instrument = gig->GetNextInstrument()) {           instrument = gig->GetNextInstrument(), ++index) {
1832          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
1833    
1834          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
1835          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
1836            row[m_Columns.m_col_nr] = index;
1837          row[m_Columns.m_col_name] = name;          row[m_Columns.m_col_name] = name;
1838          row[m_Columns.m_col_instr] = instrument;          row[m_Columns.m_col_instr] = instrument;
1839    
# Line 1751  bool MainWindow::instr_props_set_instrum Line 1906  bool MainWindow::instr_props_set_instrum
1906  {  {
1907      instrumentProps.signal_name_changed().clear();      instrumentProps.signal_name_changed().clear();
1908    
1909      Gtk::TreeModel::const_iterator it =      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
1910          m_TreeView.get_selection()->get_selected();      if (rows.empty()) {
1911            instrumentProps.hide();
1912            return false;
1913        }
1914        Gtk::TreeModel::const_iterator it = m_refTreeModel->get_iter(rows[0]);
1915      if (it) {      if (it) {
1916          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
1917          gig::Instrument* instrument = row[m_Columns.m_col_instr];          gig::Instrument* instrument = row[m_Columns.m_col_instr];
# Line 1805  void MainWindow::show_midi_rules() Line 1964  void MainWindow::show_midi_rules()
1964  void MainWindow::show_script_slots() {  void MainWindow::show_script_slots() {
1965      if (!file) return;      if (!file) return;
1966      // get selected instrument      // get selected instrument
1967      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
1968      Gtk::TreeModel::iterator it = sel->get_selected();      if (rows.empty()) return;
1969        Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
1970      if (!it) return;      if (!it) return;
1971      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
1972      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
# Line 1818  void MainWindow::show_script_slots() { Line 1978  void MainWindow::show_script_slots() {
1978      window->show();      window->show();
1979  }  }
1980    
1981    void MainWindow::on_action_refresh_all() {
1982        __refreshEntireGUI();
1983    }
1984    
1985  void MainWindow::on_action_view_status_bar() {  void MainWindow::on_action_view_status_bar() {
1986      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1987          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 1993  void MainWindow::on_action_view_status_b
1993      else                    m_StatusBar.hide();      else                    m_StatusBar.hide();
1994  }  }
1995    
1996    void MainWindow::on_auto_restore_win_dim() {
1997        Gtk::CheckMenuItem* item =
1998            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
1999        if (!item) {
2000            std::cerr << "/MenuBar/MenuView/AutoRestoreWinDim == NULL\n";
2001            return;
2002        }
2003        Settings::singleton()->autoRestoreWindowDimension = item->get_active();
2004    }
2005    
2006    void MainWindow::on_save_with_temporary_file() {
2007        Gtk::CheckMenuItem* item =
2008            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuSettings/SaveWithTemporaryFile"));
2009        if (!item) {
2010            std::cerr << "/MenuBar/MenuSettings/SaveWithTemporaryFile == NULL\n";
2011            return;
2012        }
2013        Settings::singleton()->saveWithTemporaryFile = item->get_active();
2014    }
2015    
2016  bool MainWindow::is_copy_samples_unity_note_enabled() const {  bool MainWindow::is_copy_samples_unity_note_enabled() const {
2017      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
2018          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 2077  void MainWindow::on_instrument_selection
2077      }      }
2078  }  }
2079    
2080    void MainWindow::select_instrument(gig::Instrument* instrument) {
2081        if (!instrument) return;
2082    
2083        Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
2084        for (int i = 0; i < model->children().size(); ++i) {
2085            Gtk::TreeModel::Row row = model->children()[i];
2086            if (row[m_Columns.m_col_instr] == instrument) {
2087                // select and show the respective instrument in the list view
2088                show_intruments_tab();
2089                m_TreeView.get_selection()->unselect_all();
2090                m_TreeView.get_selection()->select(model->children()[i]);
2091                std::vector<Gtk::TreeModel::Path> rows =
2092                    m_TreeView.get_selection()->get_selected_rows();
2093                if (!rows.empty())
2094                    m_TreeView.scroll_to_row(rows[0]);
2095                on_sel_change(); // the regular instrument selection change callback
2096            }
2097        }
2098    }
2099    
2100  /// Returns true if requested dimension region was successfully selected and scrolled to in the list view, false on error.  /// Returns true if requested dimension region was successfully selected and scrolled to in the list view, false on error.
2101  bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) {  bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) {
2102      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
# Line 1904  bool MainWindow::select_dimension_region Line 2108  bool MainWindow::select_dimension_region
2108          if (row[m_Columns.m_col_instr] == pInstrument) {          if (row[m_Columns.m_col_instr] == pInstrument) {
2109              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
2110              show_intruments_tab();              show_intruments_tab();
2111                m_TreeView.get_selection()->unselect_all();
2112              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeView.get_selection()->select(model->children()[i]);
2113              Gtk::TreePath path(              std::vector<Gtk::TreeModel::Path> rows =
2114                  m_TreeView.get_selection()->get_selected()                  m_TreeView.get_selection()->get_selected_rows();
2115              );              if (!rows.empty())
2116              m_TreeView.scroll_to_row(path);                  m_TreeView.scroll_to_row(rows[0]);
2117              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
2118    
2119              // select respective region in the region selector              // select respective region in the region selector
# Line 1934  void MainWindow::select_sample(gig::Samp Line 2139  void MainWindow::select_sample(gig::Samp
2139              Gtk::TreeModel::Row rowSample = rowGroup.children()[s];              Gtk::TreeModel::Row rowSample = rowGroup.children()[s];
2140              if (rowSample[m_SamplesModel.m_col_sample] == sample) {              if (rowSample[m_SamplesModel.m_col_sample] == sample) {
2141                  show_samples_tab();                  show_samples_tab();
2142                    m_TreeViewSamples.get_selection()->unselect_all();
2143                  m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]);                  m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]);
2144                  Gtk::TreePath path(                  std::vector<Gtk::TreeModel::Path> rows =
2145                      m_TreeViewSamples.get_selection()->get_selected()                      m_TreeViewSamples.get_selection()->get_selected_rows();
2146                  );                  if (rows.empty()) return;
2147                  m_TreeViewSamples.scroll_to_row(path);                  m_TreeViewSamples.scroll_to_row(rows[0]);
2148                  return;                  return;
2149              }              }
2150          }          }
# Line 1947  void MainWindow::select_sample(gig::Samp Line 2153  void MainWindow::select_sample(gig::Samp
2153    
2154  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
2155      if (button->type == GDK_BUTTON_PRESS && button->button == 3) {      if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
2156            // by default if Ctrl keys is pressed down, then a mouse right-click
2157            // does not select the respective row, so we must assure this
2158            // programmatically ...
2159            /*{
2160                Gtk::TreeModel::Path path;
2161                Gtk::TreeViewColumn* pColumn = NULL;
2162                int cellX, cellY;
2163                bool bSuccess = m_TreeViewSamples.get_path_at_pos(
2164                    (int)button->x, (int)button->y,
2165                    path, pColumn, cellX, cellY
2166                );
2167                if (bSuccess) {
2168                    if (m_TreeViewSamples.get_selection()->count_selected_rows() <= 0) {
2169                        printf("not selected !!!\n");
2170                        m_TreeViewSamples.get_selection()->select(path);
2171                    }
2172                }
2173            }*/
2174    
2175          Gtk::Menu* sample_popup =          Gtk::Menu* sample_popup =
2176              dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/SamplePopupMenu"));              dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/SamplePopupMenu"));
2177          // update enabled/disabled state of sample popup items          // update enabled/disabled state of sample popup items
2178          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2179          Gtk::TreeModel::iterator it = sel->get_selected();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2180          bool group_selected  = false;          const int n = rows.size();
2181          bool sample_selected = false;          int nGroups  = 0;
2182          if (it) {          int nSamples = 0;
2183            for (int r = 0; r < n; ++r) {
2184                Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[r]);
2185                if (!it) continue;
2186              Gtk::TreeModel::Row row = *it;              Gtk::TreeModel::Row row = *it;
2187              group_selected  = row[m_SamplesModel.m_col_group];              if (row[m_SamplesModel.m_col_group]) nGroups++;
2188              sample_selected = row[m_SamplesModel.m_col_sample];              if (row[m_SamplesModel.m_col_sample]) nSamples++;
2189          }          }
2190            
               
2191          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))->
2192              set_sensitive(group_selected || sample_selected);              set_sensitive(n == 1);
2193          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddSample"))->
2194              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2195          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddGroup"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddGroup"))->
2196              set_sensitive(file);              set_sensitive(file);
2197          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/ShowSampleRefs"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/ShowSampleRefs"))->
2198              set_sensitive(sample_selected);              set_sensitive(nSamples == 1);
2199          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))->
2200              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2201          // show sample popup          // show sample popup
2202          sample_popup->popup(button->button, button->time);          sample_popup->popup(button->button, button->time);
2203    
2204          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))->
2205              set_sensitive(group_selected || sample_selected);              set_sensitive(n == 1);
2206          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))->
2207              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2208          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddGroup"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddGroup"))->
2209              set_sensitive(file);              set_sensitive(file);
2210          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/ShowSampleRefs"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/ShowSampleRefs"))->
2211              set_sensitive(sample_selected);              set_sensitive(nSamples == 1);
2212          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))->
2213              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2214      }      }
2215  }  }
2216    
# Line 2062  void MainWindow::add_instrument(gig::Ins Line 2289  void MainWindow::add_instrument(gig::Ins
2289      instrument_name_connection.block();      instrument_name_connection.block();
2290      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
2291      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
2292        rowInstr[m_Columns.m_col_nr] = m_refTreeModel->children().size() - 1;
2293      rowInstr[m_Columns.m_col_name] = name;      rowInstr[m_Columns.m_col_name] = name;
2294      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_Columns.m_col_instr] = instrument;
2295      instrument_name_connection.unblock();      instrument_name_connection.unblock();
# Line 2090  void MainWindow::on_action_duplicate_ins Line 2318  void MainWindow::on_action_duplicate_ins
2318      // retrieve the currently selected instrument      // retrieve the currently selected instrument
2319      // (being the original instrument to be duplicated)      // (being the original instrument to be duplicated)
2320      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
2321      Gtk::TreeModel::iterator itSelection = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2322      if (!itSelection) return;      for (int r = 0; r < rows.size(); ++r) {
2323      Gtk::TreeModel::Row row = *itSelection;          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);
2324      gig::Instrument* instrOrig = row[m_Columns.m_col_instr];          if (it) {
2325      if (!instrOrig) return;              Gtk::TreeModel::Row row = *it;
2326                gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
2327      // duplicate the orginal instrument              if (instrOrig) {
2328      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);                  // duplicate the orginal instrument
2329      instrNew->pInfo->Name =                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
2330          instrOrig->pInfo->Name +                  instrNew->pInfo->Name =
2331          gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");                      instrOrig->pInfo->Name +
2332                        gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");
2333    
2334      add_instrument(instrNew);                  add_instrument(instrNew);
2335                }
2336            }
2337        }
2338  }  }
2339    
2340  void MainWindow::on_action_remove_instrument() {  void MainWindow::on_action_remove_instrument() {
# Line 2119  void MainWindow::on_action_remove_instru Line 2351  void MainWindow::on_action_remove_instru
2351      }      }
2352    
2353      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
2354      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2355      if (it) {      for (int r = rows.size() - 1; r >= 0; --r) {
2356            Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);
2357            if (!it) continue;
2358          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
2359          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_Columns.m_col_instr];
2360          try {          try {
# Line 2135  void MainWindow::on_action_remove_instru Line 2369  void MainWindow::on_action_remove_instru
2369    
2370              // remove row from instruments tree view              // remove row from instruments tree view
2371              m_refTreeModel->erase(it);              m_refTreeModel->erase(it);
2372                // update "Nr" column of all instrument rows
2373                {
2374                    int index = 0;
2375                    for (Gtk::TreeModel::iterator it = m_refTreeModel->children().begin();
2376                         it != m_refTreeModel->children().end(); ++it, ++index)
2377                    {
2378                        Gtk::TreeModel::Row row = *it;
2379                        row[m_Columns.m_col_nr] = index;
2380                    }
2381                }
2382    
2383  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
2384              // select another instrument (in gtk3 this is done              // select another instrument (in gtk3 this is done
# Line 2232  void MainWindow::on_action_edit_script() Line 2476  void MainWindow::on_action_edit_script()
2476      if (!script) return;      if (!script) return;
2477    
2478      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
2479        editor->signal_script_to_be_changed.connect(
2480            signal_script_to_be_changed.make_slot()
2481        );
2482        editor->signal_script_changed.connect(
2483            signal_script_changed.make_slot()
2484        );
2485      editor->setScript(script);      editor->setScript(script);
2486      //editor->reparent(*this);      //editor->reparent(*this);
2487      editor->show();      editor->show();
# Line 2297  void MainWindow::on_action_add_group() { Line 2547  void MainWindow::on_action_add_group() {
2547      file_changed();      file_changed();
2548  }  }
2549    
2550    void MainWindow::on_action_replace_sample() {
2551        add_or_replace_sample(true);
2552    }
2553    
2554  void MainWindow::on_action_add_sample() {  void MainWindow::on_action_add_sample() {
2555        add_or_replace_sample(false);
2556    }
2557    
2558    void MainWindow::add_or_replace_sample(bool replace) {
2559      if (!file) return;      if (!file) return;
2560      // get selected group  
2561        // get selected group (and probably selected sample)
2562      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2563      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2564        if (rows.empty()) return;
2565        Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
2566      if (!it) return;      if (!it) return;
2567      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
2568        gig::Sample* sample = NULL;
2569      gig::Group* group = row[m_SamplesModel.m_col_group];      gig::Group* group = row[m_SamplesModel.m_col_group];
2570      if (!group) { // not a group, but a sample is selected (probably)      if (!group) { // not a group, but a sample is selected (probably)
2571          gig::Sample* sample = row[m_SamplesModel.m_col_sample];          if (replace) sample = row[m_SamplesModel.m_col_sample];
2572          if (!sample) return;          if (!row[m_SamplesModel.m_col_sample]) return;
2573          it = row.parent(); // resolve parent (that is the sample's group)          it = row.parent(); // resolve parent (that is the sample's group)
2574          if (!it) return;          if (!it) return;
2575          row = *it;          if (!replace) row = *it;
2576          group = row[m_SamplesModel.m_col_group];          group = (*it)[m_SamplesModel.m_col_group];
2577          if (!group) return;          if (!group) return;
2578      }      }
2579        if (replace && !sample) return;
2580    
2581      // show 'browse for file' dialog      // show 'browse for file' dialog
2582      Gtk::FileChooserDialog dialog(*this, _("Add Sample(s)"));      Gtk::FileChooserDialog dialog(*this, replace ? _("Replace Sample with") : _("Add Sample(s)"));
2583      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
2584      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
2585      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
2586    
2587      // matches all file types supported by libsndfile      // matches all file types supported by libsndfile
2588  #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 2389  void MainWindow::on_action_add_sample() Line 2653  void MainWindow::on_action_add_sample()
2653                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
2654                          throw std::string(_("format not supported")); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
2655                  }                  }
2656                  // add a new sample to the .gig file                  // add a new sample to the .gig file (if adding is requested actually)
2657                  gig::Sample* sample = file->AddSample();                  if (!replace) sample = file->AddSample();
2658                  // file name without path                  // file name without path
2659                  Glib::ustring filename = Glib::filename_display_basename(*iter);                  Glib::ustring filename = Glib::filename_display_basename(*iter);
2660                  // remove file extension if there is one                  // remove file extension if there is one
# Line 2441  void MainWindow::on_action_add_sample() Line 2705  void MainWindow::on_action_add_sample()
2705                  // physically when File::Save() is called)                  // physically when File::Save() is called)
2706                  sample->Resize(info.frames);                  sample->Resize(info.frames);
2707                  // make sure sample is part of the selected group                  // make sure sample is part of the selected group
2708                  group->AddSample(sample);                  if (!replace) group->AddSample(sample);
2709                  // schedule that physical resize and sample import                  // schedule that physical resize and sample import
2710                  // (data copying), performed when "Save" is requested                  // (data copying), performed when "Save" is requested
2711                  SampleImportItem sched_item;                  SampleImportItem sched_item;
# Line 2449  void MainWindow::on_action_add_sample() Line 2713  void MainWindow::on_action_add_sample()
2713                  sched_item.sample_path = *iter;                  sched_item.sample_path = *iter;
2714                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue.push_back(sched_item);
2715                  // add sample to the tree view                  // add sample to the tree view
2716                  Gtk::TreeModel::iterator iterSample =                  if (replace) {
2717                      m_refSamplesTreeModel->append(row.children());                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);
2718                  Gtk::TreeModel::Row rowSample = *iterSample;                  } else {
2719                  rowSample[m_SamplesModel.m_col_name] =                      Gtk::TreeModel::iterator iterSample =
2720                      gig_to_utf8(sample->pInfo->Name);                          m_refSamplesTreeModel->append(row.children());
2721                  rowSample[m_SamplesModel.m_col_sample] = sample;                      Gtk::TreeModel::Row rowSample = *iterSample;
2722                  rowSample[m_SamplesModel.m_col_group]  = NULL;                      rowSample[m_SamplesModel.m_col_name] =
2723                            gig_to_utf8(sample->pInfo->Name);
2724                        rowSample[m_SamplesModel.m_col_sample] = sample;
2725                        rowSample[m_SamplesModel.m_col_group]  = NULL;
2726                    }
2727                  // close sound file                  // close sound file
2728                  sf_close(hFile);                  sf_close(hFile);
2729                  file_changed();                  file_changed();
# Line 2466  void MainWindow::on_action_add_sample() Line 2734  void MainWindow::on_action_add_sample()
2734          }          }
2735          // 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
2736          if (!error_files.empty()) {          if (!error_files.empty()) {
2737              Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;              Glib::ustring txt =
2738                    (replace
2739                        ? _("Failed to replace sample with:\n")
2740                        : _("Could not add the following sample(s):\n"))
2741                    + error_files;
2742              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
2743              msg.run();              msg.run();
2744          }          }
# Line 2509  void MainWindow::on_action_replace_all_s Line 2781  void MainWindow::on_action_replace_all_s
2781      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
2782      description.show();      description.show();
2783      entryArea.show_all();      entryArea.show_all();
2784      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
2785      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
2786      dialog.set_select_multiple(false);      dialog.set_select_multiple(false);
2787      if (current_sample_dir != "") {      if (current_sample_dir != "") {
# Line 2533  void MainWindow::on_action_replace_all_s Line 2805  void MainWindow::on_action_replace_all_s
2805              try              try
2806              {              {
2807                  if (!hFile) throw std::string(_("could not open file"));                  if (!hFile) throw std::string(_("could not open file"));
                 int bitdepth;  
2808                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
2809                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
2810                      case SF_FORMAT_PCM_16:                      case SF_FORMAT_PCM_16:
2811                      case SF_FORMAT_PCM_U8:                      case SF_FORMAT_PCM_U8:
                         bitdepth = 16;  
                         break;  
2812                      case SF_FORMAT_PCM_24:                      case SF_FORMAT_PCM_24:
2813                      case SF_FORMAT_PCM_32:                      case SF_FORMAT_PCM_32:
2814                      case SF_FORMAT_FLOAT:                      case SF_FORMAT_FLOAT:
2815                      case SF_FORMAT_DOUBLE:                      case SF_FORMAT_DOUBLE:
                         bitdepth = 24;  
2816                          break;                          break;
2817                      default:                      default:
2818                          sf_close(hFile);                          sf_close(hFile);
# Line 2577  void MainWindow::on_action_replace_all_s Line 2845  void MainWindow::on_action_replace_all_s
2845  void MainWindow::on_action_remove_sample() {  void MainWindow::on_action_remove_sample() {
2846      if (!file) return;      if (!file) return;
2847      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2848      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2849      if (it) {      for (int r = rows.size() - 1; r >= 0; --r) {
2850            Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[r]);
2851            if (!it) continue;
2852          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
2853          gig::Group* group   = row[m_SamplesModel.m_col_group];          gig::Group* group   = row[m_SamplesModel.m_col_group];
2854          gig::Sample* sample = row[m_SamplesModel.m_col_sample];          gig::Sample* sample = row[m_SamplesModel.m_col_sample];
# Line 2650  void MainWindow::on_action_remove_sample Line 2920  void MainWindow::on_action_remove_sample
2920      }      }
2921  }  }
2922    
2923    void MainWindow::on_action_remove_unused_samples() {
2924        if (!file) return;
2925    
2926        // collect all samples that are not referenced by any instrument
2927        std::list<gig::Sample*> lsamples;
2928        for (int iSample = 0; file->GetSample(iSample); ++iSample) {
2929            gig::Sample* sample = file->GetSample(iSample);
2930            bool isUsed = false;
2931            for (gig::Instrument* instrument = file->GetFirstInstrument(); instrument;
2932                                  instrument = file->GetNextInstrument())
2933            {
2934                for (gig::Region* rgn = instrument->GetFirstRegion(); rgn;
2935                                  rgn = instrument->GetNextRegion())
2936                {
2937                    for (int i = 0; i < 256; ++i) {
2938                        if (!rgn->pDimensionRegions[i]) continue;
2939                        if (rgn->pDimensionRegions[i]->pSample != sample) continue;
2940                        isUsed = true;
2941                        goto endOfRefSearch;
2942                    }
2943                }
2944            }
2945            endOfRefSearch:
2946            if (!isUsed) lsamples.push_back(sample);
2947        }
2948    
2949        if (lsamples.empty()) return;
2950    
2951        // notify everybody that we're going to remove these samples
2952        samples_to_be_removed_signal.emit(lsamples);
2953    
2954        // remove collected samples
2955        try {
2956            for (std::list<gig::Sample*>::iterator itSample = lsamples.begin();
2957                 itSample != lsamples.end(); ++itSample)
2958            {
2959                gig::Sample* sample = *itSample;
2960                // remove sample from the .gig file
2961                file->DeleteSample(sample);
2962                // if sample was just previously added, remove it fro the import queue
2963                for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
2964                     iter != m_SampleImportQueue.end(); ++iter)
2965                {
2966                    if ((*iter).gig_sample == sample) {
2967                        printf("Removing previously added sample '%s'\n",
2968                               (*iter).sample_path.c_str());
2969                        m_SampleImportQueue.erase(iter);
2970                        break;
2971                    }
2972                }
2973            }
2974        } catch (RIFF::Exception e) {
2975            // show error message
2976            Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
2977            msg.run();
2978        }
2979    
2980        // notify everybody that we're done with removal
2981        samples_removed_signal.emit();
2982    
2983        dimreg_changed();
2984        file_changed();
2985        __refreshEntireGUI();
2986    }
2987    
2988  // see comment on on_sample_treeview_drag_begin()  // see comment on on_sample_treeview_drag_begin()
2989  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)
2990  {  {
# Line 2676  void MainWindow::on_scripts_treeview_dra Line 3011  void MainWindow::on_scripts_treeview_dra
3011                         sizeof(script)/*length of data in bytes*/);                         sizeof(script)/*length of data in bytes*/);
3012  }  }
3013    
3014    // see comment on on_sample_treeview_drag_begin()
3015    void MainWindow::on_instruments_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
3016    {
3017        first_call_to_drag_data_get = true;
3018    }
3019    
3020    void MainWindow::on_instruments_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
3021                                                           Gtk::SelectionData& selection_data, guint, guint)
3022    {
3023        if (!first_call_to_drag_data_get) return;
3024        first_call_to_drag_data_get = false;
3025    
3026        // get selected source instrument
3027        gig::Instrument* src = NULL;
3028        {
3029            Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
3030            std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3031            if (!rows.empty()) {
3032                Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
3033                if (it) {
3034                    Gtk::TreeModel::Row row = *it;
3035                    src = row[m_Columns.m_col_instr];
3036                }
3037            }
3038        }
3039        if (!src) return;
3040    
3041        // pass the source gig::Instrument as pointer
3042        selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&src,
3043                           sizeof(src)/*length of data in bytes*/);
3044    }
3045    
3046    void MainWindow::on_instruments_treeview_drop_drag_data_received(
3047        const Glib::RefPtr<Gdk::DragContext>& context, int x, int y,
3048        const Gtk::SelectionData& selection_data, guint, guint time)
3049    {
3050        gig::Instrument* src = *((gig::Instrument**) selection_data.get_data());
3051        if (!src || selection_data.get_length() != sizeof(gig::Instrument*))
3052            return;
3053    
3054        gig::Instrument* dst = NULL;
3055        {
3056            Gtk::TreeModel::Path path;
3057            const bool found = m_TreeView.get_path_at_pos(x, y, path);
3058            if (!found) return;
3059    
3060            Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path);
3061            if (!iter) return;
3062            Gtk::TreeModel::Row row = *iter;
3063            dst = row[m_Columns.m_col_instr];
3064        }
3065        if (!dst) return;
3066    
3067        //printf("dragdrop received src=%s dst=%s\n", src->pInfo->Name.c_str(), dst->pInfo->Name.c_str());
3068        src->MoveTo(dst);
3069        __refreshEntireGUI();
3070        select_instrument(src);
3071    }
3072    
3073  // For some reason drag_data_get gets called two times for each  // For some reason drag_data_get gets called two times for each
3074  // 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
3075  // 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 2694  void MainWindow::on_sample_treeview_drag Line 3088  void MainWindow::on_sample_treeview_drag
3088      // get selected sample      // get selected sample
3089      gig::Sample* sample = NULL;      gig::Sample* sample = NULL;
3090      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
3091      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3092      if (it) {      if (!rows.empty()) {
3093          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
3094          sample = row[m_SamplesModel.m_col_sample];          if (it) {
3095                Gtk::TreeModel::Row row = *it;
3096                sample = row[m_SamplesModel.m_col_sample];
3097            }
3098      }      }
3099      // pass the gig::Sample as pointer      // pass the gig::Sample as pointer
3100      selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&sample,      selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&sample,
# Line 2837  void MainWindow::script_double_clicked(c Line 3234  void MainWindow::script_double_clicked(c
3234      if (!script) return;      if (!script) return;
3235    
3236      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
3237        editor->signal_script_to_be_changed.connect(
3238            signal_script_to_be_changed.make_slot()
3239        );
3240        editor->signal_script_changed.connect(
3241            signal_script_changed.make_slot()
3242        );
3243      editor->setScript(script);      editor->setScript(script);
3244      //editor->reparent(*this);      //editor->reparent(*this);
3245      editor->show();      editor->show();
# Line 2890  void MainWindow::on_action_combine_instr Line 3293  void MainWindow::on_action_combine_instr
3293    
3294  void MainWindow::on_action_view_references() {  void MainWindow::on_action_view_references() {
3295      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
3296      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3297        if (rows.empty()) return;
3298        Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
3299      if (!it) return;      if (!it) return;
3300      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3301      gig::Sample* sample = row[m_SamplesModel.m_col_sample];      gig::Sample* sample = row[m_SamplesModel.m_col_sample];
# Line 3012  void MainWindow::on_action_merge_files() Line 3417  void MainWindow::on_action_merge_files()
3417      }      }
3418    
3419      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));
3420      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
3421      dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);      dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);
3422      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
3423  #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 3031  void MainWindow::on_action_merge_files() Line 3436  void MainWindow::on_action_merge_files()
3436      // show warning in the file picker dialog      // show warning in the file picker dialog
3437      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
3438      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
3439      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
3440        warningIcon.set_from_icon_name("dialog-warning",
3441                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
3442      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
3443  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
3444      view::WrapLabel description;      view::WrapLabel description;
# Line 3054  void MainWindow::on_action_merge_files() Line 3461  void MainWindow::on_action_merge_files()
3461      descriptionArea.show_all();      descriptionArea.show_all();
3462    
3463      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
3464          printf("on_action_merge_files self=%x\n", Glib::Threads::Thread::self());          printf("on_action_merge_files self=%p\n",
3465                   static_cast<void*>(Glib::Threads::Thread::self()));
3466          std::vector<std::string> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
3467    
3468          // merge the selected files to the currently open .gig file          // merge the selected files to the currently open .gig file
# Line 3066  void MainWindow::on_action_merge_files() Line 3474  void MainWindow::on_action_merge_files()
3474          }          }
3475    
3476          // update GUI          // update GUI
3477          __refreshEntireGUI();                  __refreshEntireGUI();
3478      }      }
3479  }  }
3480    
Legend:
Removed from v.2695  
changed lines
  Added in v.3089
  ViewVC Help
Powered by ViewVC