/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 2398 by persson,
Sun Jan 13 09:14:29 2013 UTC
+revision 2715 by schoenebeck,
Tue Jan 20 18:48:15 2015 UTC
 Line 1
  /*
-  * Copyright (C) 2006-2013 Andreas Persson
+  * Copyright (C) 2006-2015 Andreas Persson
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License as
 Line 30
  #include <gtkmm/stock.h>
  #include <gtkmm/targetentry.h>
  #include <gtkmm/main.h>
- #include <gtkmm/radiomenuitem.h>
  #include <gtkmm/toggleaction.h>
  #if GTKMM_MAJOR_VERSION < 3
  #include "wrapLabel.hh"
-Line 41
+Line 40
  #include <stdio.h>
  #include <sndfile.h>
+ #include <assert.h>
  #include "mainwindow.h"
+ #include "Settings.h"
+ #include "CombineInstrumentsDialog.h"
+ #include "scripteditor.h"
+ #include "scriptslots.h"
+ #include "ReferencesView.h"
  #include "../../gfx/status_attached.xpm"
  #include "../../gfx/status_detached.xpm"
- template<class T> inline std::string ToString(T o) {
-     std::stringstream ss;
-     ss << o;
-     return ss.str();
- }
- Table::Table(int x, int y) : Gtk::Table(x, y), rowno(0) {  }
- void Table::add(BoolEntry& boolentry)
- {
-     attach(boolentry.widget, 0, 2, rowno, rowno + 1,
-            Gtk::FILL, Gtk::SHRINK);
-     rowno++;
- }
- void Table::add(BoolEntryPlus6& boolentry)
- {
-     attach(boolentry.widget, 0, 2, rowno, rowno + 1,
-            Gtk::FILL, Gtk::SHRINK);
-     rowno++;
- }
- void Table::add(LabelWidget& prop)
- {
-     attach(prop.label, 1, 2, rowno, rowno + 1,
-            Gtk::FILL, Gtk::SHRINK);
-     attach(prop.widget, 2, 3, rowno, rowno + 1,
-            Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
-     rowno++;
- }
  MainWindow::MainWindow() :
+     m_DimRegionChooser(*this),
      dimreg_label(_("Changes apply to:")),
      dimreg_all_regions(_("all regions")),
      dimreg_all_dimregs(_("all dimension splits")),
-Line 91 
 MainWindow::MainWindow() :
+Line 66 
 MainWindow::MainWindow() :
      add(m_VBox);
      // Handle selection
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     m_TreeView.get_selection()->signal_changed().connect(
-     tree_sel_ref->signal_changed().connect(
          sigc::mem_fun(*this, &MainWindow::on_sel_change));
      // m_TreeView.set_reorderable();
-Line 108 
 MainWindow::MainWindow() :
+Line 82 
 MainWindow::MainWindow() :
      m_ScrolledWindowSamples.add(m_TreeViewSamples);
      m_ScrolledWindowSamples.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+     m_ScrolledWindowScripts.add(m_TreeViewScripts);
+     m_ScrolledWindowScripts.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
      m_TreeViewNotebook.set_size_request(300);
-Line 121 
 MainWindow::MainWindow() :
+Line 98 
 MainWindow::MainWindow() :
      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);
      m_HPaned.add2(dimreg_vbox);
+     dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right."));
+     dimreg_all_regions.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied to all regions of this instrument as well."));
+     dimreg_all_dimregs.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied as well to all dimension splits of the region selected below."));
+     dimreg_stereo.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied to both audio channel splits (only if a \"stereo\" dimension is defined below)."));
      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
+     m_TreeViewNotebook.append_page(m_ScrolledWindowScripts, _("Scripts"));
      actionGroup = Gtk::ActionGroup::create();
-Line 155 
 MainWindow::MainWindow() :
+Line 136 
 MainWindow::MainWindow() :
                                           Gtk::Stock::PROPERTIES),
                       sigc::mem_fun(
                           *this, &MainWindow::show_instr_props));
+     actionGroup->add(Gtk::Action::create("MidiRules",
+                                          _("_Midi Rules...")),
+                      sigc::mem_fun(
+                          *this, &MainWindow::show_midi_rules));
+     actionGroup->add(Gtk::Action::create("ScriptSlots",
+                                          _("_Script Slots...")),
+                      sigc::mem_fun(
+                          *this, &MainWindow::show_script_slots));
      actionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),
                       sigc::mem_fun(
                           *this, &MainWindow::on_action_quit));
-     actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));
+     actionGroup->add(
+         Gtk::Action::create("MenuSample", _("_Sample")),
+         sigc::mem_fun(*this, &MainWindow::show_samples_tab)
+     );
+     actionGroup->add(
+         Gtk::Action::create("MenuInstrument", _("_Instrument")),
+         sigc::mem_fun(*this, &MainWindow::show_intruments_tab)
+     );
+     actionGroup->add(
+         Gtk::Action::create("MenuScript", _("S_cript")),
+         sigc::mem_fun(*this, &MainWindow::show_scripts_tab)
+     );
+     actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select")));
+     actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
-     actionGroup->add(Gtk::Action::create("MenuView", _("_View")));
      Glib::RefPtr<Gtk::ToggleAction> toggle_action =
+         Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));
+     toggle_action->set_active(true);
+     actionGroup->add(toggle_action);
+     toggle_action =
+         Gtk::ToggleAction::create("CopySampleTune", _("Copy Sample's _Fine Tune"));
+     toggle_action->set_active(true);
+     actionGroup->add(toggle_action);
+     toggle_action =
+         Gtk::ToggleAction::create("CopySampleLoop", _("Copy Sample's _Loop Points"));
+     toggle_action->set_active(true);
+     actionGroup->add(toggle_action);
+     actionGroup->add(Gtk::Action::create("MenuView", _("_View")));
+     toggle_action =
          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));
      toggle_action->set_active(true);
      actionGroup->add(toggle_action,
-Line 187 
 MainWindow::MainWindow() :
+Line 206 
 MainWindow::MainWindow() :
          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
      );
+     actionGroup->add(Gtk::Action::create("MenuSettings", _("_Settings")));
+     toggle_action =
+         Gtk::ToggleAction::create("WarnUserOnExtensions", _("Show warning on format _extensions"));
+     toggle_action->set_active(Settings::singleton()->warnUserOnExtensions);
+     actionGroup->add(
+         toggle_action,
+         sigc::mem_fun(*this, &MainWindow::on_action_warn_user_on_extensions)
+     );
+     toggle_action =
+         Gtk::ToggleAction::create("SyncSamplerInstrumentSelection", _("Synchronize sampler's instrument selection"));
+     toggle_action->set_active(Settings::singleton()->syncSamplerInstrumentSelection);
+     actionGroup->add(
+         toggle_action,
+         sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)
+     );
+     actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
+     actionGroup->add(
+         Gtk::Action::create("CombineInstruments", _("_Combine Instruments...")),
+         sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
+     );
+     actionGroup->add(
+         Gtk::Action::create("MergeFiles", _("_Merge Files...")),
+         sigc::mem_fun(*this, &MainWindow::on_action_merge_files)
+     );
      // sample right-click popup actions
      actionGroup->add(
          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),
-Line 205 
 MainWindow::MainWindow() :
+Line 257 
 MainWindow::MainWindow() :
          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
      );
      actionGroup->add(
+         Gtk::Action::create("ShowSampleRefs", _("Show References...")),
+         sigc::mem_fun(*this, &MainWindow::on_action_view_references)
+     );
+     actionGroup->add(
+         Gtk::Action::create("ReplaceSample",
+                             _("Replace Sample...")),
+         sigc::mem_fun(*this, &MainWindow::on_action_replace_sample)
+     );
+     actionGroup->add(
          Gtk::Action::create("ReplaceAllSamplesInAllGroups",
                              _("Replace All Samples in All Groups...")),
          sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
      );
+     // script right-click popup actions
+     actionGroup->add(
+         Gtk::Action::create("AddScriptGroup", _("Add _Group")),
+         sigc::mem_fun(*this, &MainWindow::on_action_add_script_group)
+     );
+     actionGroup->add(
+         Gtk::Action::create("AddScript", _("Add _Script")),
+         sigc::mem_fun(*this, &MainWindow::on_action_add_script)
+     );
+     actionGroup->add(
+         Gtk::Action::create("EditScript", _("_Edit Script...")),
+         sigc::mem_fun(*this, &MainWindow::on_action_edit_script)
+     );
+     actionGroup->add(
+         Gtk::Action::create("RemoveScript", Gtk::Stock::REMOVE),
+         sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
+     );
      uiManager = Gtk::UIManager::create();
      uiManager->insert_action_group(actionGroup);
-Line 228 
 MainWindow::MainWindow() :
+Line 307 
 MainWindow::MainWindow() :
          "      <separator/>"
          "      <menuitem action='Quit'/>"
          "    </menu>"
+         "    <menu action='MenuEdit'>"
+         "      <menuitem action='CopySampleUnity'/>"
+         "      <menuitem action='CopySampleTune'/>"
+         "      <menuitem action='CopySampleLoop'/>"
+         "    </menu>"
+         "    <menu action='MenuSample'>"
+         "      <menuitem action='SampleProperties'/>"
+         "      <menuitem action='AddGroup'/>"
+         "      <menuitem action='AddSample'/>"
+         "      <menuitem action='ShowSampleRefs'/>"
+         "      <menuitem action='ReplaceSample' />"
+         "      <menuitem action='ReplaceAllSamplesInAllGroups' />"
+         "      <separator/>"
+         "      <menuitem action='RemoveSample'/>"
+         "    </menu>"
          "    <menu action='MenuInstrument'>"
+         "      <menu action='AllInstruments'>"
+         "      </menu>"
+         "      <separator/>"
+         "      <menuitem action='InstrProperties'/>"
+         "      <menuitem action='MidiRules'/>"
+         "      <menuitem action='ScriptSlots'/>"
+         "      <menuitem action='AddInstrument'/>"
+         "      <menuitem action='DupInstrument'/>"
+         "      <separator/>"
+         "      <menuitem action='RemoveInstrument'/>"
+         "    </menu>"
+         "    <menu action='MenuScript'>"
+         "      <menuitem action='AddScriptGroup'/>"
+         "      <menuitem action='AddScript'/>"
+         "      <menuitem action='EditScript'/>"
+         "      <separator/>"
+         "      <menuitem action='RemoveScript'/>"
          "    </menu>"
          "    <menu action='MenuView'>"
          "      <menuitem action='Statusbar'/>"
          "    </menu>"
+         "    <menu action='MenuTools'>"
+         "      <menuitem action='CombineInstruments'/>"
+         "      <menuitem action='MergeFiles'/>"
+         "    </menu>"
+         "    <menu action='MenuSettings'>"
+         "      <menuitem action='WarnUserOnExtensions'/>"
+         "      <menuitem action='SyncSamplerInstrumentSelection'/>"
+         "    </menu>"
          "    <menu action='MenuHelp'>"
          "      <menuitem action='About'/>"
          "    </menu>"
          "  </menubar>"
          "  <popup name='PopupMenu'>"
          "    <menuitem action='InstrProperties'/>"
+         "    <menuitem action='MidiRules'/>"
+         "    <menuitem action='ScriptSlots'/>"
          "    <menuitem action='AddInstrument'/>"
          "    <menuitem action='DupInstrument'/>"
          "    <separator/>"
-Line 248 
 MainWindow::MainWindow() :
+Line 369 
 MainWindow::MainWindow() :
          "    <menuitem action='SampleProperties'/>"
          "    <menuitem action='AddGroup'/>"
          "    <menuitem action='AddSample'/>"
-         "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
+         "    <menuitem action='ShowSampleRefs'/>"
+         "    <menuitem action='ReplaceSample' />"
+         "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
          "    <separator/>"
          "    <menuitem action='RemoveSample'/>"
          "  </popup>"
+         "  <popup name='ScriptPopupMenu'>"
+         "    <menuitem action='AddScriptGroup'/>"
+         "    <menuitem action='AddScript'/>"
+         "    <menuitem action='EditScript'/>"
+         "    <separator/>"
+         "    <menuitem action='RemoveScript'/>"
+         "  </popup>"
          "</ui>";
      uiManager->add_ui_from_string(ui_info);
      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));
+     // Set tooltips for menu items (for some reason, setting a tooltip on the
+     // respective Gtk::Action objects above will simply be ignored, no matter
+     // if using Gtk::Action::set_tooltip() or passing the tooltip string on
+     // Gtk::Action::create()).
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
+         item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current unity note setting will be altered by this action."));
+     }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune"));
+         item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current sample playback tuning will be altered by this action."));
+     }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
+         item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current loop informations to be altered by this action."));
+     }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuSettings/WarnUserOnExtensions"));
+         item->set_tooltip_text(_("If checked, a warning will be shown whenever you try to use a feature which is based on a LinuxSampler extension ontop of the original gig format, which would not work with the Gigasampler/GigaStudio application."));
+     }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuSettings/SyncSamplerInstrumentSelection"));
+         item->set_tooltip_text(_("If checked, the sampler's current instrument will automatically be switched whenever another instrument was selected in gigedit (only available in live-mode)."));
+     }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
+         item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));
+     }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuTools/MergeFiles"));
+         item->set_tooltip_text(_("Add instruments and samples of other .gig files to this .gig file."));
+     }
+     instrument_menu = static_cast<Gtk::MenuItem*>(
+         uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments"))->get_submenu();
      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");
      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
-Line 281 
 MainWindow::MainWindow() :
+Line 455 
 MainWindow::MainWindow() :
      // Create the Tree model:
      m_refTreeModel = Gtk::ListStore::create(m_Columns);
      m_TreeView.set_model(m_refTreeModel);
-     m_refTreeModel->signal_row_changed().connect(
+     m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));
+     instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
      );
      // Add the TreeView's view columns:
      m_TreeView.append_column_editable("Instrument", m_Columns.m_col_name);
      m_TreeView.set_headers_visible(false);
+     // establish drag&drop within the instrument tree view, allowing to reorder
+     // the sequence of instruments within the gig file
+     {
+         std::vector<Gtk::TargetEntry> drag_target_instrument;
+         drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument"));
+         m_TreeView.drag_source_set(drag_target_instrument);
+         m_TreeView.drag_dest_set(drag_target_instrument);
+         m_TreeView.signal_drag_begin().connect(
+             sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_begin)
+         );
+         m_TreeView.signal_drag_data_get().connect(
+             sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_data_get)
+         );
+         m_TreeView.signal_drag_data_received().connect(
+             sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drop_drag_data_received)
+         );
+     }
      // create samples treeview (including its data model)
      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);
      m_TreeViewSamples.set_model(m_refSamplesTreeModel);
+     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_reorderable();
-     m_TreeViewSamples.append_column_editable("Samples", m_SamplesModel.m_col_name);
+     m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name);
-     m_TreeViewSamples.set_headers_visible(false);
+     m_TreeViewSamples.append_column(_("Referenced"), m_SamplesModel.m_col_refcount);
+     {
+         Gtk::TreeViewColumn* column = m_TreeViewSamples.get_column(0);
+         Gtk::CellRendererText* cellrenderer =
+             dynamic_cast<Gtk::CellRendererText*>(column->get_first_cell());
+         column->add_attribute(
+             cellrenderer->property_foreground(), m_SamplesModel.m_color
+         );
+     }
+     {
+         Gtk::TreeViewColumn* column = m_TreeViewSamples.get_column(1);
+         Gtk::CellRendererText* cellrenderer =
+             dynamic_cast<Gtk::CellRendererText*>(column->get_first_cell());
+         column->add_attribute(
+             cellrenderer->property_foreground(), m_SamplesModel.m_color
+         );
+     }
+     m_TreeViewSamples.set_headers_visible(true);
      m_TreeViewSamples.signal_button_press_event().connect_notify(
          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_button_release)
      );
-Line 302 
 MainWindow::MainWindow() :
+Line 513 
 MainWindow::MainWindow() :
          sigc::mem_fun(*this, &MainWindow::sample_name_changed)
      );
+     // create scripts treeview (including its data model)
+     m_refScriptsTreeModel = ScriptsTreeStore::create(m_ScriptsModel);
+     m_TreeViewScripts.set_model(m_refScriptsTreeModel);
+     m_TreeViewScripts.set_tooltip_text(_(
+         "Use CTRL + double click for editing a script."
+         "\n\n"
+         "Note: instrument scripts are a LinuxSampler extension of the gig "
+         "format. This feature will not work with the GigaStudio software!"
+     ));
+     // m_TreeViewScripts.set_reorderable();
+     m_TreeViewScripts.append_column_editable("Samples", m_ScriptsModel.m_col_name);
+     m_TreeViewScripts.set_headers_visible(false);
+     m_TreeViewScripts.signal_button_press_event().connect_notify(
+         sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release)
+     );
+     //FIXME: why the heck does this double click signal_row_activated() only fire while CTRL key is pressed ?
+     m_TreeViewScripts.signal_row_activated().connect(
+         sigc::mem_fun(*this, &MainWindow::script_double_clicked)
+     );
+     m_refScriptsTreeModel->signal_row_changed().connect(
+         sigc::mem_fun(*this, &MainWindow::script_name_changed)
+     );
+     // establish drag&drop between scripts tree view and ScriptSlots window
+     std::vector<Gtk::TargetEntry> drag_target_gig_script;
+     drag_target_gig_script.push_back(Gtk::TargetEntry("gig::Script"));
+     m_TreeViewScripts.drag_source_set(drag_target_gig_script);
+     m_TreeViewScripts.signal_drag_begin().connect(
+         sigc::mem_fun(*this, &MainWindow::on_scripts_treeview_drag_begin)
+     );
+     m_TreeViewScripts.signal_drag_data_get().connect(
+         sigc::mem_fun(*this, &MainWindow::on_scripts_treeview_drag_data_get)
+     );
      // establish drag&drop between samples tree view and dimension region 'Sample' text entry
      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
-Line 322 
 MainWindow::MainWindow() :
+Line 567 
 MainWindow::MainWindow() :
          sigc::mem_fun(*this, &MainWindow::file_changed));
      m_DimRegionChooser.signal_region_changed().connect(
          sigc::mem_fun(*this, &MainWindow::file_changed));
-     instrumentProps.signal_instrument_changed().connect(
+     instrumentProps.signal_changed().connect(
          sigc::mem_fun(*this, &MainWindow::file_changed));
-     propDialog.signal_info_changed().connect(
+     propDialog.signal_changed().connect(
+         sigc::mem_fun(*this, &MainWindow::file_changed));
+     midiRules.signal_changed().connect(
          sigc::mem_fun(*this, &MainWindow::file_changed));
      dimreg_edit.signal_dimreg_to_be_changed().connect(
-Line 333 
 MainWindow::MainWindow() :
+Line 580 
 MainWindow::MainWindow() :
          dimreg_changed_signal.make_slot());
      dimreg_edit.signal_sample_ref_changed().connect(
          sample_ref_changed_signal.make_slot());
+     sample_ref_changed_signal.connect(
+         sigc::mem_fun(*this, &MainWindow::on_sample_ref_changed)
+     );
+     samples_to_be_removed_signal.connect(
+         sigc::mem_fun(*this, &MainWindow::on_samples_to_be_removed)
+     );
+     dimreg_edit.signal_select_sample().connect(
+         sigc::mem_fun(*this, &MainWindow::select_sample)
+     );
      m_RegionChooser.signal_instrument_struct_to_be_changed().connect(
          sigc::hide(
-Line 374 
 MainWindow::MainWindow() :
+Line 631 
 MainWindow::MainWindow() :
      // start with a new gig file by default
      on_action_file_new();
+     // select 'Instruments' tab by default
+     // (gtk allows this only if the tab childs are visible, thats why it's here)
+     m_TreeViewNotebook.set_current_page(1);
  }
  MainWindow::~MainWindow()
-Line 399 
 void MainWindow::region_changed()
+Line 660 
 void MainWindow::region_changed()
  gig::Instrument* MainWindow::get_instrument()
  {
      gig::Instrument* instrument = 0;
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     Gtk::TreeModel::const_iterator it =
+         m_TreeView.get_selection()->get_selected();
-     Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();
      if (it) {
          Gtk::TreeModel::Row row = *it;
          instrument = row[m_Columns.m_col_instr];
-Line 455 
 void MainWindow::dimreg_all_dimregs_togg
+Line 715 
 void MainWindow::dimreg_all_dimregs_togg
  void MainWindow::dimreg_changed()
  {
      update_dimregs();
-     dimreg_edit.set_dim_region(m_DimRegionChooser.get_dimregion());
+     dimreg_edit.set_dim_region(m_DimRegionChooser.get_main_dimregion());
  }
  void MainWindow::on_sel_change()
  {
+     // select item in instrument menu
+     Gtk::TreeModel::iterator it = m_TreeView.get_selection()->get_selected();
+     if (it) {
+         Gtk::TreePath path(it);
+         int index = path[0];
+         const std::vector<Gtk::Widget*> children =
+             instrument_menu->get_children();
+         static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
+     }
      m_RegionChooser.set_instrument(get_instrument());
+     if (Settings::singleton()->syncSamplerInstrumentSelection) {
+         switch_sampler_instrument_signal.emit(get_instrument());
+     }
  }
  void loader_progress_callback(gig::progress_t* progress)
-Line 481 
 void Loader::progress_callback(float fra
+Line 755 
 void Loader::progress_callback(float fra
  void Loader::thread_function()
  {
      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
-     printf("Start %s\n", filename);
+     printf("Start %s\n", filename.c_str());
-     RIFF::File* riff = new RIFF::File(filename);
+     try {
-     gig = new gig::File(riff);
+         RIFF::File* riff = new RIFF::File(filename);
-     gig::progress_t progress;
+         gig = new gig::File(riff);
-     progress.callback = loader_progress_callback;
+         gig::progress_t progress;
-     progress.custom = this;
+         progress.callback = loader_progress_callback;
+         progress.custom = this;
-     gig->GetInstrument(0, &progress);
-     printf("End\n");
+         gig->GetInstrument(0, &progress);
-     finished_dispatcher();
+         printf("End\n");
+         finished_dispatcher();
+     } catch (RIFF::Exception e) {
+         error_message = e.Message;
+         error_dispatcher.emit();
+     } catch (...) {
+         error_message = _("Unknown exception occurred");
+         error_dispatcher.emit();
+     }
  }
  Loader::Loader(const char* filename)
-     : filename(filename), thread(0)
+     : filename(filename), thread(0), progress(0.f)
  {
  }
-Line 528 
 Glib::Dispatcher& Loader::signal_finishe
+Line 810 
 Glib::Dispatcher& Loader::signal_finishe
      return finished_dispatcher;
  }
- LoadDialog::LoadDialog(const Glib::ustring& title, Gtk::Window& parent)
+ Glib::Dispatcher& Loader::signal_error()
+ {
+     return error_dispatcher;
+ }
+ void saver_progress_callback(gig::progress_t* progress)
+ {
+     Saver* saver = static_cast<Saver*>(progress->custom);
+     saver->progress_callback(progress->factor);
+ }
+ void Saver::progress_callback(float fraction)
+ {
+     {
+         Glib::Threads::Mutex::Lock lock(progressMutex);
+         progress = fraction;
+     }
+     progress_dispatcher.emit();
+ }
+ void Saver::thread_function()
+ {
+     printf("thread_function self=%x\n", Glib::Threads::Thread::self());
+     printf("Start %s\n", filename.c_str());
+     try {
+         gig::progress_t progress;
+         progress.callback = saver_progress_callback;
+         progress.custom = this;
+         // if no filename was provided, that means "save", if filename was provided means "save as"
+         if (filename.empty()) {
+             gig->Save(&progress);
+         } else {
+             gig->Save(filename, &progress);
+         }
+         printf("End\n");
+         finished_dispatcher.emit();
+     } catch (RIFF::Exception e) {
+         error_message = e.Message;
+         error_dispatcher.emit();
+     } catch (...) {
+         error_message = _("Unknown exception occurred");
+         error_dispatcher.emit();
+     }
+ }
+ Saver::Saver(gig::File* file, Glib::ustring filename)
+     : gig(file), filename(filename), thread(0), progress(0.f)
+ {
+ }
+ void Saver::launch()
+ {
+ #ifdef OLD_THREADS
+     thread = Glib::Thread::create(sigc::mem_fun(*this, &Saver::thread_function), true);
+ #else
+     thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));
+ #endif
+     printf("launch thread=%x\n", thread);
+ }
+ float Saver::get_progress()
+ {
+     float res;
+     {
+         Glib::Threads::Mutex::Lock lock(progressMutex);
+         res = progress;
+     }
+     return res;
+ }
+ Glib::Dispatcher& Saver::signal_progress()
+ {
+     return progress_dispatcher;
+ }
+ Glib::Dispatcher& Saver::signal_finished()
+ {
+     return finished_dispatcher;
+ }
+ Glib::Dispatcher& Saver::signal_error()
+ {
+     return error_dispatcher;
+ }
+ ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent)
      : Gtk::Dialog(title, parent, true)
  {
      get_vbox()->pack_start(progressBar);
      show_all_children();
+     resize(600,50);
  }
  // Clear all GUI elements / controls. This method is typically called
  // before a new .gig file is to be created or to be loaded.
  void MainWindow::__clear() {
-     // remove all entries from "Instrument" menu
-     Gtk::MenuItem* instrument_menu =
-         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
-     instrument_menu->hide();
-     Gtk::Menu* menu = instrument_menu->get_submenu();
-     while (menu->get_children().size()) {
-         Gtk::Widget* child = *menu->get_children().begin();
-         menu->remove(*child);
-         delete child;
-     }
      // forget all samples that ought to be imported
      m_SampleImportQueue.clear();
      // clear the samples and instruments tree views
      m_refTreeModel->clear();
      m_refSamplesTreeModel->clear();
+     m_refScriptsTreeModel->clear();
+     // remove all entries from "Instrument" menu
+     while (!instrument_menu->get_children().empty()) {
+         remove_instrument_from_menu(0);
+     }
      // free libgig's gig::File instance
      if (file && !file_is_shared) delete file;
      file = NULL;
      set_file_is_shared(false);
  }
+ void MainWindow::__refreshEntireGUI() {
+     // clear the samples and instruments tree views
+     m_refTreeModel->clear();
+     m_refSamplesTreeModel->clear();
+     m_refScriptsTreeModel->clear();
+     // remove all entries from "Instrument" menu
+     while (!instrument_menu->get_children().empty()) {
+         remove_instrument_from_menu(0);
+     }
+     if (!this->file) return;
+     load_gig(
+         this->file, this->file->pInfo->Name.c_str(), this->file_is_shared
+     );
+ }
  void MainWindow::on_action_file_new()
  {
      if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
-Line 571 
 void MainWindow::on_action_file_new()
+Line 953 
 void MainWindow::on_action_file_new()
      gig::File* pFile = new gig::File;
      // already add one new instrument by default
      gig::Instrument* pInstrument = pFile->AddInstrument();
-     pInstrument->pInfo->Name = _("Unnamed Instrument");
+     pInstrument->pInfo->Name = gig_from_utf8(_("Unnamed Instrument"));
      // update GUI with that new gig::File
      load_gig(pFile, 0 /*no file name yet*/);
  }
