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

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

Parent Directory | Revision Log | View Patch Patch

-revision 3179 by schoenebeck,
Sat May 13 18:56:36 2017 UTC
+revision 3408 by schoenebeck,
Fri Jan 19 19:17:41 2018 UTC
 Line 20
  #include <iostream>
  #include <cstring>
- #include <glibmmconfig.h>
+ #include "compat.h"
  // threads.h must be included first to be able to build with
  // G_DISABLE_DEPRECATED
  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \
 Line 32
  #include <glibmm/dispatcher.h>
  #include <glibmm/miscutils.h>
  #include <glibmm/stringutils.h>
+ #include <glibmm/regex.h>
  #include <gtkmm/aboutdialog.h>
  #include <gtkmm/filechooserdialog.h>
  #include <gtkmm/messagedialog.h>
- #include <gtkmm/stock.h>
+ #if HAS_GTKMM_STOCK
+ # include <gtkmm/stock.h>
+ #endif
  #include <gtkmm/targetentry.h>
  #include <gtkmm/main.h>
- #include <gtkmm/toggleaction.h>
+ #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 89)
+ # include <gtkmm/toggleaction.h>
+ #endif
  #include <gtkmm/accelmap.h>
  #if GTKMM_MAJOR_VERSION < 3
  #include "wrapLabel.hh"
-Line 48
+Line 53
  #include "compat.h"
  #include <stdio.h>
- #include <sndfile.h>
+ #ifdef LIBSNDFILE_HEADER_FILE
+ # include LIBSNDFILE_HEADER_FILE(sndfile.h)
+ #else
+ # include <sndfile.h>
+ #endif
  #include <assert.h>
  #include "mainwindow.h"
-Line 62
+Line 71
  #include "gfx/builtinpix.h"
  #include "MacroEditor.h"
  #include "MacrosSetup.h"
+ #if defined(__APPLE__)
+ # include "MacHelper.h"
+ #endif
+ static const Gdk::ModifierType primaryModifierKey =
+     #if defined(__APPLE__)
+     Gdk::META_MASK; // Cmd key on Mac
+     #else
+     Gdk::CONTROL_MASK; // Ctrl key on all other OSs
+     #endif
  MainWindow::MainWindow() :
      m_DimRegionChooser(*this),
-Line 77 
 MainWindow::MainWindow() :
+Line 96 
 MainWindow::MainWindow() :
  {
      loadBuiltInPix();
+     this->file = NULL;
  //    set_border_width(5);
- //    set_default_size(400, 200);
+     if (!Settings::singleton()->autoRestoreWindowDimension) {
+ #if GTKMM_MAJOR_VERSION >= 3
+         set_default_size(895, 600);
+ #else
+         set_default_size(800, 600);
+ #endif
+         set_position(Gtk::WIN_POS_CENTER);
+     }
      add(m_VBox);
-Line 88 
 MainWindow::MainWindow() :
+Line 117 
 MainWindow::MainWindow() :
      // m_TreeView.set_reorderable();
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+     m_TreeView.signal_button_press_event().connect(
+         sigc::mem_fun(*this, &MainWindow::on_button_release));
+ #else
      m_TreeView.signal_button_press_event().connect_notify(
          sigc::mem_fun(*this, &MainWindow::on_button_release));
+ #endif
      // Add the TreeView tab, inside a ScrolledWindow, with the button underneath:
      m_ScrolledWindow.add(m_TreeView);
-Line 102 
 MainWindow::MainWindow() :
+Line 136 
 MainWindow::MainWindow() :
      m_ScrolledWindowScripts.add(m_TreeViewScripts);
      m_ScrolledWindowScripts.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ #if GTKMM_MAJOR_VERSION < 3
      m_TreeViewNotebook.set_size_request(300);
+ #endif
+     m_searchLabel.set_text(Glib::ustring(" ") + _("Filter:"));
+     m_searchField.pack_start(m_searchLabel, Gtk::PACK_SHRINK);
+     m_searchField.pack_start(m_searchText);
+     m_searchField.set_spacing(5);
+     m_left_vbox.pack_start(m_TreeViewNotebook);
+     m_left_vbox.pack_start(m_searchField, Gtk::PACK_SHRINK);
+     m_HPaned.add1(m_left_vbox);
-     m_HPaned.add1(m_TreeViewNotebook);
      dimreg_hbox.add(dimreg_label);
      dimreg_hbox.add(dimreg_all_regions);
      dimreg_hbox.add(dimreg_all_dimregs);
-Line 117 
 MainWindow::MainWindow() :
+Line 161 
 MainWindow::MainWindow() :
          legend_hbox.add(labelLegend);
          imageNoSample.set(redDot);
+ #if HAS_GTKMM_ALIGNMENT
          imageNoSample.set_alignment(Gtk::ALIGN_END);
          labelNoSample.set_alignment(Gtk::ALIGN_START);
+ #else
+         imageNoSample.set_halign(Gtk::ALIGN_END);
+         labelNoSample.set_halign(Gtk::ALIGN_START);
+ #endif
          legend_hbox.add(imageNoSample);
          legend_hbox.add(labelNoSample);
          imageMissingSample.set(yellowDot);
+ #if HAS_GTKMM_ALIGNMENT
          imageMissingSample.set_alignment(Gtk::ALIGN_END);
          labelMissingSample.set_alignment(Gtk::ALIGN_START);
+ #else
+         imageMissingSample.set_halign(Gtk::ALIGN_END);
+         labelMissingSample.set_halign(Gtk::ALIGN_START);
+ #endif
          legend_hbox.add(imageMissingSample);
          legend_hbox.add(labelMissingSample);
          imageLooped.set(blackLoop);
+ #if HAS_GTKMM_ALIGNMENT
          imageLooped.set_alignment(Gtk::ALIGN_END);
          labelLooped.set_alignment(Gtk::ALIGN_START);
+ #else
+         imageLooped.set_halign(Gtk::ALIGN_END);
+         labelLooped.set_halign(Gtk::ALIGN_START);
+ #endif
          legend_hbox.add(imageLooped);
          legend_hbox.add(labelLooped);
          imageSomeLoops.set(grayLoop);
+ #if HAS_GTKMM_ALIGNMENT
          imageSomeLoops.set_alignment(Gtk::ALIGN_END);
          labelSomeLoops.set_alignment(Gtk::ALIGN_START);
+ #else
+         imageSomeLoops.set_halign(Gtk::ALIGN_END);
+         labelSomeLoops.set_halign(Gtk::ALIGN_START);
+ #endif
          legend_hbox.add(imageSomeLoops);
          legend_hbox.add(labelSomeLoops);
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
          legend_hbox.show_all_children();
+ #endif
      }
      dimreg_vbox.pack_start(legend_hbox, Gtk::PACK_SHRINK);
      m_HPaned.add2(dimreg_vbox);
-Line 154 
 MainWindow::MainWindow() :
+Line 220 
 MainWindow::MainWindow() :
      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
      m_TreeViewNotebook.append_page(m_ScrolledWindowScripts, _("Scripts"));
+ #if USE_GLIB_ACTION
+     m_actionGroup = Gio::SimpleActionGroup::create();
+     m_actionGroup->add_action(
+         "New", sigc::mem_fun(*this, &MainWindow::on_action_file_new)
+     );
+     m_actionGroup->add_action(
+         "Open", sigc::mem_fun(*this, &MainWindow::on_action_file_open)
+     );
+     m_actionGroup->add_action(
+         "Save", sigc::mem_fun(*this, &MainWindow::on_action_file_save)
+     );
+     m_actionGroup->add_action(
+         "SaveAs", sigc::mem_fun(*this, &MainWindow::on_action_file_save_as)
+     );
+     m_actionGroup->add_action(
+         "Properties", sigc::mem_fun(*this, &MainWindow::on_action_file_properties)
+     );
+     m_actionGroup->add_action(
+         "InstrProperties", sigc::mem_fun(*this, &MainWindow::show_instr_props)
+     );
+     m_actionMIDIRules = m_actionGroup->add_action(
+         "MidiRules", sigc::mem_fun(*this, &MainWindow::show_midi_rules)
+     );
+     m_actionGroup->add_action(
+         "ScriptSlots", sigc::mem_fun(*this, &MainWindow::show_script_slots)
+     );
+     m_actionGroup->add_action(
+         "Quit", sigc::mem_fun(*this, &MainWindow::on_action_quit)
+     );
+     m_actionGroup->add_action(
+         "MenuSample", sigc::mem_fun(*this, &MainWindow::show_samples_tab)
+     );
+     m_actionGroup->add_action(
+         "MenuInstrument", sigc::mem_fun(*this, &MainWindow::show_intruments_tab)
+     );
+     m_actionGroup->add_action(
+         "MenuScript", sigc::mem_fun(*this, &MainWindow::show_scripts_tab)
+     );
+ #else
      actionGroup = Gtk::ActionGroup::create();
      actionGroup->add(Gtk::Action::create("MenuFile", _("_File")));
-Line 207 
 MainWindow::MainWindow() :
+Line 312 
 MainWindow::MainWindow() :
          sigc::mem_fun(*this, &MainWindow::show_scripts_tab)
      );
      actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select")));
+     actionGroup->add(Gtk::Action::create("AssignScripts", _("Assign Script")));
      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
+ #endif
      const Gdk::ModifierType primaryModifierKey =
  #if defined(__APPLE__)
-Line 217 
 MainWindow::MainWindow() :
+Line 324 
 MainWindow::MainWindow() :
      Gdk::CONTROL_MASK; // Ctrl key on all other OSs
  #endif
+ #if USE_GLIB_ACTION
+     m_actionCopyDimRgn = m_actionGroup->add_action(
+         "CopyDimRgn", sigc::mem_fun(*this, &MainWindow::copy_selected_dimrgn)
+     );
+     m_actionPasteDimRgn = m_actionGroup->add_action(
+         "PasteDimRgn", sigc::mem_fun(*this, &MainWindow::paste_copied_dimrgn)
+     );
+     m_actionAdjustClipboard = m_actionGroup->add_action(
+         "AdjustClipboard", sigc::mem_fun(*this, &MainWindow::adjust_clipboard_content)
+     );
+     m_actionGroup->add_action(
+         "SelectPrevInstr", sigc::mem_fun(*this, &MainWindow::select_prev_instrument)
+     );
+     m_actionGroup->add_action(
+         "SelectNextInstr", sigc::mem_fun(*this, &MainWindow::select_next_instrument)
+     );
+     m_actionGroup->add_action(
+         "SelectPrevRegion", sigc::mem_fun(*this, &MainWindow::select_prev_region)
+     );
+     m_actionGroup->add_action(
+         "SelectNextRegion", sigc::mem_fun(*this, &MainWindow::select_next_region)
+     );
+     m_actionGroup->add_action(
+         "SelectPrevDimRgnZone", sigc::mem_fun(*this, &MainWindow::select_prev_dim_rgn_zone)
+     );
+     m_actionGroup->add_action(
+         "SelectNextDimRgnZone", sigc::mem_fun(*this, &MainWindow::select_next_dim_rgn_zone)
+     );
+     m_actionGroup->add_action(
+         "SelectPrevDimension", sigc::mem_fun(*this, &MainWindow::select_prev_dimension)
+     );
+     m_actionGroup->add_action(
+         "SelectNextDimension", sigc::mem_fun(*this, &MainWindow::select_next_dimension)
+     );
+     m_actionGroup->add_action(
+         "SelectAddPrevDimRgnZone", sigc::mem_fun(*this, &MainWindow::select_add_prev_dim_rgn_zone)
+     );
+     m_actionGroup->add_action(
+         "SelectAddNextDimRgnZone", sigc::mem_fun(*this, &MainWindow::select_add_next_dim_rgn_zone)
+     );
+ #else
      actionGroup->add(Gtk::Action::create("CopyDimRgn",
                                           _("Copy selected dimension region")),
                       Gtk::AccelKey(GDK_KEY_c, Gdk::MOD1_MASK),
-Line 232 
 MainWindow::MainWindow() :
+Line 380 
 MainWindow::MainWindow() :
                       Gtk::AccelKey(GDK_KEY_x, Gdk::MOD1_MASK),
                       sigc::mem_fun(*this, &MainWindow::adjust_clipboard_content));