-Line 589 
 bool MainWindow::close_confirmation_dial
+Line 971 
 bool MainWindow::close_confirmation_dial
      dialog.set_default_response(Gtk::RESPONSE_YES);
      int response = dialog.run();
      dialog.hide();
-     if (response == Gtk::RESPONSE_YES) return file_save();
-     return response != Gtk::RESPONSE_CANCEL;
+     // user decided to exit app without saving
+     if (response == Gtk::RESPONSE_NO) return true;
+     // user cancelled dialog, thus don't close app
+     if (response == Gtk::RESPONSE_CANCEL) return false;
+     // TODO: the following return valid is disabled and hard coded instead for
+     // now, due to the fact that saving with progress bar is now implemented
+     // asynchronously, as a result the app does not close automatically anymore
+     // after saving the file has completed
+     //
+     //   if (response == Gtk::RESPONSE_YES) return file_save();
+     //   return response != Gtk::RESPONSE_CANCEL;
+     //
+     if (response == Gtk::RESPONSE_YES) file_save();
+     return false; // always prevent closing the app for now (see comment above)
  }
  bool MainWindow::leaving_shared_mode_dialog() {
-Line 641 
 void MainWindow::on_action_file_open()
+Line 1038 
 void MainWindow::on_action_file_open()
  void MainWindow::load_file(const char* name)
  {
      __clear();
-     load_dialog = new LoadDialog(_("Loading..."), *this);
-     load_dialog->show_all();
+     progress_dialog = new ProgressDialog( //FIXME: memory leak!
-     loader = new Loader(strdup(name));
+         _("Loading") +  Glib::ustring(" '") +
+         Glib::filename_display_basename(name) + "' ...",
+         *this
+     );
+     progress_dialog->show_all();
+     loader = new Loader(name); //FIXME: memory leak!
      loader->signal_progress().connect(
          sigc::mem_fun(*this, &MainWindow::on_loader_progress));
      loader->signal_finished().connect(
          sigc::mem_fun(*this, &MainWindow::on_loader_finished));
+     loader->signal_error().connect(
+         sigc::mem_fun(*this, &MainWindow::on_loader_error));
      loader->launch();
  }
-Line 663 
 void MainWindow::load_instrument(gig::In
+Line 1067 
 void MainWindow::load_instrument(gig::In
      // load the instrument
      gig::File* pFile = (gig::File*) instr->GetParent();
      load_gig(pFile, 0 /*file name*/, true /*shared instrument*/);
-     //TODO: automatically select the given instrument
+     // automatically select the given instrument
+     int i = 0;
+     for (gig::Instrument* instrument = pFile->GetFirstInstrument(); instrument;
+          instrument = pFile->GetNextInstrument(), ++i)
+     {
+         if (instrument == instr) {
+             // select item in "instruments" tree view
+             m_TreeView.get_selection()->select(Gtk::TreePath(ToString(i)));
+             // make sure the selected item in the "instruments" tree view is
+             // visible (scroll to it)
+             m_TreeView.scroll_to_row(Gtk::TreePath(ToString(i)));
+             // select item in instrument menu
+             {
+                 const std::vector<Gtk::Widget*> children =
+                     instrument_menu->get_children();
+                 static_cast<Gtk::RadioMenuItem*>(children[i])->set_active();
+             }
+             // update region chooser and dimension region chooser
+             m_RegionChooser.set_instrument(instr);
+             break;
+         }
+     }
  }
  void MainWindow::on_loader_progress()
  {
-     load_dialog->set_fraction(loader->get_progress());
+     progress_dialog->set_fraction(loader->get_progress());
  }
  void MainWindow::on_loader_finished()
  {
      printf("Loader finished!\n");
      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
-     load_gig(loader->gig, loader->filename);
+     load_gig(loader->gig, loader->filename.c_str());
-     load_dialog->hide();
+     progress_dialog->hide();
+ }
+ void MainWindow::on_loader_error()
+ {
+     Glib::ustring txt = _("Could not load file: ") + loader->error_message;
+     Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
+     msg.run();
+     progress_dialog->hide();
  }
  void MainWindow::on_action_file_save()
-Line 715 
 bool MainWindow::file_save()
+Line 1148 
 bool MainWindow::file_save()
      std::cout << "Saving file\n" << std::flush;
      file_structure_to_be_changed_signal.emit(this->file);
-     try {
-         file->Save();
+     progress_dialog = new ProgressDialog( //FIXME: memory leak!
-         if (file_is_changed) {
+         _("Saving") +  Glib::ustring(" '") +
-             set_title(get_title().substr(1));
+         Glib::filename_display_basename(this->filename) + "' ...",
-             file_is_changed = false;
+         *this
-         }
+     );
-     } catch (RIFF::Exception e) {
+     progress_dialog->show_all();
-         file_structure_changed_signal.emit(this->file);
+     saver = new Saver(this->file); //FIXME: memory leak!
-         Glib::ustring txt = _("Could not save file: ") + e.Message;
+     saver->signal_progress().connect(
-         Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
+         sigc::mem_fun(*this, &MainWindow::on_saver_progress));
-         msg.run();
+     saver->signal_finished().connect(
-         return false;
+         sigc::mem_fun(*this, &MainWindow::on_saver_finished));
-     }
+     saver->signal_error().connect(
-     std::cout << "Saving file done\n" << std::flush;
+         sigc::mem_fun(*this, &MainWindow::on_saver_error));
+     saver->launch();
+     return true;
+ }
+ void MainWindow::on_saver_progress()
+ {
+     progress_dialog->set_fraction(saver->get_progress());
+ }
+ void MainWindow::on_saver_error()
+ {
+     file_structure_changed_signal.emit(this->file);
+     Glib::ustring txt = _("Could not save file: ") + saver->error_message;
+     Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
+     msg.run();
+ }
+ void MainWindow::on_saver_finished()
+ {
+     this->file = saver->gig;
+     this->filename = saver->filename;
+     current_gig_dir = Glib::path_get_dirname(filename);
+     set_title(Glib::filename_display_basename(filename));
+     file_has_name = true;
+     file_is_changed = false;
+     std::cout << "Saving file done. Importing queued samples now ...\n" << std::flush;
      __import_queued_samples();
+     std::cout << "Importing queued samples done.\n" << std::flush;
      file_structure_changed_signal.emit(this->file);
-     return true;
+     __refreshEntireGUI();
+     progress_dialog->hide();
  }
  void MainWindow::on_action_file_save_as()
-Line 796 
 bool MainWindow::file_save_as()
+Line 1260 
 bool MainWindow::file_save_as()
      descriptionArea.show_all();
      if (dialog.run() == Gtk::RESPONSE_OK) {
-         file_structure_to_be_changed_signal.emit(this->file);
+         std::string filename = dialog.get_filename();
-         try {
+         if (!Glib::str_has_suffix(filename, ".gig")) {
-             std::string filename = dialog.get_filename();
+             filename += ".gig";
-             if (!Glib::str_has_suffix(filename, ".gig")) {
-                 filename += ".gig";
-             }
-             printf("filename=%s\n", filename.c_str());
-             file->Save(filename);
-             this->filename = filename;
-             current_gig_dir = Glib::path_get_dirname(filename);
-             set_title(Glib::filename_display_basename(filename));
-             file_has_name = true;
-             file_is_changed = false;
-         } catch (RIFF::Exception e) {
-             file_structure_changed_signal.emit(this->file);
-             Glib::ustring txt = _("Could not save file: ") + e.Message;
-             Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
-             msg.run();
-             return false;
          }
-         __import_queued_samples();
+         printf("filename=%s\n", filename.c_str());
-         file_structure_changed_signal.emit(this->file);
+         progress_dialog = new ProgressDialog( //FIXME: memory leak!
+             _("Saving") +  Glib::ustring(" '") +
+             Glib::filename_display_basename(filename) + "' ...",
+             *this
+         );
+         progress_dialog->show_all();
+         saver = new Saver(file, filename); //FIXME: memory leak!
+         saver->signal_progress().connect(
+             sigc::mem_fun(*this, &MainWindow::on_saver_progress));
+         saver->signal_finished().connect(
+             sigc::mem_fun(*this, &MainWindow::on_saver_finished));
+         saver->signal_error().connect(
+             sigc::mem_fun(*this, &MainWindow::on_saver_error));
+         saver->launch();
          return true;
      }
      return false;
-Line 904 
 void MainWindow::__import_queued_samples
+Line 1368 
 void MainWindow::__import_queued_samples
              m_SampleImportQueue.erase(cur);
          } catch (std::string what) {
              // remember the files that made trouble (and their cause)
-             if (error_files.size()) error_files += "\n";
+             if (!error_files.empty()) error_files += "\n";
              error_files += (*iter).sample_path += " (" + what + ")";
              ++iter;
          }
      }
      // show error message box when some sample(s) could not be imported
-     if (error_files.size()) {
+     if (!error_files.empty()) {
          Glib::ustring txt = _("Could not import the following sample(s):\n") + error_files;
          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
          msg.run();
-Line 923 
 void MainWindow::on_action_file_properti
+Line 1387 
 void MainWindow::on_action_file_properti
      propDialog.deiconify();
  }
+ void MainWindow::on_action_warn_user_on_extensions() {
+     Settings::singleton()->warnUserOnExtensions =
+         !Settings::singleton()->warnUserOnExtensions;
+ }
+ void MainWindow::on_action_sync_sampler_instrument_selection() {
+     Settings::singleton()->syncSamplerInstrumentSelection =
+         !Settings::singleton()->syncSamplerInstrumentSelection;
+ }
  void MainWindow::on_action_help_about()
  {
      Gtk::AboutDialog dialog;
-Line 932 
 void MainWindow::on_action_help_about()
+Line 1406 
 void MainWindow::on_action_help_about()
      dialog.set_name("Gigedit");
  #endif
      dialog.set_version(VERSION);
-     dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson");
+     dialog.set_copyright("Copyright (C) 2006-2015 Andreas Persson");
-     dialog.set_comments(_(
+     const std::string sComment =
-         "Released under the GNU General Public License.\n"
+         _("Built " __DATE__ "\nUsing ") +
-         "\n"
+         ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
-         "Please notice that this is still a very young instrument editor. "
+         _(
-         "So better backup your Gigasampler files before editing them with "
+             "Gigedit is released under the GNU General Public License.\n"
-         "this application.\n"
+             "\n"
-         "\n"
+             "This program is distributed WITHOUT ANY WARRANTY; So better "
-         "Please report bugs to: http://bugs.linuxsampler.org")
+             "backup your Gigasampler/GigaStudio files before editing them with "
-     );
+             "this application.\n"
+             "\n"
+             "Please report bugs to: http://bugs.linuxsampler.org"
+         );
+     dialog.set_comments(sComment.c_str());
      dialog.set_website("http://www.linuxsampler.org");
      dialog.set_website_label("http://www.linuxsampler.org");
      dialog.run();
  }
  PropDialog::PropDialog()
-     : eName(_("Name")),
+     : eFileFormat(_("File Format")),
+       eName(_("Name")),
        eCreationDate(_("Creation date")),
        eComments(_("Comments")),
        eProduct(_("Product")),
-Line 966 
 PropDialog::PropDialog()
+Line 1445 
 PropDialog::PropDialog()
        eSubject(_("Subject")),
        quitButton(Gtk::Stock::CLOSE),
        table(2, 1),
-       update_model(0)
+       m_file(NULL)
  {
      set_title(_("File Properties"));
      eName.set_width_chars(50);
-Line 988 
 PropDialog::PropDialog()
+Line 1467 
 PropDialog::PropDialog()
      connect(eCommissioned, &DLS::Info::Commissioned);
      connect(eSubject, &DLS::Info::Subject);
+     table.add(eFileFormat);
      table.add(eName);
      table.add(eCreationDate);
      table.add(eComments);
-Line 1018 
 PropDialog::PropDialog()
+Line 1498 
 PropDialog::PropDialog()
      quitButton.grab_focus();
      quitButton.signal_clicked().connect(
          sigc::mem_fun(*this, &PropDialog::hide));
+     eFileFormat.signal_value_changed().connect(
+         sigc::mem_fun(*this, &PropDialog::onFileFormatChanged));
      quitButton.show();
      vbox.show();
      show_all_children();
  }
- void PropDialog::set_info(DLS::Info* info)
+ void PropDialog::set_file(gig::File* file)
  {
-     this->info = info;
+     m_file = file;
-     update_model++;
-     eName.set_value(info->Name);
+     // update file format version combo box
-     eCreationDate.set_value(info->CreationDate);
+     const std::string sGiga = "Gigasampler/GigaStudio v";
-     eComments.set_value(info->Comments);
+     const int major = file->pVersion->major;
-     eProduct.set_value(info->Product);
+     std::vector<std::string> txts;
-     eCopyright.set_value(info->Copyright);
+     std::vector<int> values;
-     eArtists.set_value(info->Artists);
+     txts.push_back(sGiga + "2"); values.push_back(2);
-     eGenre.set_value(info->Genre);
+     txts.push_back(sGiga + "3/v4"); values.push_back(3);
-     eKeywords.set_value(info->Keywords);
+     if (major != 2 && major != 3) {
-     eEngineer.set_value(info->Engineer);
+         txts.push_back(sGiga + ToString(major)); values.push_back(major);
-     eTechnician.set_value(info->Technician);
+     }
-     eSoftware.set_value(info->Software);
+     std::vector<const char*> texts;
-     eMedium.set_value(info->Medium);
+     for (int i = 0; i < txts.size(); ++i) texts.push_back(txts[i].c_str());
-     eSource.set_value(info->Source);
+     texts.push_back(NULL); values.push_back(0);
-     eSourceForm.set_value(info->SourceForm);
+     eFileFormat.set_choices(&texts[0], &values[0]);
-     eCommissioned.set_value(info->Commissioned);
+     eFileFormat.set_value(major);
-     eSubject.set_value(info->Subject);
+ }
-     update_model--;
+ void PropDialog::onFileFormatChanged() {
+     const int major = eFileFormat.get_value();
+     if (m_file) m_file->pVersion->major = major;
  }
- sigc::signal<void>& PropDialog::signal_info_changed()
+ void PropDialog::set_info(DLS::Info* info)
  {
-     return info_changed;
+     update(info);
  }
- void InstrumentProps::set_IsDrum(bool value)
+ void InstrumentProps::set_Name(const gig::String& name)
  {
-     instrument->IsDrum = value;
+     m->pInfo->Name = name;
  }
- void InstrumentProps::set_MIDIBank(uint16_t value)
+ void InstrumentProps::update_name()
  {
-     instrument->MIDIBank = value;
+     update_model++;
+     eName.set_value(m->pInfo->Name);
+     update_model--;
  }
- void InstrumentProps::set_MIDIProgram(uint32_t value)
+ void InstrumentProps::set_IsDrum(bool value)
  {
-     instrument->MIDIProgram = value;
+     m->IsDrum = value;
  }
- void InstrumentProps::set_DimensionKeyRange_low(uint8_t value)
+ void InstrumentProps::set_MIDIBank(uint16_t value)
  {
-     instrument->DimensionKeyRange.low = value;
+     m->MIDIBank = value;
-     if (value > instrument->DimensionKeyRange.high) {
-         eDimensionKeyRangeHigh.set_value(value);
-     }
  }
- void InstrumentProps::set_DimensionKeyRange_high(uint8_t value)
+ void InstrumentProps::set_MIDIProgram(uint32_t value)
  {
-     instrument->DimensionKeyRange.high = value;
+     m->MIDIProgram = value;
-     if (value < instrument->DimensionKeyRange.low) {
-         eDimensionKeyRangeLow.set_value(value);
-     }
  }
- InstrumentProps::InstrumentProps()
+ InstrumentProps::InstrumentProps() :
-     : update_model(0),
+     quitButton(Gtk::Stock::CLOSE),
-       quitButton(Gtk::Stock::CLOSE),
+     table(2,1),
-       table(2,1),
+     eName(_("Name")),
-       eName(_("Name")),
+     eIsDrum(_("Is drum")),
-       eIsDrum(_("Is drum")),
+     eMIDIBank(_("MIDI bank"), 0, 16383),
-       eMIDIBank(_("MIDI bank"), 0, 16383),
+     eMIDIProgram(_("MIDI program")),
-       eMIDIProgram(_("MIDI program")),
+     eAttenuation(_("Attenuation"), 0, 96, 0, 1),
-       eAttenuation(_("Attenuation"), 0, 96, 0, 1),
+     eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
-       eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
+     eEffectSend(_("Effect send"), 0, 65535),
-       eEffectSend(_("Effect send"), 0, 65535),
+     eFineTune(_("Fine tune"), -8400, 8400),
-       eFineTune(_("Fine tune"), -8400, 8400),
+     ePitchbendRange(_("Pitchbend range"), 0, 12),
-       ePitchbendRange(_("Pitchbend range"), 0, 12),
+     ePianoReleaseMode(_("Piano release mode")),
-       ePianoReleaseMode(_("Piano release mode")),
+     eDimensionKeyRangeLow(_("Keyswitching range low")),
-       eDimensionKeyRangeLow(_("Keyswitching range low")),
+     eDimensionKeyRangeHigh(_("Keyswitching range high"))
-       eDimensionKeyRangeHigh(_("Keyswitching range high"))
  {
      set_title(_("Instrument Properties"));
-Line 1111 
 InstrumentProps::InstrumentProps()
+Line 1592 
 InstrumentProps::InstrumentProps()
            "\"keyswitching\" dimension")
      );