+     actionGroup->add(Gtk::Action::create("SelectPrevInstr",
+                                          _("Select Previous Instrument")),
+                      Gtk::AccelKey(GDK_KEY_Up, primaryModifierKey),
+                      sigc::mem_fun(*this, &MainWindow::select_prev_instrument));
+     actionGroup->add(Gtk::Action::create("SelectNextInstr",
+                                          _("Select Next Instrument")),
+                      Gtk::AccelKey(GDK_KEY_Down, primaryModifierKey),
+                      sigc::mem_fun(*this, &MainWindow::select_next_instrument));
      actionGroup->add(Gtk::Action::create("SelectPrevRegion",
                                           _("Select Previous Region")),
                       Gtk::AccelKey(GDK_KEY_Left, primaryModifierKey),
-Line 271 
 MainWindow::MainWindow() :
+Line 429 
 MainWindow::MainWindow() :
                                           _("Add Next Dimension Region Zone to Selection")),
                       Gtk::AccelKey(GDK_KEY_Right, Gdk::MOD1_MASK | Gdk::SHIFT_MASK),
                       sigc::mem_fun(*this, &MainWindow::select_add_next_dim_rgn_zone));
+ #endif
+ #if USE_GLIB_ACTION
+     m_actionToggleCopySampleUnity = m_actionGroup->add_action_bool("CopySampleUnity", true);
+     m_actionToggleCopySampleTune  = m_actionGroup->add_action_bool("CopySampleTune", true);
+     m_actionToggleCopySampleLoop  = m_actionGroup->add_action_bool("CopySampleLoop", true);
+ #else
      Glib::RefPtr<Gtk::ToggleAction> toggle_action =
          Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));
      toggle_action->set_active(true);
-Line 286 
 MainWindow::MainWindow() :
+Line 450 
 MainWindow::MainWindow() :
          Gtk::ToggleAction::create("CopySampleLoop", _("Copy Sample's _Loop Points"));
      toggle_action->set_active(true);
      actionGroup->add(toggle_action);
+ #endif
+ #if USE_GLIB_ACTION
+     m_actionToggleStatusBar =
+         m_actionGroup->add_action_bool("Statusbar", sigc::mem_fun(*this, &MainWindow::on_action_view_status_bar), true);
+     m_actionToggleRestoreWinDim =
+         m_actionGroup->add_action_bool("AutoRestoreWinDim", sigc::mem_fun(*this, &MainWindow::on_auto_restore_win_dim), Settings::singleton()->autoRestoreWindowDimension);
+     m_actionToggleSaveWithTempFile =
+         m_actionGroup->add_action_bool("SaveWithTemporaryFile", sigc::mem_fun(*this, &MainWindow::on_save_with_temporary_file), Settings::singleton()->saveWithTemporaryFile);
+     m_actionGroup->add_action("RefreshAll", sigc::mem_fun(*this, &MainWindow::on_action_refresh_all));
+ #else
      actionGroup->add(Gtk::Action::create("MenuMacro", _("_Macro")));
-Line 317 
 MainWindow::MainWindow() :
+Line 490 
 MainWindow::MainWindow() :
          Gtk::Action::create("RefreshAll", _("_Refresh All")),
          sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
      );
+ #endif
+ #if USE_GLIB_ACTION
+     m_actionGroup->add_action(
+         "About", sigc::mem_fun(*this, &MainWindow::on_action_help_about)
+     );
+     m_actionGroup->add_action(
+         "AddInstrument", sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
+     );
+     m_actionGroup->add_action(
+         "DupInstrument", sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
+     );
+     m_actionGroup->add_action(
+         "CombInstruments", sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
+     );
+     m_actionGroup->add_action(
+         "RemoveInstrument", sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
+     );
+ #else
      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
      actionGroup->add(Gtk::Action::create("MenuHelp",
                                           action->property_label()));
-Line 333 
 MainWindow::MainWindow() :
+Line 524 
 MainWindow::MainWindow() :
          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
      );
      actionGroup->add(
+         Gtk::Action::create("CombInstruments", _("_Combine Instruments ...")),
+         Gtk::AccelKey(GDK_KEY_j, primaryModifierKey),
+         sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
+     );
+     actionGroup->add(
          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),
          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
      );
+ #endif
+ #if USE_GLIB_ACTION
+     m_actionToggleWarnOnExtensions = m_actionGroup->add_action_bool(
+         "WarnUserOnExtensions", sigc::mem_fun(*this, &MainWindow::on_action_warn_user_on_extensions),
+         Settings::singleton()->warnUserOnExtensions
+     );
+     m_actionToggleSyncSamplerSelection = m_actionGroup->add_action_bool(
+         "SyncSamplerInstrumentSelection", sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection),
+         Settings::singleton()->syncSamplerInstrumentSelection
+     );
+     m_actionToggleMoveRootNoteWithRegion = m_actionGroup->add_action_bool(
+         "MoveRootNoteWithRegionMoved", sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved),
+         Settings::singleton()->moveRootNoteWithRegionMoved
+     );
+ #else
      actionGroup->add(Gtk::Action::create("MenuSettings", _("_Settings")));
      toggle_action =
-Line 363 
 MainWindow::MainWindow() :
+Line 573 
 MainWindow::MainWindow() :
          toggle_action,
          sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved)
      );
+ #endif
+ #if USE_GLIB_ACTION
+     m_actionGroup->add_action(
+         "CombineInstruments", sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
+     );
+     m_actionGroup->add_action(
+         "MergeFiles", sigc::mem_fun(*this, &MainWindow::on_action_merge_files)
+     );
+ #else
      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
      actionGroup->add(
-Line 376 
 MainWindow::MainWindow() :
+Line 594 
 MainWindow::MainWindow() :
          Gtk::Action::create("MergeFiles", _("_Merge Files...")),
          sigc::mem_fun(*this, &MainWindow::on_action_merge_files)
      );
+ #endif
      // sample right-click popup actions
+ #if USE_GLIB_ACTION
+     m_actionSampleProperties = m_actionGroup->add_action(
+         "SampleProperties", sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)
+     );
+     m_actionAddSampleGroup = m_actionGroup->add_action(
+         "AddGroup", sigc::mem_fun(*this, &MainWindow::on_action_add_group)
+     );
+     m_actionAddSample = m_actionGroup->add_action(
+         "AddSample", sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
+     );
+     m_actionRemoveSample = m_actionGroup->add_action(
+         "RemoveSample", sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
+     );
+     m_actionGroup->add_action(
+         "RemoveUnusedSamples", sigc::mem_fun(*this, &MainWindow::on_action_remove_unused_samples)
+     );
+     m_actionViewSampleRefs = m_actionGroup->add_action(
+         "ShowSampleRefs", sigc::mem_fun(*this, &MainWindow::on_action_view_references)
+     );
+     m_actionReplaceSample = m_actionGroup->add_action(
+         "ReplaceSample", sigc::mem_fun(*this, &MainWindow::on_action_replace_sample)
+     );
+     m_actionGroup->add_action(
+         "ReplaceAllSamplesInAllGroups", sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
+     );
+ #else
      actionGroup->add(
          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),
          sigc::mem_fun(*this, &MainWindow::on_action_sample_properties)
-Line 413 
 MainWindow::MainWindow() :
+Line 657 
 MainWindow::MainWindow() :
                              _("Replace All Samples in All Groups...")),
          sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
      );
+ #endif
      // script right-click popup actions
+ #if USE_GLIB_ACTION
+     m_actionAddScriptGroup = m_actionGroup->add_action(
+         "AddScriptGroup", sigc::mem_fun(*this, &MainWindow::on_action_add_script_group)
+     );
+     m_actionAddScript = m_actionGroup->add_action(
+         "AddScript", sigc::mem_fun(*this, &MainWindow::on_action_add_script)
+     );
+     m_actionEditScript = m_actionGroup->add_action(
+         "EditScript", sigc::mem_fun(*this, &MainWindow::on_action_edit_script)
+     );
+     m_actionRemoveScript = m_actionGroup->add_action(
+         "RemoveScript", sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
+     );
+ #else
      actionGroup->add(
          Gtk::Action::create("AddScriptGroup", _("Add _Group")),
          sigc::mem_fun(*this, &MainWindow::on_action_add_script_group)
-Line 431 
 MainWindow::MainWindow() :
+Line 690 
 MainWindow::MainWindow() :
          Gtk::Action::create("RemoveScript", Gtk::Stock::REMOVE),
          sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
      );