+     connect(eName, &InstrumentProps::set_Name);
      connect(eIsDrum, &InstrumentProps::set_IsDrum);
      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
-Line 1120 
 InstrumentProps::InstrumentProps()
+Line 1602 
 InstrumentProps::InstrumentProps()
      connect(eFineTune, &gig::Instrument::FineTune);
      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
      connect(ePianoReleaseMode, &gig::Instrument::PianoReleaseMode);
-     connect(eDimensionKeyRangeLow,
+     connect(eDimensionKeyRangeLow, eDimensionKeyRangeHigh,
-             &InstrumentProps::set_DimensionKeyRange_low);
+             &gig::Instrument::DimensionKeyRange);
-     connect(eDimensionKeyRangeHigh,
-             &InstrumentProps::set_DimensionKeyRange_high);
+     eName.signal_value_changed().connect(sig_name_changed.make_slot());
      table.set_col_spacings(5);
-Line 1162 
 InstrumentProps::InstrumentProps()
+Line 1644 
 InstrumentProps::InstrumentProps()
  void InstrumentProps::set_instrument(gig::Instrument* instrument)
  {
-     this->instrument = instrument;
+     update(instrument);
      update_model++;
      eName.set_value(instrument->pInfo->Name);
      eIsDrum.set_value(instrument->IsDrum);
      eMIDIBank.set_value(instrument->MIDIBank);
      eMIDIProgram.set_value(instrument->MIDIProgram);
-     eAttenuation.set_value(instrument->Attenuation);
-     eGainPlus6.set_value(instrument->Attenuation);
-     eEffectSend.set_value(instrument->EffectSend);
-     eFineTune.set_value(instrument->FineTune);
-     ePitchbendRange.set_value(instrument->PitchbendRange);
-     ePianoReleaseMode.set_value(instrument->PianoReleaseMode);
-     eDimensionKeyRangeLow.set_value(instrument->DimensionKeyRange.low);
-     eDimensionKeyRangeHigh.set_value(instrument->DimensionKeyRange.high);
      update_model--;
  }
- sigc::signal<void>& InstrumentProps::signal_instrument_changed()
- {
-     return instrument_changed;
- }
  void MainWindow::file_changed()
  {
-Line 1193 
 void MainWindow::file_changed()
+Line 1663 
 void MainWindow::file_changed()
      }
  }
+ void MainWindow::updateSampleRefCountMap(gig::File* gig) {
+     sample_ref_count.clear();
+     if (!gig) return;
+     for (gig::Instrument* instrument = gig->GetFirstInstrument(); instrument;
+          instrument = gig->GetNextInstrument())
+     {
+         for (gig::Region* rgn = instrument->GetFirstRegion(); rgn;
+              rgn = instrument->GetNextRegion())
+         {
+             for (int i = 0; i < 256; ++i) {
+                 if (!rgn->pDimensionRegions[i]) continue;
+                 if (rgn->pDimensionRegions[i]->pSample) {
+                     sample_ref_count[rgn->pDimensionRegions[i]->pSample]++;
+                 }
+             }
+         }
+     }
+ }
  void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)
  {
      file = 0;
-Line 1203 
 void MainWindow::load_gig(gig::File* gig
+Line 1694 
 void MainWindow::load_gig(gig::File* gig
      file_has_name = filename;
      file_is_changed = false;
+     propDialog.set_file(gig);
      propDialog.set_info(gig->pInfo);
-     Gtk::MenuItem* instrument_menu =
+     instrument_name_connection.block();
-         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
-     int instrument_index = 0;
-     Gtk::RadioMenuItem::Group instrument_group;
      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
           instrument = gig->GetNextInstrument()) {
+         Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
          Gtk::TreeModel::Row row = *iter;
-         row[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();
+         row[m_Columns.m_col_name] = name;
          row[m_Columns.m_col_instr] = instrument;
-         // create a menu item for this instrument
-         Gtk::RadioMenuItem* item =
+         add_instrument_to_menu(name);
-             new Gtk::RadioMenuItem(instrument_group, instrument->pInfo->Name.c_str());
-         instrument_menu->get_submenu()->append(*item);
-         item->signal_activate().connect(
-             sigc::bind(
-                 sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),
-                 instrument_index
-             )
-         );
-         instrument_index++;
      }
-     instrument_menu->show();
+     instrument_name_connection.unblock();
-     instrument_menu->get_submenu()->show_all_children();
+     uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments")->show();
+     updateSampleRefCountMap(gig);
      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
          if (group->Name != "") {
              Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
              Gtk::TreeModel::Row rowGroup = *iterGroup;
-             rowGroup[m_SamplesModel.m_col_name]   = group->Name.c_str();
+             rowGroup[m_SamplesModel.m_col_name]   = gig_to_utf8(group->Name);
              rowGroup[m_SamplesModel.m_col_group]  = group;
              rowGroup[m_SamplesModel.m_col_sample] = NULL;
              for (gig::Sample* sample = group->GetFirstSample();
-Line 1243 
 void MainWindow::load_gig(gig::File* gig
+Line 1726 
 void MainWindow::load_gig(gig::File* gig
                  Gtk::TreeModel::iterator iterSample =
                      m_refSamplesTreeModel->append(rowGroup.children());
                  Gtk::TreeModel::Row rowSample = *iterSample;
-                 rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();
+                 rowSample[m_SamplesModel.m_col_name] =
+                     gig_to_utf8(sample->pInfo->Name);
                  rowSample[m_SamplesModel.m_col_sample] = sample;
                  rowSample[m_SamplesModel.m_col_group]  = NULL;
+                 int refcount = sample_ref_count.count(sample) ? sample_ref_count[sample] : 0;
+                 rowSample[m_SamplesModel.m_col_refcount] = ToString(refcount) + " " + _("Refs.");
+                 rowSample[m_SamplesModel.m_color] = refcount ? "black" : "red";
              }
          }
      }
+     for (int i = 0; gig->GetScriptGroup(i); ++i) {
+         gig::ScriptGroup* group = gig->GetScriptGroup(i);
+         Gtk::TreeModel::iterator iterGroup = m_refScriptsTreeModel->append();
+         Gtk::TreeModel::Row rowGroup = *iterGroup;
+         rowGroup[m_ScriptsModel.m_col_name]   = gig_to_utf8(group->Name);
+         rowGroup[m_ScriptsModel.m_col_group]  = group;
+         rowGroup[m_ScriptsModel.m_col_script] = NULL;
+         for (int s = 0; group->GetScript(s); ++s) {
+             gig::Script* script = group->GetScript(s);
+             Gtk::TreeModel::iterator iterScript =
+                 m_refScriptsTreeModel->append(rowGroup.children());
+             Gtk::TreeModel::Row rowScript = *iterScript;
+             rowScript[m_ScriptsModel.m_col_name] = gig_to_utf8(script->Name);
+             rowScript[m_ScriptsModel.m_col_script] = script;
+             rowScript[m_ScriptsModel.m_col_group]  = NULL;
+         }
+     }
+     // unfold all sample groups & script groups by default
+     m_TreeViewSamples.expand_all();
+     m_TreeViewScripts.expand_all();
      file = gig;
      // select the first instrument
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     m_TreeView.get_selection()->select(Gtk::TreePath("0"));
-     tree_sel_ref->select(Gtk::TreePath("0"));
+     instr_props_set_instrument();
+     gig::Instrument* instrument = get_instrument();
+     if (instrument) {
+         midiRules.set_instrument(instrument);
+     }
  }
- void MainWindow::show_instr_props()
+ bool MainWindow::instr_props_set_instrument()
  {
-     gig::Instrument* instrument = get_instrument();
+     instrumentProps.signal_name_changed().clear();
-     if (instrument)
-     {
+     Gtk::TreeModel::const_iterator it =
+         m_TreeView.get_selection()->get_selected();
+     if (it) {
+         Gtk::TreeModel::Row row = *it;
+         gig::Instrument* instrument = row[m_Columns.m_col_instr];
          instrumentProps.set_instrument(instrument);
+         // make sure instrument tree is updated when user changes the
+         // instrument name in instrument properties window
+         instrumentProps.signal_name_changed().connect(
+             sigc::bind(
+                 sigc::mem_fun(*this,
+                               &MainWindow::instr_name_changed_by_instr_props),
+                 it));
+     } else {
+         instrumentProps.hide();
+     }
+     return it;
+ }
+ void MainWindow::show_instr_props()
+ {
+     if (instr_props_set_instrument()) {
          instrumentProps.show();
          instrumentProps.deiconify();
      }
  }
+ void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
+ {
+     Gtk::TreeModel::Row row = *it;
+     Glib::ustring name = row[m_Columns.m_col_name];
+     gig::Instrument* instrument = row[m_Columns.m_col_instr];
+     Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
+     if (gigname != name) {
+         row[m_Columns.m_col_name] = gigname;
+     }
+ }
+ void MainWindow::show_midi_rules()
+ {
+     if (gig::Instrument* instrument = get_instrument())
+     {
+         midiRules.set_instrument(instrument);
+         midiRules.show();
+         midiRules.deiconify();
+     }
+ }
+ void MainWindow::show_script_slots() {
+     if (!file) return;
+     // get selected instrument
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
+     Gtk::TreeModel::iterator it = sel->get_selected();
+     if (!it) return;
+     Gtk::TreeModel::Row row = *it;
+     gig::Instrument* instrument = row[m_Columns.m_col_instr];
+     if (!instrument) return;
+     ScriptSlots* window = new ScriptSlots;
+     window->setInstrument(instrument);
+     //window->reparent(*this);
+     window->show();
+ }
  void MainWindow::on_action_view_status_bar() {
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
-Line 1279 
 void MainWindow::on_action_view_status_b
+Line 1854 
 void MainWindow::on_action_view_status_b
      else                    m_StatusBar.hide();
  }
+ bool MainWindow::is_copy_samples_unity_note_enabled() const {
+     Gtk::CheckMenuItem* item =
+         dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
+     if (!item) {
+         std::cerr << "/MenuBar/MenuEdit/CopySampleUnity == NULL\n";
+         return true;
+     }
+     return item->get_active();
+ }
+ bool MainWindow::is_copy_samples_fine_tune_enabled() const {
+     Gtk::CheckMenuItem* item =
+         dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune"));
+     if (!item) {
+         std::cerr << "/MenuBar/MenuEdit/CopySampleTune == NULL\n";
+         return true;
+     }
+     return item->get_active();
+ }
+ bool MainWindow::is_copy_samples_loop_enabled() const {
+     Gtk::CheckMenuItem* item =
+         dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
+     if (!item) {
+         std::cerr << "/MenuBar/MenuEdit/CopySampleLoop == NULL\n";
+         return true;
+     }
+     return item->get_active();
+ }
  void MainWindow::on_button_release(GdkEventButton* button)
  {
      if (button->type == GDK_2BUTTON_PRESS) {
          show_instr_props();
      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
+         // gig v2 files have no midi rules
+         const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);
+         static_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuInstrument/MidiRules"))->set_sensitive(
+                 bEnabled
+             );
+         static_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/PopupMenu/MidiRules"))->set_sensitive(
+                 bEnabled
+             );
          popup_menu->popup(button->button, button->time);
      }
  }
- void MainWindow::on_instrument_selection_change(int index) {
+ void MainWindow::on_instrument_selection_change(Gtk::RadioMenuItem* item) {
-     m_RegionChooser.set_instrument(file->GetInstrument(index));
+     if (item->get_active()) {
+         const std::vector<Gtk::Widget*> children =
+             instrument_menu->get_children();
+         std::vector<Gtk::Widget*>::const_iterator it =
+             find(children.begin(), children.end(), item);
+         if (it != children.end()) {
+             int index = it - children.begin();
+             m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));
+             m_RegionChooser.set_instrument(file->GetInstrument(index));
+         }
+     }
+ }
+ void MainWindow::select_instrument(gig::Instrument* instrument) {
+     if (!instrument) return;
+     Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
+     for (int i = 0; i < model->children().size(); ++i) {
+         Gtk::TreeModel::Row row = model->children()[i];
+         if (row[m_Columns.m_col_instr] == instrument) {
+             // select and show the respective instrument in the list view
+             show_intruments_tab();
+             m_TreeView.get_selection()->select(model->children()[i]);
+             Gtk::TreePath path(
+                 m_TreeView.get_selection()->get_selected()
+             );
+             m_TreeView.scroll_to_row(path);
+             on_sel_change(); // the regular instrument selection change callback
+         }
+     }
+ }
+ /// Returns true if requested dimension region was successfully selected and scrolled to in the list view, false on error.
+ bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) {
+     gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
+     gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
+     Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
+     for (int i = 0; i < model->children().size(); ++i) {
+         Gtk::TreeModel::Row row = model->children()[i];
+         if (row[m_Columns.m_col_instr] == pInstrument) {
+             // select and show the respective instrument in the list view
+             show_intruments_tab();
+             m_TreeView.get_selection()->select(model->children()[i]);
+             Gtk::TreePath path(
+                 m_TreeView.get_selection()->get_selected()
+             );
+             m_TreeView.scroll_to_row(path);
+             on_sel_change(); // the regular instrument selection change callback
+             // select respective region in the region selector
+             m_RegionChooser.set_region(pRegion);
+             // select and show the respective dimension region in the editor
+             //update_dimregs();
+             if (!m_DimRegionChooser.select_dimregion(dimRgn)) return false;
+             //dimreg_edit.set_dim_region(dimRgn);
+             return true;
+         }
+     }
+     return false;
+ }
+ void MainWindow::select_sample(gig::Sample* sample) {
+     Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewSamples.get_model();
+     for (int g = 0; g < model->children().size(); ++g) {
+         Gtk::TreeModel::Row rowGroup = model->children()[g];
+         for (int s = 0; s < rowGroup.children().size(); ++s) {
+             Gtk::TreeModel::Row rowSample = rowGroup.children()[s];
+             if (rowSample[m_SamplesModel.m_col_sample] == sample) {
+                 show_samples_tab();
+                 m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]);
+                 Gtk::TreePath path(
+                     m_TreeViewSamples.get_selection()->get_selected()
+                 );
+                 m_TreeViewSamples.scroll_to_row(path);
+                 return;
+             }
+         }
+     }
  }
  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