+ #endif
+ #if USE_GTKMM_BUILDER
+     insert_action_group("AppMenu", m_actionGroup);
+     m_uiManager = Gtk::Builder::create();
+     Glib::ustring ui_info =
+         "<interface>"
+         "  <menubar id='MenuBar'>"
+         "    <menu id='MenuFile'>"
+         "      <attribute name='label' translatable='yes'>_File</attribute>"
+         "      <section>"
+         "        <item id='New'>"
+         "          <attribute name='label' translatable='yes'>New</attribute>"
+         "          <attribute name='action'>AppMenu.New</attribute>"
+         "        </item>"
+         "        <item id='Open'>"
+         "          <attribute name='label' translatable='yes'>Open</attribute>"
+         "          <attribute name='action'>AppMenu.Open</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='Save'>"
+         "          <attribute name='label' translatable='yes'>Save</attribute>"
+         "          <attribute name='action'>AppMenu.Save</attribute>"
+         "        </item>"
+         "        <item id='SaveAs'>"
+         "          <attribute name='label' translatable='yes'>Save As</attribute>"
+         "          <attribute name='action'>AppMenu.SaveAs</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='Properties'>"
+         "          <attribute name='label' translatable='yes'>Properties</attribute>"
+         "          <attribute name='action'>AppMenu.Properties</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='Quit'>"
+         "          <attribute name='label' translatable='yes'>Quit</attribute>"
+         "          <attribute name='action'>AppMenu.Quit</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuEdit'>"
+         "      <attribute name='label' translatable='yes'>Edit</attribute>"
+         "      <section>"
+         "        <item id='CopyDimRgn'>"
+         "          <attribute name='label' translatable='yes'>Copy Dimension Region</attribute>"
+         "          <attribute name='action'>AppMenu.CopyDimRgn</attribute>"
+         "        </item>"
+         "        <item id='AdjustClipboard'>"
+         "          <attribute name='label' translatable='yes'>Adjust Clipboard</attribute>"
+         "          <attribute name='action'>AppMenu.AdjustClipboard</attribute>"
+         "        </item>"
+         "        <item id='PasteDimRgn'>"
+         "          <attribute name='label' translatable='yes'>Paste Dimension Region</attribute>"
+         "          <attribute name='action'>AppMenu.PasteDimRgn</attribute>"
+         "        </item>"
+         "      </section>"
+         "        <item id='SelectPrevInstr'>"
+         "          <attribute name='label' translatable='yes'>Previous Instrument</attribute>"
+         "          <attribute name='action'>AppMenu.SelectPrevInstr</attribute>"
+         "        </item>"
+         "        <item id='SelectNextInstr'>"
+         "          <attribute name='label' translatable='yes'>Next Instrument</attribute>"
+         "          <attribute name='action'>AppMenu.SelectNextInstr</attribute>"
+         "        </item>"
+         "      <section>"
+         "        <item id='SelectPrevRegion'>"
+         "          <attribute name='label' translatable='yes'>Previous Region</attribute>"
+         "          <attribute name='action'>AppMenu.SelectPrevRegion</attribute>"
+         "        </item>"
+         "        <item id='SelectNextRegion'>"
+         "          <attribute name='label' translatable='yes'>Next Region</attribute>"
+         "          <attribute name='action'>AppMenu.SelectNextRegion</attribute>"
+         "        </item>"
+         "      </section>"
+         "        <item id='SelectPrevDimension'>"
+         "          <attribute name='label' translatable='yes'>Previous Dimension</attribute>"
+         "          <attribute name='action'>AppMenu.SelectPrevDimension</attribute>"
+         "        </item>"
+         "        <item id='SelectNextDimension'>"
+         "          <attribute name='label' translatable='yes'>Next Dimension</attribute>"
+         "          <attribute name='action'>AppMenu.SelectNextDimension</attribute>"
+         "        </item>"
+         "        <item id='SelectPrevDimRgnZone'>"
+         "          <attribute name='label' translatable='yes'>Previous Dimension Region Zone</attribute>"
+         "          <attribute name='action'>AppMenu.SelectPrevDimRgnZone</attribute>"
+         "        </item>"
+         "        <item id='SelectNextDimRgnZone'>"
+         "          <attribute name='label' translatable='yes'>Next Dimension Region Zone</attribute>"
+         "          <attribute name='action'>AppMenu.SelectNextDimRgnZone</attribute>"
+         "        </item>"
+         "        <item id='SelectAddPrevDimRgnZone'>"
+         "          <attribute name='label' translatable='yes'>Add Previous Dimension Region Zone</attribute>"
+         "          <attribute name='action'>AppMenu.SelectAddPrevDimRgnZone</attribute>"
+         "        </item>"
+         "        <item id='SelectAddNextDimRgnZone'>"
+         "          <attribute name='label' translatable='yes'>Add Next Dimension Region Zone</attribute>"
+         "          <attribute name='action'>AppMenu.SelectAddNextDimRgnZone</attribute>"
+         "        </item>"
+         "      <section>"
+         "        <item id='CopySampleUnity'>"
+         "          <attribute name='label' translatable='yes'>Copy Sample Unity</attribute>"
+         "          <attribute name='action'>AppMenu.CopySampleUnity</attribute>"
+         "        </item>"
+         "        <item id='CopySampleTune'>"
+         "          <attribute name='label' translatable='yes'>Copy Sample Tune</attribute>"
+         "          <attribute name='action'>AppMenu.CopySampleTune</attribute>"
+         "        </item>"
+         "        <item id='CopySampleLoop'>"
+         "          <attribute name='label' translatable='yes'>Copy Sample Loop</attribute>"
+         "          <attribute name='action'>AppMenu.CopySampleLoop</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuMacro'>"
+         "      <attribute name='label' translatable='yes'>Macro</attribute>"
+         "      <section>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuSample'>"
+         "      <attribute name='label' translatable='yes'>Sample</attribute>"
+         "      <section>"
+         "        <item id='SampleProperties'>"
+         "          <attribute name='label' translatable='yes'>Properties</attribute>"
+         "          <attribute name='action'>AppMenu.SampleProperties</attribute>"
+         "        </item>"
+         "        <item id='AddGroup'>"
+         "          <attribute name='label' translatable='yes'>Add Group</attribute>"
+         "          <attribute name='action'>AppMenu.AddGroup</attribute>"
+         "        </item>"
+         "        <item id='AddSample'>"
+         "          <attribute name='label' translatable='yes'>Add Sample</attribute>"
+         "          <attribute name='action'>AppMenu.AddSample</attribute>"
+         "        </item>"
+         "        <item id='ShowSampleRefs'>"
+         "          <attribute name='label' translatable='yes'>Show Sample References</attribute>"
+         "          <attribute name='action'>AppMenu.ShowSampleRefs</attribute>"
+         "        </item>"
+         "        <item id='ReplaceSample'>"
+         "          <attribute name='label' translatable='yes'>Replace Sample</attribute>"
+         "          <attribute name='action'>AppMenu.ReplaceSample</attribute>"
+         "        </item>"
+         "        <item id='ReplaceAllSamplesInAllGroups'>"
+         "          <attribute name='label' translatable='yes'>Replace all Samples in all Groups</attribute>"
+         "          <attribute name='action'>AppMenu.ReplaceAllSamplesInAllGroups</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='RemoveSample'>"
+         "          <attribute name='label' translatable='yes'>Remove Sample</attribute>"
+         "          <attribute name='action'>AppMenu.RemoveSample</attribute>"
+         "        </item>"
+         "        <item id='RemoveUnusedSamples'>"
+         "          <attribute name='label' translatable='yes'>Remove unused Samples</attribute>"
+         "          <attribute name='action'>AppMenu.RemoveUnusedSamples</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuInstrument'>"
+         "      <attribute name='label' translatable='yes'>Instrument</attribute>"
+         "      <section>"
+         "        <item id='InstrProperties'>"
+         "          <attribute name='label' translatable='yes'>Properties</attribute>"
+         "          <attribute name='action'>AppMenu.InstrProperties</attribute>"
+         "        </item>"
+         "        <item id='MidiRules'>"
+         "          <attribute name='label' translatable='yes'>MIDI Rules</attribute>"
+         "          <attribute name='action'>AppMenu.MidiRules</attribute>"
+         "        </item>"
+         "        <item id='ScriptSlots'>"
+         "          <attribute name='label' translatable='yes'>Script Slots</attribute>"
+         "          <attribute name='action'>AppMenu.ScriptSlots</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <submenu id='AssignScripts'>"
+         "        <attribute name='label' translatable='yes'>Assign Scripts</attribute>"
+         "      </submenu>"
+         "      <section>"
+         "        <item id='AddInstrument'>"
+         "          <attribute name='label' translatable='yes'>Add Instrument</attribute>"
+         "          <attribute name='action'>AppMenu.AddInstrument</attribute>"
+         "        </item>"
+         "        <item id='DupInstrument'>"
+         "          <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"
+         "          <attribute name='action'>AppMenu.DupInstrument</attribute>"
+         "        </item>"
+         "        <item id='CombInstruments'>"
+         "          <attribute name='label' translatable='yes'>Combine Instrument</attribute>"
+         "          <attribute name='action'>AppMenu.CombInstruments</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='RemoveInstrument'>"
+         "          <attribute name='label' translatable='yes'>Remove Instrument</attribute>"
+         "          <attribute name='action'>AppMenu.RemoveInstrument</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuScript'>"
+         "      <attribute name='label' translatable='yes'>Script</attribute>"
+         "      <section>"
+         "        <item id='AddScriptGroup'>"
+         "          <attribute name='label' translatable='yes'>Add Script Group</attribute>"
+         "          <attribute name='action'>AppMenu.AddScriptGroup</attribute>"
+         "        </item>"
+         "        <item id='AddScript'>"
+         "          <attribute name='label' translatable='yes'>Add Script</attribute>"
+         "          <attribute name='action'>AppMenu.AddScript</attribute>"
+         "        </item>"
+         "        <item id='EditScript'>"
+         "          <attribute name='label' translatable='yes'>Edit Script</attribute>"
+         "          <attribute name='action'>AppMenu.EditScript</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='RemoveScript'>"
+         "          <attribute name='label' translatable='yes'>Remove Script</attribute>"
+         "          <attribute name='action'>AppMenu.RemoveScript</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuView'>"
+         "      <attribute name='label' translatable='yes'>View</attribute>"
+         "      <section>"
+         "        <item id='Statusbar'>"
+         "          <attribute name='label' translatable='yes'>Statusbar</attribute>"
+         "          <attribute name='action'>AppMenu.Statusbar</attribute>"
+         "        </item>"
+         "        <item id='AutoRestoreWinDim'>"
+         "          <attribute name='label' translatable='yes'>Auto restore Window Dimensions</attribute>"
+         "          <attribute name='action'>AppMenu.AutoRestoreWinDim</attribute>"
+         "        </item>"
+         "      </section>"
+         "      <section>"
+         "        <item id='RefreshAll'>"
+         "          <attribute name='label' translatable='yes'>Refresh All</attribute>"
+         "          <attribute name='action'>AppMenu.RefreshAll</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuTools'>"
+         "      <attribute name='label' translatable='yes'>Tools</attribute>"
+         "      <section>"
+         "        <item id='CombineInstruments'>"
+         "          <attribute name='label' translatable='yes'>Combine Instruments ...</attribute>"
+         "          <attribute name='action'>AppMenu.CombineInstruments</attribute>"
+         "        </item>"
+         "        <item id='MergeFiles'>"
+         "          <attribute name='label' translatable='yes'>Merge Files ...</attribute>"
+         "          <attribute name='action'>AppMenu.MergeFiles</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuSettings'>"
+         "      <attribute name='label' translatable='yes'>Settings</attribute>"
+         "      <section>"
+         "        <item id='WarnUserOnExtensions'>"
+         "          <attribute name='label' translatable='yes'>Warning on Format Extensions</attribute>"
+         "          <attribute name='action'>AppMenu.WarnUserOnExtensions</attribute>"
+         "        </item>"
+         "        <item id='SyncSamplerInstrumentSelection'>"
+         "          <attribute name='label' translatable='yes'>Synchronize Sampler Selection</attribute>"
+         "          <attribute name='action'>AppMenu.SyncSamplerInstrumentSelection</attribute>"
+         "        </item>"
+         "        <item id='MoveRootNoteWithRegionMoved'>"
+         "          <attribute name='label' translatable='yes'>Move Root Note with Region moved</attribute>"
+         "          <attribute name='action'>AppMenu.MoveRootNoteWithRegionMoved</attribute>"
+         "        </item>"
+         "        <item id='SaveWithTemporaryFile'>"
+         "          <attribute name='label' translatable='yes'>Save with temporary file</attribute>"
+         "          <attribute name='action'>AppMenu.SaveWithTemporaryFile</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "    <menu id='MenuHelp'>"
+         "      <attribute name='label' translatable='yes'>Help</attribute>"
+         "      <section>"
+         "        <item id='About'>"
+         "          <attribute name='label' translatable='yes'>About ...</attribute>"
+         "          <attribute name='action'>AppMenu.About</attribute>"
+         "        </item>"
+         "      </section>"
+         "    </menu>"
+         "  </menubar>"
+         // popups
+         "  <menu id='PopupMenu'>"
+         "    <section>"
+         "      <item id='InstrProperties'>"
+         "        <attribute name='label' translatable='yes'>Instrument Properties</attribute>"
+         "        <attribute name='action'>AppMenu.InstrProperties</attribute>"
+         "      </item>"
+         "      <item id='MidiRules'>"
+         "        <attribute name='label' translatable='yes'>MIDI Rules</attribute>"
+         "        <attribute name='action'>AppMenu.MidiRules</attribute>"
+         "      </item>"
+         "      <item id='ScriptSlots'>"
+         "        <attribute name='label' translatable='yes'>Script Slots</attribute>"
+         "        <attribute name='action'>AppMenu.ScriptSlots</attribute>"
+         "      </item>"
+         "      <item id='AddInstrument'>"
+         "        <attribute name='label' translatable='yes'>Add Instrument</attribute>"
+         "        <attribute name='action'>AppMenu.AddInstrument</attribute>"
+         "      </item>"
+         "      <item id='DupInstrument'>"
+         "        <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"
+         "        <attribute name='action'>AppMenu.DupInstrument</attribute>"
+         "      </item>"
+         "      <item id='CombInstruments'>"
+         "        <attribute name='label' translatable='yes'>Combine Instruments</attribute>"
+         "        <attribute name='action'>AppMenu.CombInstruments</attribute>"
+         "      </item>"
+         "    </section>"
+         "    <section>"
+         "      <item id='RemoveInstrument'>"
+         "        <attribute name='label' translatable='yes'>Remove Instruments</attribute>"
+         "        <attribute name='action'>AppMenu.RemoveInstrument</attribute>"
+         "      </item>"
+         "    </section>"
+         "  </menu>"
+         "  <menu id='SamplePopupMenu'>"
+         "    <section>"
+         "      <item id='SampleProperties'>"
+         "        <attribute name='label' translatable='yes'>Sample Properties</attribute>"
+         "        <attribute name='action'>AppMenu.SampleProperties</attribute>"
+         "      </item>"
+         "      <item id='AddGroup'>"
+         "        <attribute name='label' translatable='yes'>Add Sample Group</attribute>"
+         "        <attribute name='action'>AppMenu.AddGroup</attribute>"
+         "      </item>"
+         "      <item id='AddSample'>"
+         "        <attribute name='label' translatable='yes'>Add Sample</attribute>"
+         "        <attribute name='action'>AppMenu.AddSample</attribute>"
+         "      </item>"
+         "      <item id='ShowSampleRefs'>"
+         "        <attribute name='label' translatable='yes'>Show Sample References ...</attribute>"
+         "        <attribute name='action'>AppMenu.ShowSampleRefs</attribute>"
+         "      </item>"
+         "      <item id='ReplaceSample'>"
+         "        <attribute name='label' translatable='yes'>Replace Sample</attribute>"
+         "        <attribute name='action'>AppMenu.ReplaceSample</attribute>"
+         "      </item>"
+         "      <item id='ReplaceAllSamplesInAllGroups'>"
+         "        <attribute name='label' translatable='yes'>Replace all Samples ...</attribute>"
+         "        <attribute name='action'>AppMenu.ReplaceAllSamplesInAllGroups</attribute>"
+         "      </item>"
+         "    </section>"
+         "    <section>"
+         "      <item id='RemoveSample'>"
+         "        <attribute name='label' translatable='yes'>Remove Sample</attribute>"
+         "        <attribute name='action'>AppMenu.RemoveSample</attribute>"
+         "      </item>"
+         "      <item id='RemoveUnusedSamples'>"
+         "        <attribute name='label' translatable='yes'>Remove unused Samples</attribute>"
+         "        <attribute name='action'>AppMenu.RemoveUnusedSamples</attribute>"
+         "      </item>"
+         "    </section>"
+         "  </menu>"
+         "  <menu id='ScriptPopupMenu'>"
+         "    <section>"
+         "      <item id='AddScriptGroup'>"
+         "        <attribute name='label' translatable='yes'>Add Script Group</attribute>"
+         "        <attribute name='action'>AppMenu.AddScriptGroup</attribute>"
+         "      </item>"
+         "      <item id='AddScript'>"
+         "        <attribute name='label' translatable='yes'>Add Script</attribute>"
+         "        <attribute name='action'>AppMenu.AddScript</attribute>"
+         "      </item>"
+         "      <item id='EditScript'>"
+         "        <attribute name='label' translatable='yes'>Edit Script</attribute>"
+         "        <attribute name='action'>AppMenu.EditScript</attribute>"
+         "      </item>"
+         "    </section>"
+         "    <section>"
+         "      <item id='RemoveScript'>"
+         "        <attribute name='label' translatable='yes'>Remove Script</attribute>"
+         "        <attribute name='action'>AppMenu.RemoveScript</attribute>"
+         "      </item>"
+         "    </section>"
+         "  </menu>"
+         "</interface>";
+     m_uiManager->add_from_string(ui_info);
+ #else
      uiManager = Gtk::UIManager::create();
      uiManager->insert_action_group(actionGroup);
      add_accel_group(uiManager->get_accel_group());
-Line 455 
 MainWindow::MainWindow() :
+Line 1098 
 MainWindow::MainWindow() :
          "      <menuitem action='AdjustClipboard'/>"
          "      <menuitem action='PasteDimRgn'/>"
          "      <separator/>"
+         "      <menuitem action='SelectPrevInstr'/>"
+         "      <menuitem action='SelectNextInstr'/>"
+         "      <separator/>"
          "      <menuitem action='SelectPrevRegion'/>"
          "      <menuitem action='SelectNextRegion'/>"
          "      <separator/>"
-Line 489 
 MainWindow::MainWindow() :
+Line 1135 
 MainWindow::MainWindow() :
          "      <menuitem action='InstrProperties'/>"
          "      <menuitem action='MidiRules'/>"
          "      <menuitem action='ScriptSlots'/>"
+         "      <menu action='AssignScripts'/>"
          "      <menuitem action='AddInstrument'/>"
          "      <menuitem action='DupInstrument'/>"
+         "      <menuitem action='CombInstruments'/>"
          "      <separator/>"
          "      <menuitem action='RemoveInstrument'/>"
          "    </menu>"
-Line 527 
 MainWindow::MainWindow() :
+Line 1175 
 MainWindow::MainWindow() :
          "    <menuitem action='ScriptSlots'/>"
          "    <menuitem action='AddInstrument'/>"
          "    <menuitem action='DupInstrument'/>"
+         "    <menuitem action='CombInstruments'/>"
          "    <separator/>"
          "    <menuitem action='RemoveInstrument'/>"
          "  </popup>"
-Line 550 
 MainWindow::MainWindow() :
+Line 1199 
 MainWindow::MainWindow() :
          "  </popup>"
          "</ui>";
      uiManager->add_ui_from_string(ui_info);
+ #endif
+ #if USE_GTKMM_BUILDER
+     popup_menu = new Gtk::Menu(
+         Glib::RefPtr<Gio::Menu>::cast_dynamic(
+             m_uiManager->get_object("PopupMenu")
+         )
+     );
+     sample_popup = new Gtk::Menu(
+         Glib::RefPtr<Gio::Menu>::cast_dynamic(
+             m_uiManager->get_object("SamplePopupMenu")
+         )
+     );
+     script_popup = new Gtk::Menu(
+         Glib::RefPtr<Gio::Menu>::cast_dynamic(
+             m_uiManager->get_object("ScriptPopupMenu")
+         )
+     );
+ #else
      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));
      // Set tooltips for menu items (for some reason, setting a tooltip on the
-Line 570 
 MainWindow::MainWindow() :
+Line 1237 
 MainWindow::MainWindow() :
      {
          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."));
+         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 information to be altered by this action."));
      }
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
-Line 585 
 MainWindow::MainWindow() :
+Line 1252 
 MainWindow::MainWindow() :
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
              uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
-         item->set_tooltip_text(_("If checked, and when a region is moved by dragging it around on the virtual keyboard, the keybord position dependent pitch will move exactly with the amount of semi tones the region was moved around."));
+         item->set_tooltip_text(_("If checked, and when a region is moved by dragging it around on the virtual keyboard, the keyboard position dependent pitch will move exactly with the amount of semi tones the region was moved around."));
      }
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
-Line 616 
 MainWindow::MainWindow() :
+Line 1283 
 MainWindow::MainWindow() :
              uiManager->get_widget("/MenuBar/MenuTools/MergeFiles"));
          item->set_tooltip_text(_("Add instruments and samples of other .gig files to this .gig file."));
      }
+ #endif
+ #if USE_GTKMM_BUILDER
+     assign_scripts_menu = new Gtk::Menu(
+         Glib::RefPtr<Gio::Menu>::cast_dynamic(
+             m_uiManager->get_object("AssignScripts")
+         )
+     );
+ #else
      instrument_menu = static_cast<Gtk::MenuItem*>(
          uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments"))->get_submenu();
+     assign_scripts_menu = static_cast<Gtk::MenuItem*>(
+         uiManager->get_widget("/MenuBar/MenuInstrument/AssignScripts"))->get_submenu();
+ #endif
+ #if USE_GTKMM_BUILDER
+     Gtk::Widget* menuBar = NULL;
+     m_uiManager->get_widget("MenuBar", menuBar);
+ #else
      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");
+ #endif
      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
      m_VBox.pack_start(m_HPaned);
      m_VBox.pack_start(m_RegionChooser, Gtk::PACK_SHRINK);
-Line 632 
 MainWindow::MainWindow() :
+Line 1316 
 MainWindow::MainWindow() :
      set_file_is_shared(false);
      // Status Bar:
+ #if USE_GTKMM_BOX
+ # warning No status bar layout for GTKMM 4 yet
+ #else
      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
+ #endif
      m_StatusBar.show();
      m_RegionChooser.signal_region_selected().connect(
-Line 644 
 MainWindow::MainWindow() :
+Line 1332 
 MainWindow::MainWindow() :
      // Create the Tree model:
      m_refTreeModel = Gtk::ListStore::create(m_Columns);
-     m_TreeView.set_model(m_refTreeModel);
+     m_refTreeModelFilter = Gtk::TreeModelFilter::create(m_refTreeModel);
+     m_refTreeModelFilter->set_visible_func(
+         sigc::mem_fun(*this, &MainWindow::instrument_row_visible)
+     );
+     m_TreeView.set_model(m_refTreeModelFilter);
      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
      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(
-Line 654 
 MainWindow::MainWindow() :
+Line 1347 
 MainWindow::MainWindow() :
      // Add the TreeView's view columns:
      m_TreeView.append_column(_("Nr"), m_Columns.m_col_nr);
      m_TreeView.append_column_editable(_("Instrument"), m_Columns.m_col_name);
+     m_TreeView.append_column(_("Scripts"), m_Columns.m_col_scripts);
      m_TreeView.set_headers_visible(true);
      // establish drag&drop within the instrument tree view, allowing to reorder
-Line 699 
 MainWindow::MainWindow() :
+Line 1393 
 MainWindow::MainWindow() :
          );
      }
      m_TreeViewSamples.set_headers_visible(true);
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+     m_TreeViewSamples.signal_button_press_event().connect(
+         sigc::mem_fun(*this, &MainWindow::on_sample_treeview_button_release)
+     );
+ #else
      m_TreeViewSamples.signal_button_press_event().connect_notify(
          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_button_release)
      );