-Line 1306 
 void MainWindow::on_sample_treeview_butt
+Line 2003 
 void MainWindow::on_sample_treeview_butt
              group_selected  = row[m_SamplesModel.m_col_group];
              sample_selected = row[m_SamplesModel.m_col_sample];
          }
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))->
              set_sensitive(group_selected || sample_selected);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddSample"))->
              set_sensitive(group_selected || sample_selected);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddGroup"))->
              set_sensitive(file);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/ShowSampleRefs"))->
+             set_sensitive(sample_selected);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))->
              set_sensitive(group_selected || sample_selected);
          // show sample popup
          sample_popup->popup(button->button, button->time);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))->
+             set_sensitive(group_selected || sample_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))->
+             set_sensitive(group_selected || sample_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddGroup"))->
+             set_sensitive(file);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/ShowSampleRefs"))->
+             set_sensitive(sample_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))->
+             set_sensitive(group_selected || sample_selected);
      }
  }
- void MainWindow::on_action_add_instrument() {
+ void MainWindow::on_script_treeview_button_release(GdkEventButton* button) {
-     static int __instrument_indexer = 0;
+     if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
-     if (!file) return;
+         Gtk::Menu* script_popup =
-     gig::Instrument* instrument = file->AddInstrument();
+             dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/ScriptPopupMenu"));
-     __instrument_indexer++;
+         // update enabled/disabled state of sample popup items
-     instrument->pInfo->Name =
+         Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewScripts.get_selection();
-         _("Unnamed Instrument ") + ToString(__instrument_indexer);
+         Gtk::TreeModel::iterator it = sel->get_selected();
+         bool group_selected  = false;
+         bool script_selected = false;
+         if (it) {
+             Gtk::TreeModel::Row row = *it;
+             group_selected  = row[m_ScriptsModel.m_col_group];
+             script_selected = row[m_ScriptsModel.m_col_script];
+         }
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/AddScript"))->
+             set_sensitive(group_selected || script_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/AddScriptGroup"))->
+             set_sensitive(file);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/EditScript"))->
+             set_sensitive(script_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/RemoveScript"))->
+             set_sensitive(group_selected || script_selected);
+         // show sample popup
+         script_popup->popup(button->button, button->time);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuScript/AddScript"))->
+             set_sensitive(group_selected || script_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuScript/AddScriptGroup"))->
+             set_sensitive(file);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuScript/EditScript"))->
+             set_sensitive(script_selected);
+         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuScript/RemoveScript"))->
+             set_sensitive(group_selected || script_selected);
+     }
+ }
+ Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
+     const Glib::ustring& name, int position) {
+     Gtk::RadioMenuItem::Group instrument_group;
+     const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
+     if (!children.empty()) {
+         instrument_group =
+             static_cast<Gtk::RadioMenuItem*>(children[0])->get_group();
+     }
+     Gtk::RadioMenuItem* item =
+         new Gtk::RadioMenuItem(instrument_group, name);
+     if (position < 0) {
+         instrument_menu->append(*item);
+     } else {
+         instrument_menu->insert(*item, position);
+     }
+     item->show();
+     item->signal_activate().connect(
+         sigc::bind(
+             sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),
+             item));
+     return item;
+ }
+ void MainWindow::remove_instrument_from_menu(int index) {
+     const std::vector<Gtk::Widget*> children =
+         instrument_menu->get_children();
+     Gtk::Widget* child = children[index];
+     instrument_menu->remove(*child);
+     delete child;
+ }
+ void MainWindow::add_instrument(gig::Instrument* instrument) {
+     const Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
      // update instrument tree view
+     instrument_name_connection.block();
      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
      Gtk::TreeModel::Row rowInstr = *iterInstr;
-     rowInstr[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();
+     rowInstr[m_Columns.m_col_name] = name;
      rowInstr[m_Columns.m_col_instr] = instrument;
+     instrument_name_connection.unblock();
+     add_instrument_to_menu(name);
+     m_TreeView.get_selection()->select(iterInstr);
      file_changed();
  }
+ void MainWindow::on_action_add_instrument() {
+     static int __instrument_indexer = 0;
+     if (!file) return;
+     gig::Instrument* instrument = file->AddInstrument();
+     __instrument_indexer++;
+     instrument->pInfo->Name = gig_from_utf8(_("Unnamed Instrument ") +
+                                             ToString(__instrument_indexer));
+     add_instrument(instrument);
+ }
  void MainWindow::on_action_duplicate_instrument() {
      if (!file) return;
      // retrieve the currently selected instrument
      // (being the original instrument to be duplicated)
      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
-Line 1345 
 void MainWindow::on_action_duplicate_ins
+Line 2139 
 void MainWindow::on_action_duplicate_ins
      Gtk::TreeModel::Row row = *itSelection;
      gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
      if (!instrOrig) return;
      // duplicate the orginal instrument
      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
      instrNew->pInfo->Name =
-         instrOrig->pInfo->Name + " (" + _("Copy") + ")";
+         instrOrig->pInfo->Name +
+         gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");
-     // update instrument tree view
-     Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
+     add_instrument(instrNew);
-     Gtk::TreeModel::Row rowInstr = *iterInstr;
-     rowInstr[m_Columns.m_col_name] = instrNew->pInfo->Name.c_str();
-     rowInstr[m_Columns.m_col_instr] = instrNew;
-     file_changed();
  }
  void MainWindow::on_action_remove_instrument() {
-Line 1378 
 void MainWindow::on_action_remove_instru
+Line 2168 
 void MainWindow::on_action_remove_instru
          Gtk::TreeModel::Row row = *it;
          gig::Instrument* instr = row[m_Columns.m_col_instr];
          try {
+             Gtk::TreePath path(it);
+             int index = path[0];
              // remove instrument from the gig file
              if (instr) file->DeleteInstrument(instr);
-             // remove respective row from instruments tree view
-             m_refTreeModel->erase(it);
              file_changed();
+             remove_instrument_from_menu(index);
+             // remove row from instruments tree view
+             m_refTreeModel->erase(it);
+ #if GTKMM_MAJOR_VERSION < 3
+             // select another instrument (in gtk3 this is done
+             // automatically)
+             if (!m_refTreeModel->children().empty()) {
+                 if (index == m_refTreeModel->children().size()) {
+                     index--;
+                 }
+                 m_TreeView.get_selection()->select(
+                     Gtk::TreePath(ToString(index)));
+             }
+ #endif
+             instr_props_set_instrument();
+             instr = get_instrument();
+             if (instr) {
+                 midiRules.set_instrument(instr);
+             } else {
+                 midiRules.hide();
+             }
          } catch (RIFF::Exception e) {
              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
              msg.run();
-Line 1398 
 void MainWindow::on_action_sample_proper
+Line 2213 
 void MainWindow::on_action_sample_proper
      msg.run();
  }
+ void MainWindow::on_action_add_script_group() {
+     static int __script_indexer = 0;
+     if (!file) return;
+     gig::ScriptGroup* group = file->AddScriptGroup();
+     group->Name = gig_from_utf8(_("Unnamed Group"));
+     if (__script_indexer) group->Name += " " + ToString(__script_indexer);
+     __script_indexer++;
+     // update sample tree view
+     Gtk::TreeModel::iterator iterGroup = m_refScriptsTreeModel->append();
+     Gtk::TreeModel::Row rowGroup = *iterGroup;
+     rowGroup[m_ScriptsModel.m_col_name] = gig_to_utf8(group->Name);
+     rowGroup[m_ScriptsModel.m_col_script] = NULL;
+     rowGroup[m_ScriptsModel.m_col_group] = group;
+     file_changed();
+ }
+ void MainWindow::on_action_add_script() {
+     if (!file) return;
+     // get selected group
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewScripts.get_selection();
+     Gtk::TreeModel::iterator it = sel->get_selected();
+     if (!it) return;
+     Gtk::TreeModel::Row row = *it;
+     gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group];
+     if (!group) { // not a group, but a script is selected (probably)
+         gig::Script* script = row[m_ScriptsModel.m_col_script];
+         if (!script) return;
+         it = row.parent(); // resolve parent (that is the script's group)
+         if (!it) return;
+         row = *it;
+         group = row[m_ScriptsModel.m_col_group];
+         if (!group) return;
+     }
+     // add a new script to the .gig file
+     gig::Script* script = group->AddScript();
+     Glib::ustring name = _("Unnamed Script");
+     script->Name = gig_from_utf8(name);
+     // add script to the tree view
+     Gtk::TreeModel::iterator iterScript =
+         m_refScriptsTreeModel->append(row.children());
+     Gtk::TreeModel::Row rowScript = *iterScript;
+     rowScript[m_ScriptsModel.m_col_name] = name;
+     rowScript[m_ScriptsModel.m_col_script] = script;
+     rowScript[m_ScriptsModel.m_col_group]  = NULL;
+     // unfold group of new script item in treeview
+     Gtk::TreeModel::Path path(iterScript);
+     m_TreeViewScripts.expand_to_path(path);
+ }
+ void MainWindow::on_action_edit_script() {
+     if (!file) return;
+     // get selected script
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewScripts.get_selection();
+     Gtk::TreeModel::iterator it = sel->get_selected();
+     if (!it) return;
+     Gtk::TreeModel::Row row = *it;
+     gig::Script* script = row[m_ScriptsModel.m_col_script];
+     if (!script) return;
+     ScriptEditor* editor = new ScriptEditor;
+     editor->setScript(script);
+     //editor->reparent(*this);
+     editor->show();
+ }
+ void MainWindow::on_action_remove_script() {
+     if (!file) return;
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewScripts.get_selection();
+     Gtk::TreeModel::iterator it = sel->get_selected();
+     if (it) {
+         Gtk::TreeModel::Row row = *it;
+         gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group];
+         gig::Script* script     = row[m_ScriptsModel.m_col_script];
+         Glib::ustring name      = row[m_ScriptsModel.m_col_name];
+         try {
+             // remove script group or script from the gig file
+             if (group) {
+                 // notify everybody that we're going to remove these samples
+ //TODO:         scripts_to_be_removed_signal.emit(members);
+                 // delete the group in the .gig file including the
+                 // samples that belong to the group
+                 file->DeleteScriptGroup(group);
+                 // notify that we're done with removal
+ //TODO:         scripts_removed_signal.emit();
+                 file_changed();
+             } else if (script) {
+                 // notify everybody that we're going to remove this sample
+ //TODO:         std::list<gig::Script*> lscripts;
+ //TODO:         lscripts.push_back(script);
+ //TODO:         scripts_to_be_removed_signal.emit(lscripts);
+                 // remove sample from the .gig file
+                 script->GetGroup()->DeleteScript(script);
+                 // notify that we're done with removal
+ //TODO:         scripts_removed_signal.emit();
+                 dimreg_changed();
+                 file_changed();
+             }
+             // remove respective row(s) from samples tree view
+             m_refScriptsTreeModel->erase(it);
+         } catch (RIFF::Exception e) {
+             // pretend we're done with removal (i.e. to avoid dead locks)
+ //TODO:     scripts_removed_signal.emit();
+             // show error message
+             Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
+             msg.run();
+         }
+     }
+ }
  void MainWindow::on_action_add_group() {
      static int __sample_indexer = 0;
      if (!file) return;
      gig::Group* group = file->AddGroup();
-     group->Name = _("Unnamed Group");
+     group->Name = gig_from_utf8(_("Unnamed Group"));
      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
      __sample_indexer++;
      // update sample tree view
      Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
      Gtk::TreeModel::Row rowGroup = *iterGroup;
-     rowGroup[m_SamplesModel.m_col_name] = group->Name.c_str();
+     rowGroup[m_SamplesModel.m_col_name] = gig_to_utf8(group->Name);
      rowGroup[m_SamplesModel.m_col_sample] = NULL;
      rowGroup[m_SamplesModel.m_col_group] = group;
      file_changed();
  }
+ void MainWindow::on_action_replace_sample() {
+     add_or_replace_sample(true);
+ }
  void MainWindow::on_action_add_sample() {
+     add_or_replace_sample(false);
+ }
+ void MainWindow::add_or_replace_sample(bool replace) {
      if (!file) return;
-     // get selected group
+     // get selected group (and probably selected sample)
      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
      Gtk::TreeModel::iterator it = sel->get_selected();
      if (!it) return;
      Gtk::TreeModel::Row row = *it;
+     gig::Sample* sample = NULL;
      gig::Group* group = row[m_SamplesModel.m_col_group];
      if (!group) { // not a group, but a sample is selected (probably)
-         gig::Sample* sample = row[m_SamplesModel.m_col_sample];
+         if (replace) sample = row[m_SamplesModel.m_col_sample];
-         if (!sample) return;
+         if (!row[m_SamplesModel.m_col_sample]) return;
          it = row.parent(); // resolve parent (that is the sample's group)
          if (!it) return;
-         row = *it;
+         if (!replace) row = *it;
-         group = row[m_SamplesModel.m_col_group];
+         group = (*it)[m_SamplesModel.m_col_group];
          if (!group) return;
      }
+     if (replace && !sample) return;
      // show 'browse for file' dialog
-     Gtk::FileChooserDialog dialog(*this, _("Add Sample(s)"));
+     Gtk::FileChooserDialog dialog(*this, replace ? _("Replace Sample with") : _("Add Sample(s)"));
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
-     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
      // matches all file types supported by libsndfile
  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
-Line 1506 
 void MainWindow::on_action_add_sample()
+Line 2445 
 void MainWindow::on_action_add_sample()
                          sf_close(hFile); // close sound file
                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
                  }
-                 // add a new sample to the .gig file
+                 // add a new sample to the .gig file (if adding is requested actually)
-                 gig::Sample* sample = file->AddSample();
+                 if (!replace) sample = file->AddSample();
                  // file name without path
                  Glib::ustring filename = Glib::filename_display_basename(*iter);
                  // remove file extension if there is one
-Line 1517 
 void MainWindow::on_action_add_sample()
+Line 2456 
 void MainWindow::on_action_add_sample()
                          break;
                      }
                  }