+ #endif
      m_refSamplesTreeModel->signal_row_changed().connect(
          sigc::mem_fun(*this, &MainWindow::sample_name_changed)
      );
-Line 718 
 MainWindow::MainWindow() :
+Line 1418 
 MainWindow::MainWindow() :
      // m_TreeViewScripts.set_reorderable();
      m_TreeViewScripts.append_column_editable("Samples", m_ScriptsModel.m_col_name);
      m_TreeViewScripts.set_headers_visible(false);
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+     m_TreeViewScripts.signal_button_press_event().connect(
+         sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release)
+     );
+ #else
      m_TreeViewScripts.signal_button_press_event().connect_notify(
          sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release)
      );
+ #endif
      //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)
-Line 819 
 MainWindow::MainWindow() :
+Line 1525 
 MainWindow::MainWindow() :
      dimreg_stereo.signal_toggled().connect(
          sigc::mem_fun(*this, &MainWindow::update_dimregs));
+     m_searchText.signal_changed().connect(
+         sigc::mem_fun(m_refTreeModelFilter.operator->(), &Gtk::TreeModelFilter::refilter)
+     );
      file = 0;
      file_is_changed = false;
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      show_all_children();
+ #endif
      // start with a new gig file by default
      on_action_file_new();
+     m_TreeViewNotebook.signal_switch_page().connect(
+         sigc::mem_fun(*this, &MainWindow::on_notebook_tab_switched)
+     );
      // 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);
-Line 839 
 MainWindow::MainWindow() :
+Line 1555 
 MainWindow::MainWindow() :
      // setup macros and their keyboard accelerators
      {
+ #if USE_GTKMM_BUILDER
+         menuMacro = new Gtk::Menu(
+             Glib::RefPtr<Gio::Menu>::cast_dynamic(
+                 m_uiManager->get_object("MenuMacro")
+             )
+         );
+ #else
          Gtk::Menu* menuMacro = dynamic_cast<Gtk::MenuItem*>(
              uiManager->get_widget("/MenuBar/MenuMacro")
          )->get_submenu();
-         const Gdk::ModifierType primaryModifierKey =
- #if defined(__APPLE__)
-             Gdk::META_MASK; // Cmd key on Mac
- #else
-             Gdk::CONTROL_MASK; // Ctrl key on all other OSs
  #endif
          const Gdk::ModifierType noModifier = (Gdk::ModifierType)0;
-Line 870 
 MainWindow::MainWindow() :
+Line 1587 
 MainWindow::MainWindow() :
          updateMacroMenu();
      }
+     // setup "Assign Scripts" keyboard accelerators
+     {
+         Gtk::AccelMap::add_entry("<Scripts>/script_0", GDK_KEY_F1, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_1", GDK_KEY_F2, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_2", GDK_KEY_F3, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_3", GDK_KEY_F4, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_4", GDK_KEY_F5, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_5", GDK_KEY_F6, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_6", GDK_KEY_F7, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_7", GDK_KEY_F8, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_8", GDK_KEY_F9, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_9", GDK_KEY_F10, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_10", GDK_KEY_F11, Gdk::SHIFT_MASK);
+         Gtk::AccelMap::add_entry("<Scripts>/script_11", GDK_KEY_F12, Gdk::SHIFT_MASK);
+         Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
+         assign_scripts_menu->set_accel_group(accelGroup);
+     }
+     Glib::signal_idle().connect_once(
+         sigc::mem_fun(*this, &MainWindow::bringToFront),
+     );
  }
  MainWindow::~MainWindow()
  {
  }
+ void MainWindow::bringToFront() {
+     #if defined(__APPLE__)
+     macRaiseAppWindow();
+     #endif
+     raise();
+     present();
+ }
  void MainWindow::updateMacroMenu() {
+ #if !USE_GTKMM_BUILDER
      Gtk::Menu* menuMacro = dynamic_cast<Gtk::MenuItem*>(
          uiManager->get_widget("/MenuBar/MenuMacro")
      )->get_submenu();
+ #endif
      // remove all entries from "Macro" menu
      {
-Line 937 
 void MainWindow::updateMacroMenu() {
+Line 1688 
 void MainWindow::updateMacroMenu() {
          item->set_accel_path("<Macros>/SetupMacros");
      }
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      menuMacro->show_all_children();
+ #endif
  }
  void MainWindow::onMacroSelected(int iMacro) {
-Line 974 
 void MainWindow::onMacrosSetupChanged(co
+Line 1727 
 void MainWindow::onMacrosSetupChanged(co
      updateMacroMenu();
  }
+ //NOTE: the actual signal's first argument for argument 'page' is on some gtkmm version GtkNotebookPage* and on some Gtk::Widget*. Since we don't need that argument, it is simply void* here for now.
+ void MainWindow::on_notebook_tab_switched(void* page, guint page_num) {
+     bool isInstrumentsPage = (page_num == 1);
+     // so far we only support filtering for the instruments list, so hide the
+     // filter text entry field if another tab is selected
+     m_searchField.set_visible(isInstrumentsPage);
+ }
  bool MainWindow::on_delete_event(GdkEventAny* event)
  {
      return !file_is_shared && file_is_changed && !close_confirmation_dialog();
-Line 995 
 gig::Instrument* MainWindow::get_instrum
+Line 1756 
 gig::Instrument* MainWindow::get_instrum
      gig::Instrument* instrument = 0;
      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
      if (rows.empty()) return NULL;
-     Gtk::TreeModel::const_iterator it = m_refTreeModel->get_iter(rows[0]);
+     //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.
+     Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
      if (it) {
          Gtk::TreeModel::Row row = *it;
          instrument = row[m_Columns.m_col_instr];
-Line 1061 
 void MainWindow::dimreg_changed()
+Line 1823 
 void MainWindow::dimreg_changed()
  void MainWindow::on_sel_change()
  {
+ #if !USE_GTKMM_BUILDER
      // select item in instrument menu
      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
      if (!rows.empty()) {
-Line 1073 
 void MainWindow::on_sel_change()
+Line 1836 
 void MainWindow::on_sel_change()
              static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
          }
      }
+ #endif
+     updateScriptListOfMenu();
      m_RegionChooser.set_instrument(get_instrument());
-Line 1212 
 void Saver::thread_function()
+Line 1978 
 void Saver::thread_function()
                  }
                  #else // POSIX ...
                  if (unlink(filename.c_str())) {
-                     throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + String(strerror(errno)));
+                     throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + gig::String(strerror(errno)));
                  }
                  #endif
                  if (rename(tmpname.c_str(), filename.c_str())) {
                      #if defined(WIN32)
                      throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");
                      #else
-                     throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + String(strerror(errno)));
+                     throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + gig::String(strerror(errno)));
                      #endif
                  }
              }
-Line 1281 
 Glib::Dispatcher& Saver::signal_error()
+Line 2047 
 Glib::Dispatcher& Saver::signal_error()
  ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent)
      : Gtk::Dialog(title, parent, true)
  {
+ #if USE_GTKMM_BOX
+     get_content_area()->pack_start(progressBar);
+ #else
      get_vbox()->pack_start(progressBar);
+ #endif
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      show_all_children();
+ #endif
      resize(600,50);
  }
-Line 1295 
 void MainWindow::__clear() {
+Line 2067 
 void MainWindow::__clear() {
      m_refTreeModel->clear();
      m_refSamplesTreeModel->clear();
      m_refScriptsTreeModel->clear();
+ #if !USE_GTKMM_BUILDER
      // remove all entries from "Instrument" menu
      while (!instrument_menu->get_children().empty()) {
          remove_instrument_from_menu(0);
      }
+ #endif
      // free libgig's gig::File instance
      if (file && !file_is_shared) delete file;
      file = NULL;
-Line 1310 
 void MainWindow::__refreshEntireGUI() {
+Line 2084 
 void MainWindow::__refreshEntireGUI() {
      m_refTreeModel->clear();
      m_refSamplesTreeModel->clear();
      m_refScriptsTreeModel->clear();
+ #if !USE_GTKMM_BUILDER
      // remove all entries from "Instrument" menu
      while (!instrument_menu->get_children().empty()) {
          remove_instrument_from_menu(0);
      }
+ #endif
      if (!this->file) return;
-Line 1347 
 bool MainWindow::close_confirmation_dial
+Line 2123 
 bool MainWindow::close_confirmation_dial
      g_free(msg);
      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));
      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);
+ #else
+     dialog.add_button(_("_OK"), Gtk::RESPONSE_OK);
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+ #endif
      dialog.set_default_response(Gtk::RESPONSE_YES);
      int response = dialog.run();
      dialog.hide();
-Line 1379 
 bool MainWindow::leaving_shared_mode_dia
+Line 2160 
 bool MainWindow::leaving_shared_mode_dia
            "used by the sampler until you tell the sampler explicitly to "
            "load it."));
      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ #else
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+ #endif
      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
      int response = dialog.run();
      dialog.hide();
-Line 1393 
 void MainWindow::on_action_file_open()
+Line 2178 
 void MainWindow::on_action_file_open()
      if (file_is_shared && !leaving_shared_mode_dialog()) return;
      Gtk::FileChooserDialog dialog(*this, _("Open file"));
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
+ #else
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+     dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
+ #endif
      dialog.set_default_response(Gtk::RESPONSE_OK);
  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
      Gtk::FileFilter filter;