-                 sample->pInfo->Name = filename;
+                 sample->pInfo->Name = gig_from_utf8(filename);
                  sample->Channels = info.channels;
                  sample->BitDepth = bitdepth;
                  sample->FrameSize = bitdepth / 8/*1 byte are 8 bits*/ * info.channels;
-Line 1531 
 void MainWindow::on_action_add_sample()
+Line 2470 
 void MainWindow::on_action_add_sample()
                                 &instrument, sizeof(instrument)) != SF_FALSE)
                  {
                      sample->MIDIUnityNote = instrument.basenote;
+                     sample->FineTune      = instrument.detune;
                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {
                          sample->Loops = 1;
-Line 1557 
 void MainWindow::on_action_add_sample()
+Line 2497 
 void MainWindow::on_action_add_sample()
                  // physically when File::Save() is called)
                  sample->Resize(info.frames);
                  // make sure sample is part of the selected group
-                 group->AddSample(sample);
+                 if (!replace) group->AddSample(sample);
                  // schedule that physical resize and sample import
                  // (data copying), performed when "Save" is requested
                  SampleImportItem sched_item;
-Line 1565 
 void MainWindow::on_action_add_sample()
+Line 2505 
 void MainWindow::on_action_add_sample()
                  sched_item.sample_path = *iter;
                  m_SampleImportQueue.push_back(sched_item);
                  // add sample to the tree view
-                 Gtk::TreeModel::iterator iterSample =
+                 if (replace) {
-                     m_refSamplesTreeModel->append(row.children());
+                     row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);
-                 Gtk::TreeModel::Row rowSample = *iterSample;
+                 } else {
-                 rowSample[m_SamplesModel.m_col_name]   = filename;
+                     Gtk::TreeModel::iterator iterSample =
-                 rowSample[m_SamplesModel.m_col_sample] = sample;
+                         m_refSamplesTreeModel->append(row.children());
-                 rowSample[m_SamplesModel.m_col_group]  = NULL;
+                     Gtk::TreeModel::Row rowSample = *iterSample;
+                     rowSample[m_SamplesModel.m_col_name] =
+                         gig_to_utf8(sample->pInfo->Name);
+                     rowSample[m_SamplesModel.m_col_sample] = sample;
+                     rowSample[m_SamplesModel.m_col_group]  = NULL;
+                 }
                  // close sound file
                  sf_close(hFile);
                  file_changed();
              } catch (std::string what) { // remember the files that made trouble (and their cause)
-                 if (error_files.size()) error_files += "\n";
+                 if (!error_files.empty()) error_files += "\n";
                  error_files += *iter += " (" + what + ")";
              }
          }
          // show error message box when some file(s) could not be opened / added
-         if (error_files.size()) {
+         if (!error_files.empty()) {
-             Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;
+             Glib::ustring txt =
+                 (replace
+                     ? _("Failed to replace sample with:\n")
+                     : _("Could not add the following sample(s):\n"))
+                 + error_files;
              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
              msg.run();
          }
-Line 1593 
 void MainWindow::on_action_replace_all_s
+Line 2542 
 void MainWindow::on_action_replace_all_s
      if (!file) return;
      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
      const char* str =
          _("This is a very specific function. It tries to replace all samples "
            "in the current gig file by samples located in the chosen "
            "directory.\n\n"
-Line 1639 
 void MainWindow::on_action_replace_all_s
+Line 2588 
 void MainWindow::on_action_replace_all_s
               sample; sample = file->GetNextSample())
          {
              std::string filename =
-                 folder + G_DIR_SEPARATOR_S + sample->pInfo->Name +
+                 folder + G_DIR_SEPARATOR_S +
-                 postfixEntryBox.get_text().raw();
+                 Glib::filename_from_utf8(gig_to_utf8(sample->pInfo->Name) +
+                                          postfixEntryBox.get_text());
              SF_INFO info;
              info.format = 0;
              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
-Line 1673 
 void MainWindow::on_action_replace_all_s
+Line 2623 
 void MainWindow::on_action_replace_all_s
              }
              catch (std::string what)
              {
-                 if (error_files.size()) error_files += "\n";
+                 if (!error_files.empty()) error_files += "\n";
-                     error_files += filename += " (" + what + ")";
+                 error_files += Glib::filename_to_utf8(filename) +
+                     " (" + what + ")";
              }
          }
          // show error message box when some file(s) could not be opened / added
-         if (error_files.size()) {
+         if (!error_files.empty()) {
              Glib::ustring txt =
                  _("Could not replace the following sample(s):\n") + error_files;
              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
-Line 1699 
 void MainWindow::on_action_remove_sample
+Line 2650 
 void MainWindow::on_action_remove_sample
          try {
              // remove group or sample from the gig file
              if (group) {
-                 // temporarily remember the samples that bolong to
+                 // temporarily remember the samples that belong to
                  // that group (we need that to clean the queue)
                  std::list<gig::Sample*> members;
                  for (gig::Sample* pSample = group->GetFirstSample();
-Line 1763 
 void MainWindow::on_action_remove_sample
+Line 2714 
 void MainWindow::on_action_remove_sample
      }
  }
+ // see comment on on_sample_treeview_drag_begin()
+ void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+ {
+     first_call_to_drag_data_get = true;
+ }
+ void MainWindow::on_scripts_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
+                                                    Gtk::SelectionData& selection_data, guint, guint)
+ {
+     if (!first_call_to_drag_data_get) return;
+     first_call_to_drag_data_get = false;
+     // get selected script
+     gig::Script* script = NULL;
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewScripts.get_selection();
+     Gtk::TreeModel::iterator it = sel->get_selected();
+     if (it) {
+         Gtk::TreeModel::Row row = *it;
+         script = row[m_ScriptsModel.m_col_script];
+     }
+     // pass the gig::Script as pointer
+     selection_data.set(selection_data.get_target(), 0/*unused*/,
+                        (const guchar*)&script,
+                        sizeof(script)/*length of data in bytes*/);
+ }
+ // see comment on on_sample_treeview_drag_begin()
+ void MainWindow::on_instruments_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+ {
+     first_call_to_drag_data_get = true;
+ }
+ void MainWindow::on_instruments_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
+                                                        Gtk::SelectionData& selection_data, guint, guint)
+ {
+     if (!first_call_to_drag_data_get) return;
+     first_call_to_drag_data_get = false;
+     // get selected source instrument
+     gig::Instrument* src = NULL;
+     {
+         Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
+         Gtk::TreeModel::iterator it = sel->get_selected();
+         if (it) {
+             Gtk::TreeModel::Row row = *it;
+             src = row[m_Columns.m_col_instr];
+         }
+     }
+     if (!src) return;
+     // pass the source gig::Instrument as pointer
+     selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&src,
+                        sizeof(src)/*length of data in bytes*/);
+ }
+ void MainWindow::on_instruments_treeview_drop_drag_data_received(
+     const Glib::RefPtr<Gdk::DragContext>& context, int x, int y,
+     const Gtk::SelectionData& selection_data, guint, guint time)
+ {
+     gig::Instrument* src = *((gig::Instrument**) selection_data.get_data());
+     if (!src || selection_data.get_length() != sizeof(gig::Instrument*))
+         return;
+     gig::Instrument* dst = NULL;
+     {
+         Gtk::TreeModel::Path path;
+         const bool found = m_TreeView.get_path_at_pos(x, y, path);
+         if (!found) return;
+         Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path);
+         if (!iter) return;
+         Gtk::TreeModel::Row row = *iter;
+         dst = row[m_Columns.m_col_instr];
+     }
+     if (!dst) return;
+     //printf("dragdrop received src=%s dst=%s\n", src->pInfo->Name.c_str(), dst->pInfo->Name.c_str());
+     src->MoveTo(dst);
+     __refreshEntireGUI();
+     select_instrument(src);
+ }
  // For some reason drag_data_get gets called two times for each
  // drag'n'drop (at least when target is an Entry). This work-around
  // makes sure the code in drag_data_get and drop_drag_data_received is
-Line 1821 
 void MainWindow::on_sample_label_drop_dr
+Line 2854 
 void MainWindow::on_sample_label_drop_dr
          bool channels_changed = false;
          if (sample->Channels == 1 && stereo_dimension) {
              // remove the samplechannel dimension
+ /* commented out, because it makes it impossible building up an instrument from scratch using two separate L/R samples
              region->DeleteDimension(stereo_dimension);
              channels_changed = true;
              region_changed();
+ */
          }