-Line 1426 
 void MainWindow::load_file(const char* n
+Line 2216 
 void MainWindow::load_file(const char* n
          Glib::filename_display_basename(name) + "' ...",
          *this
      );
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      progress_dialog->show_all();
+ #endif
      loader = new Loader(name); //FIXME: memory leak!
      loader->signal_progress().connect(
          sigc::mem_fun(*this, &MainWindow::on_loader_progress));
-Line 1460 
 void MainWindow::load_instrument(gig::In
+Line 2252 
 void MainWindow::load_instrument(gig::In
              // make sure the selected item in the "instruments" tree view is
              // visible (scroll to it)
              m_TreeView.scroll_to_row(Gtk::TreePath(ToString(i)));
+ #if !USE_GTKMM_BUILDER
              // select item in instrument menu
              {
                  const std::vector<Gtk::Widget*> children =
                      instrument_menu->get_children();
                  static_cast<Gtk::RadioMenuItem*>(children[i])->set_active();
              }
+ #endif
              // update region chooser and dimension region chooser
              m_RegionChooser.set_instrument(instr);
              break;
-Line 1537 
 bool MainWindow::file_save()
+Line 2331 
 bool MainWindow::file_save()
          Glib::filename_display_basename(this->filename) + "' ...",
          *this
      );
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      progress_dialog->show_all();
+ #endif
      saver = new Saver(this->file); //FIXME: memory leak!
      saver->signal_progress().connect(
          sigc::mem_fun(*this, &MainWindow::on_saver_progress));
-Line 1590 
 void MainWindow::on_action_file_save_as(
+Line 2386 
 void MainWindow::on_action_file_save_as(
  bool MainWindow::file_save_as()
  {
      Gtk::FileChooserDialog dialog(*this, _("Save as"), Gtk::FILE_CHOOSER_ACTION_SAVE);
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
+ #else
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+     dialog.add_button(_("_Save"), Gtk::RESPONSE_OK);
+ #endif
      dialog.set_default_response(Gtk::RESPONSE_OK);
      dialog.set_do_overwrite_confirmation();
-Line 1620 
 bool MainWindow::file_save_as()
+Line 2421 
 bool MainWindow::file_save_as()
      }
      // show warning in the dialog
-     Gtk::HBox descriptionArea;
+     HBox descriptionArea;
      descriptionArea.set_spacing(15);
      Gtk::Image warningIcon;
      warningIcon.set_from_icon_name("dialog-warning",
-Line 1641 
 bool MainWindow::file_save_as()
+Line 2442 
 bool MainWindow::file_save_as()
            "same .gig file will end up in corrupted sample wave data!\n")
      );
      descriptionArea.pack_start(description);
+ #if USE_GTKMM_BOX
+     dialog.get_content_area()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
+ #else
      dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
+ #endif
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      descriptionArea.show_all();
+ #endif
      if (dialog.run() == Gtk::RESPONSE_OK) {
          std::string filename = dialog.get_filename();
-Line 1656 
 bool MainWindow::file_save_as()
+Line 2463 
 bool MainWindow::file_save_as()
              Glib::filename_display_basename(filename) + "' ...",
              *this
          );
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
          progress_dialog->show_all();
+ #endif
          saver = new Saver(file, filename); //FIXME: memory leak!
          saver->signal_progress().connect(
-Line 1815 
 void MainWindow::on_action_help_about()
+Line 2624 
 void MainWindow::on_action_help_about()
      dialog.set_comments(sComment.c_str());
      dialog.set_website("http://www.linuxsampler.org");
      dialog.set_website_label("http://www.linuxsampler.org");
+     dialog.set_position(Gtk::WIN_POS_CENTER);
      dialog.run();
  }
-Line 1836 
 PropDialog::PropDialog()
+Line 2646 
 PropDialog::PropDialog()
        eSourceForm(_("Source form")),
        eCommissioned(_("Commissioned")),
        eSubject(_("Subject")),
+ #if HAS_GTKMM_STOCK
        quitButton(Gtk::Stock::CLOSE),
+ #else
+       quitButton(_("_Close")),
+ #endif
        table(2, 1),
        m_file(NULL)
  {
+     if (!Settings::singleton()->autoRestoreWindowDimension) {
+         set_default_size(470, 390);
+         set_position(Gtk::WIN_POS_MOUSE);
+     }
      set_title(_("File Properties"));
      eName.set_width_chars(50);
-Line 1878 
 PropDialog::PropDialog()
+Line 2697 
 PropDialog::PropDialog()
      table.add(eCommissioned);
      table.add(eSubject);
+ #if USE_GTKMM_GRID
+     table.set_column_spacing(5);
+ #else
      table.set_col_spacings(5);
+ #endif
      add(vbox);
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+     table.set_margin(5);
+ #else
      table.set_border_width(5);
+ #endif
      vbox.add(table);
      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
      buttonBox.set_layout(Gtk::BUTTONBOX_END);
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+     buttonBox.set_margin(5);
+ #else
      buttonBox.set_border_width(5);
+ #endif
      buttonBox.show();
      buttonBox.pack_start(quitButton);
      quitButton.set_can_default();
-Line 1896 
 PropDialog::PropDialog()
+Line 2728 
 PropDialog::PropDialog()
      quitButton.show();
      vbox.show();
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      show_all_children();
+ #endif
  }
  void PropDialog::set_file(gig::File* file)
-Line 1959 
 void InstrumentProps::set_MIDIProgram(ui
+Line 2793 
 void InstrumentProps::set_MIDIProgram(ui
  }
  InstrumentProps::InstrumentProps() :
+ #if HAS_GTKMM_STOCK
      quitButton(Gtk::Stock::CLOSE),
+ #else
+     quitButton(_("_Close")),
+ #endif
      table(2,1),
      eName(_("Name")),
      eIsDrum(_("Is drum")),
-Line 1969 
 InstrumentProps::InstrumentProps() :
+Line 2807 
 InstrumentProps::InstrumentProps() :
      eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
      eEffectSend(_("Effect send"), 0, 65535),
      eFineTune(_("Fine tune"), -8400, 8400),
-     ePitchbendRange(_("Pitchbend range"), 0, 12),
+     ePitchbendRange(_("Pitchbend range"), 0, 48),
      ePianoReleaseMode(_("Piano release mode")),
      eDimensionKeyRangeLow(_("Keyswitching range low")),
      eDimensionKeyRangeHigh(_("Keyswitching range high"))
  {
+     if (!Settings::singleton()->autoRestoreWindowDimension) {
+         //set_default_size(470, 390);
+         set_position(Gtk::WIN_POS_MOUSE);
+     }
      set_title(_("Instrument Properties"));
      eDimensionKeyRangeLow.set_tip(
-Line 2000 
 InstrumentProps::InstrumentProps() :
+Line 2843 
 InstrumentProps::InstrumentProps() :
      eName.signal_value_changed().connect(sig_name_changed.make_slot());
+ #if USE_GTKMM_GRID
+     table.set_column_spacing(5);
+ #else
      table.set_col_spacings(5);
+ #endif
      table.add(eName);
      table.add(eIsDrum);
-Line 2016 
 InstrumentProps::InstrumentProps() :
+Line 2863 
 InstrumentProps::InstrumentProps() :
      table.add(eDimensionKeyRangeHigh);
      add(vbox);
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+     table.set_margin(5);
+ #else
      table.set_border_width(5);
+ #endif
      vbox.pack_start(table);
      table.show();
      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
      buttonBox.set_layout(Gtk::BUTTONBOX_END);
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+     buttonBox.set_margin(5);
+ #else
      buttonBox.set_border_width(5);
+ #endif
      buttonBox.show();
      buttonBox.pack_start(quitButton);
      quitButton.set_can_default();
-Line 2032 
 InstrumentProps::InstrumentProps() :
+Line 2887 
 InstrumentProps::InstrumentProps() :
      quitButton.show();
      vbox.show();
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      show_all_children();
+ #endif
  }
  void InstrumentProps::set_instrument(gig::Instrument* instrument)
-Line 2098 
 void MainWindow::load_gig(gig::File* gig
+Line 2955 
 void MainWindow::load_gig(gig::File* gig
      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
           instrument = gig->GetNextInstrument(), ++index) {
          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
+         const int iScriptSlots = instrument->ScriptSlotCount();
          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
          Gtk::TreeModel::Row row = *iter;
          row[m_Columns.m_col_nr] = index;
          row[m_Columns.m_col_name] = name;
          row[m_Columns.m_col_instr] = instrument;
+         row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
+ #if !USE_GTKMM_BUILDER
          add_instrument_to_menu(name);
+ #endif
      }
      instrument_name_connection.unblock();
+ #if !USE_GTKMM_BUILDER
      uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments")->show();
+ #endif
      updateSampleRefCountMap(gig);
-Line 2179 
 bool MainWindow::instr_props_set_instrum
+Line 3042 
 bool MainWindow::instr_props_set_instrum
          instrumentProps.hide();
          return false;
      }
-     Gtk::TreeModel::const_iterator it = m_refTreeModel->get_iter(rows[0]);
+     //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.
+     Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
      if (it) {
          Gtk::TreeModel::Row row = *it;
          gig::Instrument* instrument = row[m_Columns.m_col_instr];
-Line 2196 
 bool MainWindow::instr_props_set_instrum
+Line 3060 
 bool MainWindow::instr_props_set_instrum
      } else {
          instrumentProps.hide();
      }
-     return it;
+     //NOTE: explicit boolean cast required for GTKMM4 development branch here
+     return it ? true : false;
  }
  void MainWindow::show_instr_props()
-Line 2242 
 void MainWindow::show_script_slots() {
+Line 3107 
 void MainWindow::show_script_slots() {
      ScriptSlots* window = new ScriptSlots;
      window->setInstrument(instrument);
+     window->signal_script_slots_changed().connect(
+         sigc::mem_fun(*this, &MainWindow::onScriptSlotsModified)
+     );
      //window->reparent(*this);
      window->show();
  }
+ void MainWindow::onScriptSlotsModified(gig::Instrument* pInstrument) {
+     if (!pInstrument) return;
+     const int iScriptSlots = pInstrument->ScriptSlotCount();
+     //NOTE: This is a big mess! Sometimes GTK requires m_TreeView.get_model(), here we need m_refTreeModelFilter->get_model(), otherwise accessing children below causes an error!
+     //Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
+     Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->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) continue;
+         row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
+         break;
+     }
+     // causes the sampler to reload the instrument with the new script
+     on_sel_change();
+ }
+ void MainWindow::assignScript(gig::Script* pScript) {
+     if (!pScript) {
+         printf("assignScript() : !script\n");
+         return;
+     }
+     printf("assignScript('%s')\n", pScript->Name.c_str());
+     gig::Instrument* pInstrument = get_instrument();
+     if (!pInstrument) {
+         printf("!instrument\n");
+         return;
+     }
+     pInstrument->AddScriptSlot(pScript);
+     onScriptSlotsModified(pInstrument);
+ }
  void MainWindow::on_action_refresh_all() {
      __refreshEntireGUI();
  }
  void MainWindow::on_action_view_status_bar() {
+ #if USE_GLIB_ACTION
+     bool active = false;
+     m_actionToggleStatusBar->get_state(active);
+     // for some reason toggle state does not change automatically
+     active = !active;
+     m_actionToggleStatusBar->change_state(active);
+     if (active)
+         m_StatusBar.show();
+     else
+         m_StatusBar.hide();
+ #else
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
      if (!item) {
-Line 2259 
 void MainWindow::on_action_view_status_b
+Line 3175 
 void MainWindow::on_action_view_status_b
      }
      if (item->get_active()) m_StatusBar.show();
      else                    m_StatusBar.hide();
+ #endif
  }
  void MainWindow::on_auto_restore_win_dim() {
+ #if USE_GLIB_ACTION
+     bool active = false;
+     m_actionToggleRestoreWinDim->get_state(active);
+     // for some reason toggle state does not change automatically
+     active = !active;
+     m_actionToggleRestoreWinDim->change_state(active);
+     Settings::singleton()->autoRestoreWindowDimension = active;
+ #else
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
      if (!item) {
-Line 2269 
 void MainWindow::on_auto_restore_win_dim
+Line 3194 
 void MainWindow::on_auto_restore_win_dim
          return;
      }
      Settings::singleton()->autoRestoreWindowDimension = item->get_active();
+ #endif
  }
  void MainWindow::on_save_with_temporary_file() {
+ #if USE_GLIB_ACTION
+     bool active = false;
+     m_actionToggleSaveWithTempFile->get_state(active);
+     // for some reason toggle state does not change automatically
+     active = !active;
+     m_actionToggleSaveWithTempFile->change_state(active);
+     Settings::singleton()->saveWithTemporaryFile = active;
+ #else
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuSettings/SaveWithTemporaryFile"));
      if (!item) {
-Line 2279 
 void MainWindow::on_save_with_temporary_
+Line 3213 
 void MainWindow::on_save_with_temporary_
          return;
      }
      Settings::singleton()->saveWithTemporaryFile = item->get_active();
+ #endif
  }
  bool MainWindow::is_copy_samples_unity_note_enabled() const {
+ #if USE_GLIB_ACTION
+     bool active = false;
+     m_actionToggleCopySampleUnity->get_state(active);
+     return active;
+ #else
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
      if (!item) {
-Line 2289 
 bool MainWindow::is_copy_samples_unity_n
+Line 3229 
 bool MainWindow::is_copy_samples_unity_n
          return true;
      }
      return item->get_active();
+ #endif
  }
  bool MainWindow::is_copy_samples_fine_tune_enabled() const {
+ #if USE_GLIB_ACTION
+     bool active = false;
+     m_actionToggleCopySampleTune->get_state(active);
+     return active;
+ #else
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune"));
      if (!item) {
-Line 2299 
 bool MainWindow::is_copy_samples_fine_tu
+Line 3245 
 bool MainWindow::is_copy_samples_fine_tu
          return true;
      }
      return item->get_active();
+ #endif
  }
  bool MainWindow::is_copy_samples_loop_enabled() const {
+ #if USE_GLIB_ACTION
+     bool active = false;
+     m_actionToggleCopySampleLoop->get_state(active);
+     return active;
+ #else
      Gtk::CheckMenuItem* item =
          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
      if (!item) {
-Line 2309 
 bool MainWindow::is_copy_samples_loop_en
+Line 3261 
 bool MainWindow::is_copy_samples_loop_en
          return true;
      }
      return item->get_active();
+ #endif
  }
- void MainWindow::on_button_release(GdkEventButton* button)
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
- {
+ bool MainWindow::on_button_release(Gdk::EventButton& _button) {
+     GdkEventButton* button = _button.gobj();
+ #else
+ void MainWindow::on_button_release(GdkEventButton* button) {
+ #endif
      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);
+ #if USE_GTKMM_BUILDER
+         m_actionMIDIRules->property_enabled() = bEnabled;
+ #else
          static_cast<Gtk::MenuItem*>(
              uiManager->get_widget("/MenuBar/MenuInstrument/MidiRules"))->set_sensitive(
                  bEnabled
-Line 2326 
 void MainWindow::on_button_release(GdkEv
+Line 3286 
 void MainWindow::on_button_release(GdkEv
              uiManager->get_widget("/PopupMenu/MidiRules"))->set_sensitive(
                  bEnabled
              );
+ #endif
          popup_menu->popup(button->button, button->time);
      }
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+     return false;
+ #endif
  }
+ #if !USE_GTKMM_BUILDER
  void MainWindow::on_instrument_selection_change(Gtk::RadioMenuItem* item) {
      if (item->get_active()) {
          const std::vector<Gtk::Widget*> children =
-Line 2344 
 void MainWindow::on_instrument_selection
+Line 3309 
 void MainWindow::on_instrument_selection
          }
      }
  }
+ #endif
  void MainWindow::select_instrument(gig::Instrument* instrument) {
      if (!instrument) return;
+     //NOTE: This is a big mess! Sometimes GTK requires m_refTreeModelFilter->get_model(), here we need m_TreeView.get_model(), otherwise treeview selection below causes an error!
      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
+     //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->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()->unselect_all();
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+             auto iterSel = model->children()[i].get_iter();
+             m_TreeView.get_selection()->select(iterSel);
+ #else
              m_TreeView.get_selection()->select(model->children()[i]);
+ #endif
              std::vector<Gtk::TreeModel::Path> rows =
                  m_TreeView.get_selection()->get_selected_rows();
              if (!rows.empty())
-Line 2370 
 bool MainWindow::select_dimension_region
+Line 3345 
 bool MainWindow::select_dimension_region
      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
+     //NOTE: This is a big mess! Sometimes GTK requires m_refTreeModelFilter->get_model(), here we need m_TreeView.get_model(), otherwise treeview selection below causes an error!
      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
+     //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->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()->unselect_all();
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+             auto iterSel = model->children()[i].get_iter();
+             m_TreeView.get_selection()->select(iterSel);
+ #else
              m_TreeView.get_selection()->select(model->children()[i]);
+ #endif
              std::vector<Gtk::TreeModel::Path> rows =
                  m_TreeView.get_selection()->get_selected_rows();
              if (!rows.empty())
-Line 2408 
 void MainWindow::select_sample(gig::Samp
+Line 3391 
 void MainWindow::select_sample(gig::Samp
              if (rowSample[m_SamplesModel.m_col_sample] == sample) {
                  show_samples_tab();
                  m_TreeViewSamples.get_selection()->unselect_all();
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+                 auto iterSel = rowGroup.children()[s].get_iter();
+                 m_TreeViewSamples.get_selection()->select(iterSel);
+ #else
                  m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]);
+ #endif
                  std::vector<Gtk::TreeModel::Path> rows =
                      m_TreeViewSamples.get_selection()->get_selected_rows();
                  if (rows.empty()) return;
-Line 2419 
 void MainWindow::select_sample(gig::Samp
+Line 3407 
 void MainWindow::select_sample(gig::Samp
      }
  }
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+ bool MainWindow::on_sample_treeview_button_release(Gdk::EventButton& _button) {
+     GdkEventButton* button = _button.gobj();
+ #else
  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
+ #endif
      if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
          // by default if Ctrl keys is pressed down, then a mouse right-click
          // does not select the respective row, so we must assure this
-Line 2440 
 void MainWindow::on_sample_treeview_butt
+Line 3433 
 void MainWindow::on_sample_treeview_butt
              }
          }*/
+ #if !USE_GTKMM_BUILDER
          Gtk::Menu* sample_popup =
              dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/SamplePopupMenu"));
+ #endif
          // update enabled/disabled state of sample popup items
          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
-Line 2456 
 void MainWindow::on_sample_treeview_butt
+Line 3452 
 void MainWindow::on_sample_treeview_butt
              if (row[m_SamplesModel.m_col_sample]) nSamples++;
          }
+ #if USE_GTKMM_BUILDER
+         m_actionSampleProperties->property_enabled() = (n == 1);
+         m_actionAddSample->property_enabled() = (n);
+         m_actionAddSampleGroup->property_enabled() = (file);
+         m_actionViewSampleRefs->property_enabled() = (nSamples == 1);
+         m_actionRemoveSample->property_enabled() = (n);
+         m_actionReplaceSample->property_enabled() = (nSamples == 1);
+ #else
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))->
              set_sensitive(n == 1);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddSample"))->
-Line 2466 
 void MainWindow::on_sample_treeview_butt
+Line 3470 
 void MainWindow::on_sample_treeview_butt
              set_sensitive(nSamples == 1);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))->
              set_sensitive(n);
+ #endif
          // show sample popup
          sample_popup->popup(button->button, button->time);
+ #if !USE_GTKMM_BUILDER
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))->
              set_sensitive(n == 1);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))->
-Line 2479 
 void MainWindow::on_sample_treeview_butt
+Line 3485 
 void MainWindow::on_sample_treeview_butt
              set_sensitive(nSamples == 1);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))->
              set_sensitive(n);
+ #endif
      }
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+     return false;
+ #endif
  }
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+ bool MainWindow::on_script_treeview_button_release(Gdk::EventButton& _button) {
+     GdkEventButton* button = _button.gobj();
+ #else
  void MainWindow::on_script_treeview_button_release(GdkEventButton* button) {
+ #endif
      if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
+ #if !USE_GTKMM_BUILDER
          Gtk::Menu* script_popup =
              dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/ScriptPopupMenu"));
+ #endif
          // update enabled/disabled state of sample popup items
          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewScripts.get_selection();
          Gtk::TreeModel::iterator it = sel->get_selected();
-Line 2496 
 void MainWindow::on_script_treeview_butt
+Line 3514 
 void MainWindow::on_script_treeview_butt
              group_selected  = row[m_ScriptsModel.m_col_group];
              script_selected = row[m_ScriptsModel.m_col_script];
          }
+ #if USE_GTKMM_BUILDER
+         m_actionAddScript->property_enabled() = (group_selected || script_selected);
+         m_actionAddScriptGroup->property_enabled() = (file);
+         m_actionEditScript->property_enabled() = (script_selected);
+         m_actionRemoveScript->property_enabled() = (group_selected || script_selected);
+ #else
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/AddScript"))->
              set_sensitive(group_selected || script_selected);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/AddScriptGroup"))->
-Line 2504 
 void MainWindow::on_script_treeview_butt
+Line 3528 
 void MainWindow::on_script_treeview_butt
              set_sensitive(script_selected);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/ScriptPopupMenu/RemoveScript"))->
              set_sensitive(group_selected || script_selected);
+ #endif
          // show sample popup
          script_popup->popup(button->button, button->time);
+ #if !USE_GTKMM_BUILDER
          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"))->
-Line 2515 
 void MainWindow::on_script_treeview_butt
+Line 3541 
 void MainWindow::on_script_treeview_butt
              set_sensitive(script_selected);
          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuScript/RemoveScript"))->
              set_sensitive(group_selected || script_selected);
+ #endif
      }
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+     return false;
+ #endif
+ }
+ void MainWindow::updateScriptListOfMenu() {
+     // remove all entries from "Assign Script" menu
+     {
+         const std::vector<Gtk::Widget*> children = assign_scripts_menu->get_children();
+         for (int i = 0; i < children.size(); ++i) {
+             Gtk::Widget* child = children[i];
+             assign_scripts_menu->remove(*child);
+             delete child;
+         }
+     }
+     int iTotalScripts = 0;
+     if (!file) goto noScripts;
+     // add all configured macros as menu items to the "Macro" menu
+     for (int iGroup = 0; file->GetScriptGroup(iGroup); ++iGroup) {
+         gig::ScriptGroup* pGroup = file->GetScriptGroup(iGroup);
+         for (int iScript = 0; pGroup->GetScript(iScript); ++iScript, ++iTotalScripts) {
+             gig::Script* pScript = pGroup->GetScript(iScript);
+             std::string name = pScript->Name;
+             Gtk::MenuItem* item = new Gtk::MenuItem(name);
+             item->signal_activate().connect(
+                 sigc::bind(
+                     sigc::mem_fun(*this, &MainWindow::assignScript), pScript
+                 )
+             );
+             assign_scripts_menu->append(*item);
+             item->set_accel_path("<Scripts>/script_" + ToString(iTotalScripts));
+             //item->set_tooltip_text(comment);
+         }
+     }
+     noScripts:
+     // if there are no macros configured at all, then show a dummy entry instead
+     if (!iTotalScripts) {
+         Gtk::MenuItem* item = new Gtk::MenuItem(_("No Scripts"));
+         item->set_sensitive(false);
+         assign_scripts_menu->append(*item);
+     }
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
+     assign_scripts_menu->show_all_children();
+ #endif
  }
+ #if !USE_GTKMM_BUILDER
  Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
      const Glib::ustring& name, int position) {
-Line 2541 
 Gtk::RadioMenuItem* MainWindow::add_inst
+Line 3620 
 Gtk::RadioMenuItem* MainWindow::add_inst
              item));
      return item;
  }
+ #endif
+ #if !USE_GTKMM_BUILDER
  void MainWindow::remove_instrument_from_menu(int index) {
      const std::vector<Gtk::Widget*> children =
          instrument_menu->get_children();
-Line 2549 
 void MainWindow::remove_instrument_from_
+Line 3630 
 void MainWindow::remove_instrument_from_
      instrument_menu->remove(*child);
      delete child;
  }