-         dimreg_edit.set_sample(sample);
+         dimreg_edit.set_sample(
+             sample,
+             is_copy_samples_unity_note_enabled(),
+             is_copy_samples_fine_tune_enabled(),
+             is_copy_samples_loop_enabled()
+         );
          if (sample->Channels == 2 && !stereo_dimension) {
              // add samplechannel dimension
-Line 1868 
 void MainWindow::sample_name_changed(con
+Line 2908 
 void MainWindow::sample_name_changed(con
      Glib::ustring name  = row[m_SamplesModel.m_col_name];
      gig::Group* group   = row[m_SamplesModel.m_col_group];
      gig::Sample* sample = row[m_SamplesModel.m_col_sample];
+     gig::String gigname(gig_from_utf8(name));
      if (group) {
-         if (group->Name != name) {
+         if (group->Name != gigname) {
-             group->Name = name;
+             group->Name = gigname;
              printf("group name changed\n");
              file_changed();
          }
      } else if (sample) {
-         if (sample->pInfo->Name != name.raw()) {
+         if (sample->pInfo->Name != gigname) {
-             sample->pInfo->Name = name.raw();
+             sample->pInfo->Name = gigname;
              printf("sample name changed\n");
              file_changed();
          }
      }
  }
+ void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path,
+                                      const Gtk::TreeModel::iterator& iter) {
+     if (!iter) return;
+     Gtk::TreeModel::Row row = *iter;
+     Glib::ustring name      = row[m_ScriptsModel.m_col_name];
+     gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group];
+     gig::Script* script     = row[m_ScriptsModel.m_col_script];
+     gig::String gigname(gig_from_utf8(name));
+     if (group) {
+         if (group->Name != gigname) {
+             group->Name = gigname;
+             printf("script group name changed\n");
+             file_changed();
+         }
+     } else if (script) {
+         if (script->Name != gigname) {
+             script->Name = gigname;
+             printf("script name changed\n");
+             file_changed();
+         }
+     }
+ }
+ void MainWindow::script_double_clicked(const Gtk::TreeModel::Path& path,
+                                        Gtk::TreeViewColumn* column)
+ {
+     Gtk::TreeModel::iterator iter = m_refScriptsTreeModel->get_iter(path);
+     if (!iter) return;
+     Gtk::TreeModel::Row row = *iter;
+     gig::Script* script = row[m_ScriptsModel.m_col_script];
+     if (!script) return;
+     ScriptEditor* editor = new ScriptEditor;
+     editor->setScript(script);
+     //editor->reparent(*this);
+     editor->show();
+ }
  void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path,
                                           const Gtk::TreeModel::iterator& iter) {
      if (!iter) return;
      Gtk::TreeModel::Row row = *iter;
      Glib::ustring name = row[m_Columns.m_col_name];
+     // change name in instrument menu
+     int index = path[0];
+     const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
+     if (index < children.size()) {
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 16) || GTKMM_MAJOR_VERSION > 2
+         static_cast<Gtk::RadioMenuItem*>(children[index])->set_label(name);
+ #else
+         remove_instrument_from_menu(index);
+         Gtk::RadioMenuItem* item = add_instrument_to_menu(name, index);
+         item->set_active();
+ #endif
+     }
+     // change name in gig
      gig::Instrument* instrument = row[m_Columns.m_col_instr];
-     if (instrument && instrument->pInfo->Name != name.raw()) {
+     gig::String gigname(gig_from_utf8(name));
-         instrument->pInfo->Name = name.raw();
+     if (instrument && instrument->pInfo->Name != gigname) {
+         instrument->pInfo->Name = gigname;
+         // change name in the instrument properties window
+         if (instrumentProps.get_instrument() == instrument) {
+             instrumentProps.update_name();
+         }
          file_changed();
      }
  }
+ void MainWindow::on_action_combine_instruments() {
+     CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file);
+     d->show_all();
+     d->resize(500, 400);
+     d->run();
+     if (d->fileWasChanged()) {
+         // update GUI with new instrument just created
+         add_instrument(d->newCombinedInstrument());
+     }
+     delete d;
+ }
+ void MainWindow::on_action_view_references() {
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
+     Gtk::TreeModel::iterator it = sel->get_selected();
+     if (!it) return;
+     Gtk::TreeModel::Row row = *it;
+     gig::Sample* sample = row[m_SamplesModel.m_col_sample];
+     if (!sample) return;
+     ReferencesView* d = new ReferencesView(*this);
+     d->setSample(sample);
+     d->dimension_region_selected.connect(
+         sigc::mem_fun(*this, &MainWindow::select_dimension_region)
+     );
+     d->show_all();
+     d->resize(500, 400);
+     d->run();
+     delete d;
+ }
+ void MainWindow::mergeFiles(const std::vector<std::string>& filenames) {
+     struct _Source {
+         std::vector<RIFF::File*> riffs;
+         std::vector<gig::File*> gigs;
+         ~_Source() {
+             for (int k = 0; k < gigs.size(); ++k) delete gigs[k];
+             for (int k = 0; k < riffs.size(); ++k) delete riffs[k];
+             riffs.clear();
+             gigs.clear();
+         }
+     } sources;
+     if (filenames.empty())
+         throw RIFF::Exception(_("No files selected, so nothing done."));
+     // first open all input files (to avoid output file corruption)
+     int i;
+     try {
+         for (i = 0; i < filenames.size(); ++i) {
+             const std::string& filename = filenames[i];
+             printf("opening file=%s\n", filename.c_str());
+             RIFF::File* riff = new RIFF::File(filename);
+             sources.riffs.push_back(riff);
+             gig::File* gig = new gig::File(riff);
+             sources.gigs.push_back(gig);
+         }
+     } catch (RIFF::Exception e) {
+         throw RIFF::Exception(
+             _("Error occurred while opening '") +
+             filenames[i] +
+             "': " +
+             e.Message
+         );
+     } catch (...) {
+         throw RIFF::Exception(
+             _("Unknown exception occurred while opening '") +
+             filenames[i] + "'"
+         );
+     }
+     // now merge the opened .gig files to the main .gig file currently being
+     // open in gigedit
+     try {
+         for (i = 0; i < filenames.size(); ++i) {
+             const std::string& filename = filenames[i];
+             printf("merging file=%s\n", filename.c_str());
+             assert(i < sources.gigs.size());
+             this->file->AddContentOf(sources.gigs[i]);
+         }
+     } catch (RIFF::Exception e) {
+         throw RIFF::Exception(
+             _("Error occurred while merging '") +
+             filenames[i] +
+             "': " +
+             e.Message
+         );
+     } catch (...) {
+         throw RIFF::Exception(
+             _("Unknown exception occurred while merging '") +
+             filenames[i] + "'"
+         );
+     }
+     // Finally save gig file persistently to disk ...
+     //NOTE: requires that this gig file already has a filename !
+     {
+         std::cout << "Saving file\n" << std::flush;
+         file_structure_to_be_changed_signal.emit(this->file);
+         progress_dialog = new ProgressDialog( //FIXME: memory leak!
+             _("Saving") +  Glib::ustring(" '") +
+             Glib::filename_display_basename(this->filename) + "' ...",
+             *this
+         );
+         progress_dialog->show_all();
+         saver = new Saver(this->file); //FIXME: memory leak!
+         saver->signal_progress().connect(
+             sigc::mem_fun(*this, &MainWindow::on_saver_progress));
+         saver->signal_finished().connect(
+             sigc::mem_fun(*this, &MainWindow::on_saver_finished));
+         saver->signal_error().connect(
+             sigc::mem_fun(*this, &MainWindow::on_saver_error));
+         saver->launch();
+     }
+ }
+ void MainWindow::on_action_merge_files() {
+     if (this->file->GetFileName().empty()) {
+         Glib::ustring txt = _(
+             "You seem to have a new .gig file open that has not been saved "
+             "yet. You must save it somewhere before starting to merge it with "
+             "other .gig files though, because during the merge operation the "
+             "other files' sample data must be written on file level to the "
+             "target .gig file."
+         );
+         Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
+         msg.run();
+         return;
+     }
+     Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));
+     dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+     dialog.add_button(_("Merge"), Gtk::RESPONSE_OK);
+     dialog.set_default_response(Gtk::RESPONSE_CANCEL);
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
+     Gtk::FileFilter filter;
+     filter.add_pattern("*.gig");
+ #else
+     Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
+     filter->add_pattern("*.gig");
+ #endif
+     dialog.set_filter(filter);
+     if (current_gig_dir != "") {
+         dialog.set_current_folder(current_gig_dir);
+     }
+     dialog.set_select_multiple(true);
+     // show warning in the file picker dialog
+     Gtk::HBox descriptionArea;
+     descriptionArea.set_spacing(15);
+     Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
+     descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
+ #if GTKMM_MAJOR_VERSION < 3
+     view::WrapLabel description;
+ #else
+     Gtk::Label description;
+     description.set_line_wrap();
+ #endif
+     description.set_markup(_(
+         "\nSelect at least one .gig file that shall be merged to the .gig file "
+         "currently being open in gigedit.\n\n"
+         "<b>Please Note:</b> Merging with other files will modify your "
+         "currently open .gig file on file level! And be aware that the current "
+         "merge algorithm does not detect duplicate samples yet. So if you are "
+         "merging files which are using equivalent sample data, those "
+         "equivalent samples will currently be treated as separate samples and "
+         "will accordingly be stored separately in the target .gig file!"
+     ));
+     descriptionArea.pack_start(description);
+     dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
+     descriptionArea.show_all();
+     if (dialog.run() == Gtk::RESPONSE_OK) {
+         printf("on_action_merge_files self=%x\n", Glib::Threads::Thread::self());
+         std::vector<std::string> filenames = dialog.get_filenames();
+         // merge the selected files to the currently open .gig file
+         try {
+             mergeFiles(filenames);
+         } catch (RIFF::Exception e) {
+             Gtk::MessageDialog msg(*this, e.Message, false, Gtk::MESSAGE_ERROR);
+             msg.run();
+         }
+         // update GUI
+         __refreshEntireGUI();
+     }
+ }
  void MainWindow::set_file_is_shared(bool b) {
      this->file_is_shared = b;
-Line 1909 
 void MainWindow::set_file_is_shared(bool
+Line 3204 
 void MainWindow::set_file_is_shared(bool
              Gdk::Pixbuf::create_from_xpm_data(status_detached_xpm)
          );
      }
+     {
+         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+             uiManager->get_widget("/MenuBar/MenuSettings/SyncSamplerInstrumentSelection"));
+         if (item) item->set_sensitive(b);
+     }
+ }
+ void MainWindow::on_sample_ref_count_incremented(gig::Sample* sample, int offset) {
+     if (!sample) return;
+     sample_ref_count[sample] += offset;
+     const int refcount = sample_ref_count[sample];
+     Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewSamples.get_model();
+     for (int g = 0; g < model->children().size(); ++g) {
+         Gtk::TreeModel::Row rowGroup = model->children()[g];
+         for (int s = 0; s < rowGroup.children().size(); ++s) {
+             Gtk::TreeModel::Row rowSample = rowGroup.children()[s];
+             if (rowSample[m_SamplesModel.m_col_sample] != sample) continue;
+             rowSample[m_SamplesModel.m_col_refcount] = ToString(refcount) + " " + _("Refs.");
+             rowSample[m_SamplesModel.m_color] = refcount ? "black" : "red";
+         }
+     }
+ }
+ void MainWindow::on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample) {
+     on_sample_ref_count_incremented(oldSample, -1);
+     on_sample_ref_count_incremented(newSample, +1);
+ }
+ void MainWindow::on_samples_to_be_removed(std::list<gig::Sample*> samples) {
+     // just in case a new sample is added later with exactly the same memory
+     // address, which would lead to incorrect refcount if not deleted here
+     for (std::list<gig::Sample*>::const_iterator it = samples.begin();
+          it != samples.end(); ++it)
+     {
+         sample_ref_count.erase(*it);
+     }
+ }
+ void MainWindow::show_samples_tab() {
+     m_TreeViewNotebook.set_current_page(0);
+ }
+ void MainWindow::show_intruments_tab() {
+     m_TreeViewNotebook.set_current_page(1);
+ }
+ void MainWindow::show_scripts_tab() {
+     m_TreeViewNotebook.set_current_page(2);
  }
  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {
-Line 1966 
 sigc::signal<void, int/*key*/, int/*velo
+Line 3311 
 sigc::signal<void, int/*key*/, int/*velo
  sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_keyboard_key_released() {
      return m_RegionChooser.signal_keyboard_key_released();
  }
+ sigc::signal<void, gig::Instrument*>& MainWindow::signal_switch_sampler_instrument() {
+     return switch_sampler_instrument_signal;
+ }

 Legend:



Removed from v.2398
 


changed lines


 
Added in v.2715
 Legend:



Removed from v.2398
 


changed lines


 
Added in v.2715
-Removed from v.2398
+Added in v.2715

	ViewVC Help
Powered by ViewVC