+ #endif
  void MainWindow::add_instrument(gig::Instrument* instrument) {
      const Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
-Line 2560 
 void MainWindow::add_instrument(gig::Ins
+Line 3642 
 void MainWindow::add_instrument(gig::Ins
      rowInstr[m_Columns.m_col_nr] = m_refTreeModel->children().size() - 1;
      rowInstr[m_Columns.m_col_name] = name;
      rowInstr[m_Columns.m_col_instr] = instrument;
+     rowInstr[m_Columns.m_col_scripts] = "";
      instrument_name_connection.unblock();
+ #if !USE_GTKMM_BUILDER
      add_instrument_to_menu(name);
+ #endif
-     m_TreeView.get_selection()->select(iterInstr);
+     select_instrument(instrument);
      file_changed();
  }
-Line 2633 
 void MainWindow::on_action_remove_instru
+Line 3716 
 void MainWindow::on_action_remove_instru
              if (instr) file->DeleteInstrument(instr);
              file_changed();
+ #if !USE_GTKMM_BUILDER
              remove_instrument_from_menu(index);
+ #endif
              // remove row from instruments tree view
              m_refTreeModel->erase(it);
-Line 2848 
 void MainWindow::add_or_replace_sample(b
+Line 3933 
 void MainWindow::add_or_replace_sample(b
      // show 'browse for file' dialog
      Gtk::FileChooserDialog dialog(*this, replace ? _("Replace Sample with") : _("Add Sample(s)"));
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
+ #else
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+     dialog.add_button(_("_Open"), Gtk::RESPONSE_OK);
+ #endif
      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
-Line 2898 
 void MainWindow::add_or_replace_sample(b
+Line 3988 
 void MainWindow::add_or_replace_sample(b
          for (std::vector<std::string>::iterator iter = filenames.begin();
               iter != filenames.end(); ++iter) {
              printf("Adding sample %s\n",(*iter).c_str());
-             // use libsndfile to retrieve file informations
+             // use libsndfile to retrieve file information
              SF_INFO info;
              info.format = 0;
              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
-Line 3039 
 void MainWindow::on_action_replace_all_s
+Line 4129 
 void MainWindow::on_action_replace_all_s
      Gtk::Label description(str);
      description.set_line_wrap();
  #endif
-     Gtk::HBox entryArea;
+     HBox entryArea;
      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
      Gtk::Entry postfixEntryBox;
      postfixEntryBox.set_text(".wav");
      entryArea.pack_start(entryLabel);
      entryArea.pack_start(postfixEntryBox);
+ #if USE_GTKMM_BOX
+     dialog.get_content_area()->pack_start(description, Gtk::PACK_SHRINK);
+     dialog.get_content_area()->pack_start(entryArea, Gtk::PACK_SHRINK);
+ #else
      dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
      dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
+ #endif
      description.show();
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      entryArea.show_all();
+ #else
+     entryArea.show();
+ #endif
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ #else
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+ #endif
      dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
      dialog.set_select_multiple(false);
      if (current_sample_dir != "") {
-Line 3507 
 void MainWindow::instrument_name_changed
+Line 4612 
 void MainWindow::instrument_name_changed
      Gtk::TreeModel::Row row = *iter;
      Glib::ustring name = row[m_Columns.m_col_name];
+ #if !USE_GTKMM_BUILDER
      // change name in instrument menu
      int index = path[0];
      const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
-Line 3519 
 void MainWindow::instrument_name_changed
+Line 4625 
 void MainWindow::instrument_name_changed
          item->set_active();
  #endif
      }
+ #endif
      // change name in gig
      gig::Instrument* instrument = row[m_Columns.m_col_instr];
-Line 3535 
 void MainWindow::instrument_name_changed
+Line 4642 
 void MainWindow::instrument_name_changed
      }
  }
+ bool MainWindow::instrument_row_visible(const Gtk::TreeModel::const_iterator& iter) {
+     if (!iter)
+         return true;
+     Glib::ustring pattern = m_searchText.get_text().lowercase();
+     trim(pattern);
+     if (pattern.empty()) return true;
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+     //HACK: on GTKMM4 development branch const_iterator cannot be easily converted to iterator, probably going to be fixed before final GTKMM4 release though.
+     Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);
+ #else
+     Gtk::TreeModel::Row row = *iter;
+ #endif
+     Glib::ustring name = row[m_Columns.m_col_name];
+     name = name.lowercase();
+     std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);
+     for (int t = 0; t < tokens.size(); ++t)
+         if (name.find(tokens[t]) == Glib::ustring::npos)
+             return false;
+     return true;
+ }
  void MainWindow::on_action_combine_instruments() {
      CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file);
+     // take over selection from instruments list view for the combine dialog's
+     // list view as pre-selection
+     std::set<int> indeces;
+     {
+         Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
+         std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
+         for (int r = 0; r < rows.size(); ++r) {
+             Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);
+             if (it) {
+                 Gtk::TreeModel::Row row = *it;
+                 int index = row[m_Columns.m_col_nr];
+                 indeces.insert(index);
+             }
+         }
+     }
+     d->setSelectedInstruments(indeces);
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      d->show_all();
-     d->resize(500, 400);
+ #else
+     d->show();
+ #endif
      d->run();
      if (d->fileWasChanged()) {
          // update GUI with new instrument just created
-Line 3562 
 void MainWindow::on_action_view_referenc
+Line 4715 
 void MainWindow::on_action_view_referenc
      d->dimension_region_selected.connect(
          sigc::mem_fun(*this, &MainWindow::select_dimension_region)
      );
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      d->show_all();
+ #else
+     d->show();
+ #endif
      d->resize(500, 400);
      d->run();
      delete d;
-Line 3646 
 void MainWindow::mergeFiles(const std::v
+Line 4803 
 void MainWindow::mergeFiles(const std::v
              Glib::filename_display_basename(this->filename) + "' ...",
              *this
          );
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
          progress_dialog->show_all();
+ #else
+         progress_dialog->show();
+ #endif
          saver = new Saver(this->file); //FIXME: memory leak!
          saver->signal_progress().connect(
              sigc::mem_fun(*this, &MainWindow::on_saver_progress));
-Line 3673 
 void MainWindow::on_action_merge_files()
+Line 4834 
 void MainWindow::on_action_merge_files()
      }
      Gtk::FileChooserDialog dialog(*this, _("Merge .gig files"));
+ #if HAS_GTKMM_STOCK
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ #else
+     dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+ #endif
      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
-Line 3690 
 void MainWindow::on_action_merge_files()
+Line 4855 
 void MainWindow::on_action_merge_files()
      dialog.set_select_multiple(true);
      // show warning in the file picker dialog
-     Gtk::HBox descriptionArea;
+     HBox descriptionArea;
      descriptionArea.set_spacing(15);
      Gtk::Image warningIcon;
      warningIcon.set_from_icon_name("dialog-warning",
-Line 3713 
 void MainWindow::on_action_merge_files()
+Line 4878 
 void MainWindow::on_action_merge_files()
          "will accordingly be stored separately in the target .gig file!"
      ));
      descriptionArea.pack_start(description);
+ #if USE_GTKMM_BOX
+ # warning No description area implemented for dialog on GTKMM 3
+ #else
      dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
+ #endif
+ #if HAS_GTKMM_SHOW_ALL_CHILDREN
      descriptionArea.show_all();
+ #else
+     descriptionArea.show();
+ #endif
      if (dialog.run() == Gtk::RESPONSE_OK) {
          printf("on_action_merge_files self=%p\n",
-Line 3750 
 void MainWindow::set_file_is_shared(bool
+Line 4923 
 void MainWindow::set_file_is_shared(bool
      }
      {
+ #if USE_GTKMM_BUILDER
+         m_actionToggleSyncSamplerSelection->property_enabled() = b;
+ #else
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
              uiManager->get_widget("/MenuBar/MenuSettings/SyncSamplerInstrumentSelection"));
          if (item) item->set_sensitive(b);
+ #endif
      }
  }
-Line 3800 
 void MainWindow::show_scripts_tab() {
+Line 4977 
 void MainWindow::show_scripts_tab() {
      m_TreeViewNotebook.set_current_page(2);
  }
+ void MainWindow::select_instrument_by_dir(int dir) {
+     if (!file) return;
+     gig::Instrument* pInstrument = get_instrument();
+     if (!pInstrument) {
+         select_instrument( file->GetInstrument(0) );
+         return;
+     }
+     for (int i = 0; file->GetInstrument(i); ++i) {
+         if (file->GetInstrument(i) == pInstrument) {
+             select_instrument( file->GetInstrument(i + dir) );
+             return;
+         }
+     }
+ }
+ void MainWindow::select_prev_instrument() {
+     select_instrument_by_dir(-1);
+ }
+ void MainWindow::select_next_instrument() {
+     select_instrument_by_dir(1);
+ }
  void MainWindow::select_prev_region() {
      m_RegionChooser.select_prev_region();
  }
-Line 3886 
 void MainWindow::updateClipboardPasteAva
+Line 5086 
 void MainWindow::updateClipboardPasteAva
  void MainWindow::updateClipboardCopyAvailable() {
      bool bDimensionRegionCopyIsPossible = m_DimRegionChooser.get_main_dimregion();
+ #if USE_GTKMM_BUILDER
+     m_actionCopyDimRgn->property_enabled() = bDimensionRegionCopyIsPossible;
+ #else
      static_cast<Gtk::MenuItem*>(
          uiManager->get_widget("/MenuBar/MenuEdit/CopyDimRgn")
      )->set_sensitive(bDimensionRegionCopyIsPossible);
+ #endif
  }
+ #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
+ void MainWindow::on_clipboard_owner_change(Gdk::EventOwnerChange& event) {
+ #else
  void MainWindow::on_clipboard_owner_change(GdkEventOwnerChange* event) {
+ #endif
      updateClipboardPasteAvailable();
  }
-Line 3958 
 void MainWindow::on_clipboard_received_t
+Line 5166 
 void MainWindow::on_clipboard_received_t
          std::find(targets.begin(), targets.end(),
                    CLIPBOARD_DIMENSIONREGION_TARGET) != targets.end();
+ #if USE_GTKMM_BUILDER
+     m_actionPasteDimRgn->property_enabled() = bDimensionRegionPasteIsPossible;
+     m_actionAdjustClipboard->property_enabled() = bDimensionRegionPasteIsPossible;
+ #else
      static_cast<Gtk::MenuItem*>(
          uiManager->get_widget("/MenuBar/MenuEdit/PasteDimRgn")
      )->set_sensitive(bDimensionRegionPasteIsPossible);
-Line 3965 
 void MainWindow::on_clipboard_received_t
+Line 5177 
 void MainWindow::on_clipboard_received_t
      static_cast<Gtk::MenuItem*>(
          uiManager->get_widget("/MenuBar/MenuEdit/AdjustClipboard")
      )->set_sensitive(bDimensionRegionPasteIsPossible);
+ #endif
  }
  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {

 Legend:



Removed from v.3179
 


changed lines


 
Added in v.3408
 Legend:



Removed from v.3179
 


changed lines


 
Added in v.3408
-Removed from v.3179
+Added in v.3408

	ViewVC Help
Powered by ViewVC