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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3637 by schoenebeck, Thu Oct 24 13:12:52 2019 UTC revision 3807 by schoenebeck, Fri Aug 14 10:54:44 2020 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2019 Andreas Persson   * Copyright (C) 2006-2020 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 96  MainWindow::MainWindow() : Line 96  MainWindow::MainWindow() :
96    
97      if (!Settings::singleton()->autoRestoreWindowDimension) {      if (!Settings::singleton()->autoRestoreWindowDimension) {
98  #if GTKMM_MAJOR_VERSION >= 3  #if GTKMM_MAJOR_VERSION >= 3
99          set_default_size(960, 600);          set_default_size(1010, -1);
100  #else  #else
101          set_default_size(865, 600);          set_default_size(915, -1);
102  #endif  #endif
103          set_position(Gtk::WIN_POS_CENTER);          set_position(Gtk::WIN_POS_CENTER);
104      }      }
# Line 106  MainWindow::MainWindow() : Line 106  MainWindow::MainWindow() :
106      add(m_VBox);      add(m_VBox);
107    
108      // Handle selection      // Handle selection
109      m_TreeView.get_selection()->signal_changed().connect(      m_TreeViewInstruments.get_selection()->signal_changed().connect(
110          sigc::mem_fun(*this, &MainWindow::on_sel_change));          sigc::mem_fun(*this, &MainWindow::on_sel_change));
111    
112      // m_TreeView.set_reorderable();      // m_TreeViewInstruments.set_reorderable();
113    
114  #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  #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
115      m_TreeView.signal_button_press_event().connect(      m_TreeViewInstruments.signal_button_press_event().connect(
116          sigc::mem_fun(*this, &MainWindow::on_button_release));          sigc::mem_fun(*this, &MainWindow::on_button_release));
117  #else  #else
118      m_TreeView.signal_button_press_event().connect_notify(      m_TreeViewInstruments.signal_button_press_event().connect_notify(
119          sigc::mem_fun(*this, &MainWindow::on_button_release));          sigc::mem_fun(*this, &MainWindow::on_button_release));
120  #endif  #endif
121    
122      // Add the TreeView tab, inside a ScrolledWindow, with the button underneath:      // Add the TreeView tab, inside a ScrolledWindow, with the button underneath:
123      m_ScrolledWindow.add(m_TreeView);      m_ScrolledWindow.add(m_TreeViewInstruments);
124  //    m_ScrolledWindow.set_size_request(200, 600);  //    m_ScrolledWindow.set_size_request(200, 600);
125      m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);      m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
126    
# Line 451  MainWindow::MainWindow() : Line 451  MainWindow::MainWindow() :
451          m_actionGroup->add_action_bool("Statusbar", sigc::mem_fun(*this, &MainWindow::on_action_view_status_bar), true);          m_actionGroup->add_action_bool("Statusbar", sigc::mem_fun(*this, &MainWindow::on_action_view_status_bar), true);
452      m_actionToggleRestoreWinDim =      m_actionToggleRestoreWinDim =
453          m_actionGroup->add_action_bool("AutoRestoreWinDim", sigc::mem_fun(*this, &MainWindow::on_auto_restore_win_dim), Settings::singleton()->autoRestoreWindowDimension);          m_actionGroup->add_action_bool("AutoRestoreWinDim", sigc::mem_fun(*this, &MainWindow::on_auto_restore_win_dim), Settings::singleton()->autoRestoreWindowDimension);
454        m_actionInstrDoubleClickOpensProps =
455            m_actionGroup->add_action_bool(
456                "OpenInstrPropsByDoubleClick",
457                sigc::mem_fun(*this, &MainWindow::on_instr_double_click_opens_props),
458                Settings::singleton()->instrumentDoubleClickOpensProps
459            );
460      m_actionToggleShowTooltips = m_actionGroup->add_action_bool(      m_actionToggleShowTooltips = m_actionGroup->add_action_bool(
461          "ShowTooltips", sigc::mem_fun(*this, &MainWindow::on_action_show_tooltips),          "ShowTooltips", sigc::mem_fun(*this, &MainWindow::on_action_show_tooltips),
462          Settings::singleton()->showTooltips          Settings::singleton()->showTooltips
# Line 478  MainWindow::MainWindow() : Line 484  MainWindow::MainWindow() :
484                           *this, &MainWindow::on_auto_restore_win_dim));                           *this, &MainWindow::on_auto_restore_win_dim));
485    
486      toggle_action =      toggle_action =
487            Gtk::ToggleAction::create("OpenInstrPropsByDoubleClick", _("Instrument Properties by Double Click"));
488        toggle_action->set_active(Settings::singleton()->instrumentDoubleClickOpensProps);
489        actionGroup->add(toggle_action,
490                         sigc::mem_fun(
491                             *this, &MainWindow::on_instr_double_click_opens_props));
492    
493        toggle_action =
494          Gtk::ToggleAction::create("ShowTooltips", _("Tooltips for Beginners"));          Gtk::ToggleAction::create("ShowTooltips", _("Tooltips for Beginners"));
495      toggle_action->set_active(Settings::singleton()->showTooltips);      toggle_action->set_active(Settings::singleton()->showTooltips);
496      actionGroup->add(      actionGroup->add(
# Line 509  MainWindow::MainWindow() : Line 522  MainWindow::MainWindow() :
522          "DupInstrument", sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          "DupInstrument", sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
523      );      );
524      m_actionGroup->add_action(      m_actionGroup->add_action(
525            "MoveInstrument", sigc::mem_fun(*this, &MainWindow::on_action_move_instr)
526        );
527        m_actionGroup->add_action(
528          "CombInstruments", sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)          "CombInstruments", sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
529      );      );
530      m_actionGroup->add_action(      m_actionGroup->add_action(
# Line 530  MainWindow::MainWindow() : Line 546  MainWindow::MainWindow() :
546          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
547      );      );
548      actionGroup->add(      actionGroup->add(
549            Gtk::Action::create("MoveInstrument", _("Move _Instrument To ...")),
550            Gtk::AccelKey(GDK_KEY_i, primaryModifierKey),
551            sigc::mem_fun(*this, &MainWindow::on_action_move_instr)
552        );
553        actionGroup->add(
554          Gtk::Action::create("CombInstruments", _("_Combine Instruments ...")),          Gtk::Action::create("CombInstruments", _("_Combine Instruments ...")),
555          Gtk::AccelKey(GDK_KEY_j, primaryModifierKey),          Gtk::AccelKey(GDK_KEY_j, primaryModifierKey),
556          sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)          sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
# Line 885  MainWindow::MainWindow() : Line 906  MainWindow::MainWindow() :
906          "          <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"          "          <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"
907          "          <attribute name='action'>AppMenu.DupInstrument</attribute>"          "          <attribute name='action'>AppMenu.DupInstrument</attribute>"
908          "        </item>"          "        </item>"
909            "        <item id='MoveInstrument'>"
910            "          <attribute name='label' translatable='yes'>Move Instrument To ...</attribute>"
911            "          <attribute name='action'>AppMenu.MoveInstrument</attribute>"
912            "        </item>"
913          "        <item id='CombInstruments'>"          "        <item id='CombInstruments'>"
914          "          <attribute name='label' translatable='yes'>Combine Instrument</attribute>"          "          <attribute name='label' translatable='yes'>Combine Instrument</attribute>"
915          "          <attribute name='action'>AppMenu.CombInstruments</attribute>"          "          <attribute name='action'>AppMenu.CombInstruments</attribute>"
# Line 935  MainWindow::MainWindow() : Line 960  MainWindow::MainWindow() :
960          "          <attribute name='label' translatable='yes'>Auto restore Window Dimensions</attribute>"          "          <attribute name='label' translatable='yes'>Auto restore Window Dimensions</attribute>"
961          "          <attribute name='action'>AppMenu.AutoRestoreWinDim</attribute>"          "          <attribute name='action'>AppMenu.AutoRestoreWinDim</attribute>"
962          "        </item>"          "        </item>"
963            "        <item id='OpenInstrPropsByDoubleClick'>"
964            "          <attribute name='label' translatable='yes'>Instrument Properties by Double Click</attribute>"
965            "          <attribute name='action'>AppMenu.OpenInstrPropsByDoubleClick</attribute>"
966            "        </item>"
967          "      </section>"          "      </section>"
968          "      <section>"          "      <section>"
969          "        <item id='RefreshAll'>"          "        <item id='RefreshAll'>"
# Line 1010  MainWindow::MainWindow() : Line 1039  MainWindow::MainWindow() :
1039          "        <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"          "        <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"
1040          "        <attribute name='action'>AppMenu.DupInstrument</attribute>"          "        <attribute name='action'>AppMenu.DupInstrument</attribute>"
1041          "      </item>"          "      </item>"
1042            "      <item id='MoveInstrument'>"
1043            "        <attribute name='label' translatable='yes'>Move Instrument To ...</attribute>"
1044            "        <attribute name='action'>AppMenu.MoveInstrument</attribute>"
1045            "      </item>"
1046          "      <item id='CombInstruments'>"          "      <item id='CombInstruments'>"
1047          "        <attribute name='label' translatable='yes'>Combine Instruments</attribute>"          "        <attribute name='label' translatable='yes'>Combine Instruments</attribute>"
1048          "        <attribute name='action'>AppMenu.CombInstruments</attribute>"          "        <attribute name='action'>AppMenu.CombInstruments</attribute>"
# Line 1148  MainWindow::MainWindow() : Line 1181  MainWindow::MainWindow() :
1181          "      <menu action='AssignScripts'/>"          "      <menu action='AssignScripts'/>"
1182          "      <menuitem action='AddInstrument'/>"          "      <menuitem action='AddInstrument'/>"
1183          "      <menuitem action='DupInstrument'/>"          "      <menuitem action='DupInstrument'/>"
1184            "      <menuitem action='MoveInstrument'/>"
1185          "      <menuitem action='CombInstruments'/>"          "      <menuitem action='CombInstruments'/>"
1186          "      <separator/>"          "      <separator/>"
1187          "      <menuitem action='RemoveInstrument'/>"          "      <menuitem action='RemoveInstrument'/>"
# Line 1163  MainWindow::MainWindow() : Line 1197  MainWindow::MainWindow() :
1197          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
1198          "      <menuitem action='ShowTooltips'/>"          "      <menuitem action='ShowTooltips'/>"
1199          "      <menuitem action='AutoRestoreWinDim'/>"          "      <menuitem action='AutoRestoreWinDim'/>"
1200            "      <menuitem action='OpenInstrPropsByDoubleClick'/>"
1201          "      <separator/>"          "      <separator/>"
1202          "      <menuitem action='RefreshAll'/>"          "      <menuitem action='RefreshAll'/>"
1203          "    </menu>"          "    </menu>"
# Line 1186  MainWindow::MainWindow() : Line 1221  MainWindow::MainWindow() :
1221          "    <menuitem action='ScriptSlots'/>"          "    <menuitem action='ScriptSlots'/>"
1222          "    <menuitem action='AddInstrument'/>"          "    <menuitem action='AddInstrument'/>"
1223          "    <menuitem action='DupInstrument'/>"          "    <menuitem action='DupInstrument'/>"
1224            "    <menuitem action='MoveInstrument'/>"
1225          "    <menuitem action='CombInstruments'/>"          "    <menuitem action='CombInstruments'/>"
1226          "    <separator/>"          "    <separator/>"
1227          "    <menuitem action='RemoveInstrument'/>"          "    <menuitem action='RemoveInstrument'/>"
# Line 1286  MainWindow::MainWindow() : Line 1322  MainWindow::MainWindow() :
1322      }      }
1323      {      {
1324          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
1325                uiManager->get_widget("/MenuBar/MenuView/OpenInstrPropsByDoubleClick"));
1326            item->set_tooltip_text(_("If checked, double clicking an instrument opens its properties dialog."));
1327        }
1328        {
1329            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
1330              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
1331          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));
1332      }      }
# Line 1342  MainWindow::MainWindow() : Line 1383  MainWindow::MainWindow() :
1383    
1384    
1385      // Create the Tree model:      // Create the Tree model:
1386      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refInstrumentsTreeModel = Gtk::ListStore::create(m_InstrumentsModel);
1387      m_refTreeModelFilter = Gtk::TreeModelFilter::create(m_refTreeModel);      m_refInstrumentsModelFilter = Gtk::TreeModelFilter::create(m_refInstrumentsTreeModel);
1388      m_refTreeModelFilter->set_visible_func(      m_refInstrumentsModelFilter->set_visible_func(
1389          sigc::mem_fun(*this, &MainWindow::instrument_row_visible)          sigc::mem_fun(*this, &MainWindow::instrument_row_visible)
1390      );      );
1391      m_TreeView.set_model(m_refTreeModelFilter);      m_TreeViewInstruments.set_model(m_refInstrumentsModelFilter);
1392    
1393      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);      m_TreeViewInstruments.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
1394      m_TreeView.set_has_tooltip(true);      m_TreeViewInstruments.set_has_tooltip(true);
1395      m_TreeView.signal_query_tooltip().connect(      m_TreeViewInstruments.signal_query_tooltip().connect(
1396          sigc::mem_fun(*this, &MainWindow::onQueryTreeViewTooltip)          sigc::mem_fun(*this, &MainWindow::onQueryTreeViewTooltip)
1397      );      );
1398      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refInstrumentsTreeModel->signal_row_changed().connect(
1399          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
1400      );      );
1401    
1402      // Add the TreeView's view columns:      // Add the TreeView's view columns:
1403      m_TreeView.append_column(_("Nr"), m_Columns.m_col_nr);      m_TreeViewInstruments.append_column(_("Nr"), m_InstrumentsModel.m_col_nr);
1404      m_TreeView.append_column_editable(_("Instrument"), m_Columns.m_col_name);      m_TreeViewInstruments.append_column_editable(_("Instrument"), m_InstrumentsModel.m_col_name);
1405      m_TreeView.append_column(_("Scripts"), m_Columns.m_col_scripts);      m_TreeViewInstruments.append_column(_("Scripts"), m_InstrumentsModel.m_col_scripts);
1406      m_TreeView.set_headers_visible(true);      m_TreeViewInstruments.set_headers_visible(true);
1407            
1408      // establish drag&drop within the instrument tree view, allowing to reorder      // establish drag&drop within the instrument tree view, allowing to reorder
1409      // the sequence of instruments within the gig file      // the sequence of instruments within the gig file
1410      {      {
1411          std::vector<Gtk::TargetEntry> drag_target_instrument;          std::vector<Gtk::TargetEntry> drag_target_instrument;
1412          drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument"));          drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument"));
1413          m_TreeView.drag_source_set(drag_target_instrument);          m_TreeViewInstruments.drag_source_set(drag_target_instrument);
1414          m_TreeView.drag_dest_set(drag_target_instrument);          m_TreeViewInstruments.drag_dest_set(drag_target_instrument);
1415          m_TreeView.signal_drag_begin().connect(          m_TreeViewInstruments.signal_drag_begin().connect(
1416              sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_begin)              sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_begin)
1417          );          );
1418          m_TreeView.signal_drag_data_get().connect(          m_TreeViewInstruments.signal_drag_data_get().connect(
1419              sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_data_get)              sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_data_get)
1420          );          );
1421          m_TreeView.signal_drag_data_received().connect(          m_TreeViewInstruments.signal_drag_data_received().connect(
1422              sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drop_drag_data_received)              sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drop_drag_data_received)
1423          );          );
1424      }      }
# Line 1508  MainWindow::MainWindow() : Line 1549  MainWindow::MainWindow() :
1549          sigc::mem_fun(*this, &MainWindow::select_sample)          sigc::mem_fun(*this, &MainWindow::select_sample)
1550      );      );
1551    
1552        dimreg_edit.editScriptSlotsButton.signal_clicked().connect(
1553            sigc::mem_fun(*this, &MainWindow::show_script_slots)
1554        );
1555        // simply sending the same signal (pair) to the sampler on 'patch' variable
1556        // changes as the already existing signal (pair) when the user edits the
1557        // script's source code, because the sampler would reload the source code
1558        // and the 'patch' variables from the instrument on this signal anyway
1559        dimreg_edit.scriptVars.signal_vars_to_be_changed.connect(
1560            [this](gig::Instrument* instr) {
1561                for (int i = 0; i < instr->ScriptSlotCount(); ++i) {
1562                    gig::Script* script = instr->GetScriptOfSlot(i);
1563                    signal_script_to_be_changed.emit(script);
1564                }
1565            }
1566        );
1567        dimreg_edit.scriptVars.signal_vars_changed.connect(
1568            [this](gig::Instrument* instr) {
1569                for (int i = 0; i < instr->ScriptSlotCount(); ++i) {
1570                    gig::Script* script = instr->GetScriptOfSlot(i);
1571                    signal_script_changed.emit(script);
1572                }
1573            }
1574        );
1575        dimreg_edit.scriptVars.signal_edit_script.connect(
1576            [this](gig::Script* script) {
1577                editScript(script);
1578            }
1579        );
1580    
1581      m_RegionChooser.signal_instrument_struct_to_be_changed().connect(      m_RegionChooser.signal_instrument_struct_to_be_changed().connect(
1582          sigc::hide(          sigc::hide(
1583              sigc::bind(              sigc::bind(
# Line 1550  MainWindow::MainWindow() : Line 1620  MainWindow::MainWindow() :
1620          sigc::mem_fun(*this, &MainWindow::update_dimregs));          sigc::mem_fun(*this, &MainWindow::update_dimregs));
1621    
1622      m_searchText.signal_changed().connect(      m_searchText.signal_changed().connect(
1623          sigc::mem_fun(*m_refTreeModelFilter.operator->(), &Gtk::TreeModelFilter::refilter)          sigc::mem_fun(*m_refInstrumentsModelFilter.operator->(), &Gtk::TreeModelFilter::refilter)
1624      );      );
1625    
1626      file = 0;      file = 0;
# Line 1794  void MainWindow::region_changed() Line 1864  void MainWindow::region_changed()
1864    
1865  gig::Instrument* MainWindow::get_instrument()  gig::Instrument* MainWindow::get_instrument()
1866  {  {
1867      gig::Instrument* instrument = 0;      gig::Instrument* instrument = NULL;
1868      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();  
1869        // get indeces of visual selection
1870        std::vector<Gtk::TreeModel::Path> rows = m_TreeViewInstruments.get_selection()->get_selected_rows();
1871      if (rows.empty()) return NULL;      if (rows.empty()) return NULL;
1872    
1873        // convert index of visual selection (i.e. if filtered) to index of model
1874        Gtk::TreeModel::Path path = m_refInstrumentsModelFilter->convert_path_to_child_path(rows[0]);
1875        if (!path) return NULL;
1876    
1877      //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.      //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.
1878      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(path);
1879      if (it) {      if (it) {
1880          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
1881          instrument = row[m_Columns.m_col_instr];          instrument = row[m_InstrumentsModel.m_col_instr];
1882      }      }
1883      return instrument;      return instrument;
1884  }  }
# Line 1866  void MainWindow::on_sel_change() Line 1943  void MainWindow::on_sel_change()
1943  {  {
1944  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
1945      // select item in instrument menu      // select item in instrument menu
1946      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = m_TreeViewInstruments.get_selection()->get_selected_rows();
1947      if (!rows.empty()) {      if (!rows.empty()) {
1948          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
1949          if (it) {          if (it) {
1950              Gtk::TreePath path(it);              Gtk::TreePath path(it);
1951              int index = path[0];              int index = path[0];
# Line 1881  void MainWindow::on_sel_change() Line 1958  void MainWindow::on_sel_change()
1958    
1959      updateScriptListOfMenu();      updateScriptListOfMenu();
1960    
1961      m_RegionChooser.set_instrument(get_instrument());      gig::Instrument* instr = get_instrument();
1962    
1963        m_RegionChooser.set_instrument(instr);
1964        dimreg_edit.scriptVars.setInstrument(instr, true/*force update*/);
1965    
1966      if (Settings::singleton()->syncSamplerInstrumentSelection) {      if (Settings::singleton()->syncSamplerInstrumentSelection) {
1967          switch_sampler_instrument_signal.emit(get_instrument());          switch_sampler_instrument_signal.emit(get_instrument());
# Line 2073  void MainWindow::__clear() { Line 2153  void MainWindow::__clear() {
2153      // forget all samples that ought to be imported      // forget all samples that ought to be imported
2154      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
2155      // clear the samples and instruments tree views      // clear the samples and instruments tree views
2156      m_refTreeModel->clear();      m_refInstrumentsTreeModel->clear();
2157      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
2158      m_refScriptsTreeModel->clear();      m_refScriptsTreeModel->clear();
2159  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 2090  void MainWindow::__clear() { Line 2170  void MainWindow::__clear() {
2170    
2171  void MainWindow::__refreshEntireGUI() {  void MainWindow::__refreshEntireGUI() {
2172      // clear the samples and instruments tree views      // clear the samples and instruments tree views
2173      m_refTreeModel->clear();      m_refInstrumentsTreeModel->clear();
2174      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
2175      m_refScriptsTreeModel->clear();      m_refScriptsTreeModel->clear();
2176  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 2263  void MainWindow::load_instrument(gig::In Line 2343  void MainWindow::load_instrument(gig::In
2343      {      {
2344          if (instrument == instr) {          if (instrument == instr) {
2345              // select item in "instruments" tree view              // select item in "instruments" tree view
2346              m_TreeView.get_selection()->select(Gtk::TreePath(ToString(i)));              m_TreeViewInstruments.get_selection()->select(Gtk::TreePath(ToString(i)));
2347              // make sure the selected item in the "instruments" tree view is              // make sure the selected item in the "instruments" tree view is
2348              // visible (scroll to it)              // visible (scroll to it)
2349              m_TreeView.scroll_to_row(Gtk::TreePath(ToString(i)));              m_TreeViewInstruments.scroll_to_row(Gtk::TreePath(ToString(i)));
2350  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
2351              // select item in instrument menu              // select item in instrument menu
2352              {              {
# Line 2630  void MainWindow::on_show_tooltips_change Line 2710  void MainWindow::on_show_tooltips_change
2710      dimreg_stereo.set_has_tooltip(b);      dimreg_stereo.set_has_tooltip(b);
2711    
2712      // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell      // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell
2713      //m_TreeView.set_has_tooltip(b);      //m_TreeViewInstruments.set_has_tooltip(b);
2714    
2715      m_TreeViewSamples.set_has_tooltip(b);      m_TreeViewSamples.set_has_tooltip(b);
2716      m_TreeViewScripts.set_has_tooltip(b);      m_TreeViewScripts.set_has_tooltip(b);
# Line 2851  InstrumentProps::InstrumentProps() : Line 2931  InstrumentProps::InstrumentProps() :
2931      eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
2932      eMIDIBank(_("MIDI bank"), 0, 16383),      eMIDIBank(_("MIDI bank"), 0, 16383),
2933      eMIDIProgram(_("MIDI program")),      eMIDIProgram(_("MIDI program")),
2934      eAttenuation(_("Attenuation"), 0, 96, 0, 1),      eAttenuation(_("Attenuation (dB)"), -96, +96, 0, 1),
     eGainPlus6(_("Gain +6dB"), eAttenuation, -6),  
2935      eEffectSend(_("Effect send"), 0, 65535),      eEffectSend(_("Effect send"), 0, 65535),
2936      eFineTune(_("Fine tune"), -8400, 8400),      eFineTune(_("Fine tune"), -8400, 8400),
2937      ePitchbendRange(_("Pitchbend range"), 0, 48),      ePitchbendRange(_("Pitchbend range (halftones)"), 0, 48),
2938      ePianoReleaseMode(_("Piano release mode")),      ePianoReleaseMode(_("Piano release mode")),
2939      eDimensionKeyRangeLow(_("Keyswitching range low")),      eDimensionKeyRangeLow(_("Keyswitching range low")),
2940      eDimensionKeyRangeHigh(_("Keyswitching range high")),      eDimensionKeyRangeHigh(_("Keyswitching range high")),
# Line 2901  InstrumentProps::InstrumentProps() : Line 2980  InstrumentProps::InstrumentProps() :
2980      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
2981      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
2982      connect(eAttenuation, &gig::Instrument::Attenuation);      connect(eAttenuation, &gig::Instrument::Attenuation);
     connect(eGainPlus6, &gig::Instrument::Attenuation);  
2983      connect(eEffectSend, &gig::Instrument::EffectSend);      connect(eEffectSend, &gig::Instrument::EffectSend);
2984      connect(eFineTune, &gig::Instrument::FineTune);      connect(eFineTune, &gig::Instrument::FineTune);
2985      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
# Line 2969  InstrumentProps::InstrumentProps() : Line 3047  InstrumentProps::InstrumentProps() :
3047      table.add(eMIDIBank);      table.add(eMIDIBank);
3048      table.add(eMIDIProgram);      table.add(eMIDIProgram);
3049      table.add(eAttenuation);      table.add(eAttenuation);
     table.add(eGainPlus6);  
3050      table.add(eEffectSend);      table.add(eEffectSend);
3051      table.add(eFineTune);      table.add(eFineTune);
3052      table.add(ePitchbendRange);      table.add(ePitchbendRange);
# Line 3385  void MainWindow::updateSampleRefCountMap Line 3462  void MainWindow::updateSampleRefCountMap
3462    
3463  bool MainWindow::onQueryTreeViewTooltip(int x, int y, bool keyboardTip, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {  bool MainWindow::onQueryTreeViewTooltip(int x, int y, bool keyboardTip, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
3464      Gtk::TreeModel::iterator iter;      Gtk::TreeModel::iterator iter;
3465      if (!m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter)) {      if (!m_TreeViewInstruments.get_tooltip_context_iter(x, y, keyboardTip, iter)) {
3466          return false;          return false;
3467      }      }
3468      Gtk::TreeModel::Path path(iter);      Gtk::TreeModel::Path path(iter);
# Line 3395  bool MainWindow::onQueryTreeViewTooltip( Line 3472  bool MainWindow::onQueryTreeViewTooltip(
3472      {      {
3473          Gtk::TreeModel::Path path; // unused          Gtk::TreeModel::Path path; // unused
3474          int cellX, cellY; // unused          int cellX, cellY; // unused
3475          m_TreeView.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);          m_TreeViewInstruments.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);
3476      }      }
3477      Gtk::TreeViewColumn* scriptsColumn = m_TreeView.get_column(2);      Gtk::TreeViewColumn* scriptsColumn = m_TreeViewInstruments.get_column(2);
3478      if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...      if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...
3479          // show the script(s) assigned to the hovered instrument as tooltip          // show the script(s) assigned to the hovered instrument as tooltip
3480          tooltip->set_markup( row[m_Columns.m_col_tooltip] );          tooltip->set_markup( row[m_InstrumentsModel.m_col_tooltip] );
3481          m_TreeView.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);          m_TreeViewInstruments.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);
3482      } else {      } else {
3483          // if beginners' tooltips is disabled then don't show the following one          // if beginners' tooltips is disabled then don't show the following one
3484          if (!Settings::singleton()->showTooltips)          if (!Settings::singleton()->showTooltips)
# Line 3411  bool MainWindow::onQueryTreeViewTooltip( Line 3488  bool MainWindow::onQueryTreeViewTooltip(
3488              "Right click here for actions on instruments & MIDI Rules. "              "Right click here for actions on instruments & MIDI Rules. "
3489              "Drag & drop to change the order of instruments."              "Drag & drop to change the order of instruments."
3490          ));          ));
3491          m_TreeView.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);          m_TreeViewInstruments.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);
3492      }      }
3493      return true;      return true;
3494  }  }
# Line 3454  void MainWindow::load_gig(gig::File* gig Line 3531  void MainWindow::load_gig(gig::File* gig
3531          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
3532          const int iScriptSlots = instrument->ScriptSlotCount();          const int iScriptSlots = instrument->ScriptSlotCount();
3533    
3534          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refInstrumentsTreeModel->append();
3535          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
3536          row[m_Columns.m_col_nr] = index;          row[m_InstrumentsModel.m_col_nr] = index;
3537          row[m_Columns.m_col_name] = name;          row[m_InstrumentsModel.m_col_name] = name;
3538          row[m_Columns.m_col_instr] = instrument;          row[m_InstrumentsModel.m_col_instr] = instrument;
3539          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3540          row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
3541    
3542  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
3543          add_instrument_to_menu(name);          add_instrument_to_menu(name);
# Line 3522  void MainWindow::load_gig(gig::File* gig Line 3599  void MainWindow::load_gig(gig::File* gig
3599      file = gig;      file = gig;
3600    
3601      // select the first instrument      // select the first instrument
3602      m_TreeView.get_selection()->select(Gtk::TreePath("0"));      m_TreeViewInstruments.get_selection()->select(Gtk::TreePath("0"));
3603    
3604      instr_props_set_instrument();      instr_props_set_instrument();
3605      gig::Instrument* instrument = get_instrument();      gig::Instrument* instrument = get_instrument();
# Line 3535  bool MainWindow::instr_props_set_instrum Line 3612  bool MainWindow::instr_props_set_instrum
3612  {  {
3613      instrumentProps.signal_name_changed().clear();      instrumentProps.signal_name_changed().clear();
3614    
3615      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = m_TreeViewInstruments.get_selection()->get_selected_rows();
3616      if (rows.empty()) {      if (rows.empty()) {
3617          instrumentProps.hide();          instrumentProps.hide();
3618          return false;          return false;
3619      }      }
3620      //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.      //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.
3621      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
3622      if (it) {      if (it) {
3623          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
3624          gig::Instrument* instrument = row[m_Columns.m_col_instr];          gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3625    
3626          instrumentProps.set_instrument(instrument);          instrumentProps.set_instrument(instrument);
3627    
# Line 3573  void MainWindow::show_instr_props() Line 3650  void MainWindow::show_instr_props()
3650  void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)  void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
3651  {  {
3652      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3653      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
3654    
3655      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3656      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
3657      if (gigname != name) {      if (gigname != name) {
3658          Gtk::TreeModel::Path path(*it);          Gtk::TreeModel::Path path(*it);
3659          const int index = path[0];          const int index = path[0];
3660          row[m_Columns.m_col_name] = gigname;          row[m_InstrumentsModel.m_col_name] = gigname;
3661          row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
3662      }      }
3663  }  }
3664    
# Line 3652  void MainWindow::show_midi_rules() Line 3729  void MainWindow::show_midi_rules()
3729  void MainWindow::show_script_slots() {  void MainWindow::show_script_slots() {
3730      if (!file) return;      if (!file) return;
3731      // get selected instrument      // get selected instrument
3732      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = m_TreeViewInstruments.get_selection()->get_selected_rows();
3733      if (rows.empty()) return;      if (rows.empty()) return;
3734      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
3735      if (!it) return;      if (!it) return;
3736      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3737      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3738      if (!instrument) return;      if (!instrument) return;
3739    
3740      ScriptSlots* window = new ScriptSlots;      ScriptSlots* window = new ScriptSlots;
# Line 3673  void MainWindow::onScriptSlotsModified(g Line 3750  void MainWindow::onScriptSlotsModified(g
3750      if (!pInstrument) return;      if (!pInstrument) return;
3751      const int iScriptSlots = pInstrument->ScriptSlotCount();      const int iScriptSlots = pInstrument->ScriptSlotCount();
3752    
3753      //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!      //NOTE: This is a big mess! Sometimes GTK requires m_TreeViewInstruments.get_model(), here we need m_refInstrumentsModelFilter->get_model(), otherwise accessing children below causes an error!
3754      //Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
3755      Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
3756    
3757      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
3758          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
3759          if (row[m_Columns.m_col_instr] != pInstrument) continue;          if (row[m_InstrumentsModel.m_col_instr] != pInstrument) continue;
3760          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3761          row[m_Columns.m_col_tooltip] = scriptTooltipFor(pInstrument, i);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(pInstrument, i);
3762          break;          break;
3763      }      }
3764    
3765      // causes the sampler to reload the instrument with the new script      // causes the sampler to reload the instrument with the new script
3766      on_sel_change();      on_sel_change();
3767    
3768        // force script 'patch' variables editor ("Script" tab) to be refreshed
3769        dimreg_edit.scriptVars.setInstrument(pInstrument, true/*force update*/);
3770  }  }
3771    
3772  void MainWindow::assignScript(gig::Script* pScript) {  void MainWindow::assignScript(gig::Script* pScript) {
# Line 3767  void MainWindow::on_auto_restore_win_dim Line 3847  void MainWindow::on_auto_restore_win_dim
3847  #endif  #endif
3848  }  }
3849    
3850    void MainWindow::on_instr_double_click_opens_props() {
3851    #if USE_GLIB_ACTION
3852        bool active = false;
3853        m_actionInstrDoubleClickOpensProps->get_state(active);
3854        // for some reason toggle state does not change automatically
3855        active = !active;
3856        m_actionInstrDoubleClickOpensProps->change_state(active);
3857        Settings::singleton()->instrumentDoubleClickOpensProps = active;
3858    #else
3859        Gtk::CheckMenuItem* item =
3860            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/OpenInstrPropsByDoubleClick"));
3861        if (!item) {
3862            std::cerr << "/MenuBar/MenuView/OpenInstrPropsByDoubleClick == NULL\n";
3863            return;
3864        }
3865        Settings::singleton()->instrumentDoubleClickOpensProps = item->get_active();
3866    #endif
3867    }
3868    
3869  void MainWindow::on_save_with_temporary_file() {  void MainWindow::on_save_with_temporary_file() {
3870  #if USE_GLIB_ACTION  #if USE_GLIB_ACTION
3871      bool active = false;      bool active = false;
# Line 3841  bool MainWindow::on_button_release(Gdk:: Line 3940  bool MainWindow::on_button_release(Gdk::
3940  void MainWindow::on_button_release(GdkEventButton* button) {  void MainWindow::on_button_release(GdkEventButton* button) {
3941  #endif  #endif
3942      if (button->type == GDK_2BUTTON_PRESS) {      if (button->type == GDK_2BUTTON_PRESS) {
3943          show_instr_props();          if (Settings::singleton()->instrumentDoubleClickOpensProps)
3944                show_instr_props();
3945      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
3946          // gig v2 files have no midi rules          // gig v2 files have no midi rules
3947          const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);          const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);
# Line 3873  void MainWindow::on_instrument_selection Line 3973  void MainWindow::on_instrument_selection
3973              find(children.begin(), children.end(), item);              find(children.begin(), children.end(), item);
3974          if (it != children.end()) {          if (it != children.end()) {
3975              int index = it - children.begin();              int index = it - children.begin();
3976              m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));              m_TreeViewInstruments.get_selection()->select(Gtk::TreePath(ToString(index)));
3977    
3978              m_RegionChooser.set_instrument(file->GetInstrument(index));              m_RegionChooser.set_instrument(file->GetInstrument(index));
3979          }          }
# Line 3881  void MainWindow::on_instrument_selection Line 3981  void MainWindow::on_instrument_selection
3981  }  }
3982  #endif  #endif
3983    
3984    void MainWindow::on_action_move_instr() {
3985        gig::Instrument* instr = get_instrument();
3986        if (!instr) return;
3987    
3988        int currentIndex = getIndexOf(instr);
3989    
3990        Gtk::Dialog dialog(_("Move Instrument"), true /*modal*/);
3991    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
3992        Gtk::Adjustment adjustment(
3993            currentIndex,
3994            0 /*min*/, file->CountInstruments() - 1 /*max*/
3995        );
3996        Gtk::SpinButton spinBox(adjustment);
3997    #else
3998        Gtk::SpinButton spinBox(
3999            Gtk::Adjustment::create(
4000                currentIndex,
4001                0 /*min*/, file->CountInstruments() - 1 /*max*/
4002            )
4003        );
4004    #endif
4005    #if USE_GTKMM_BOX
4006        dialog.get_content_area()->pack_start(spinBox);
4007    #else
4008        dialog.get_vbox()->pack_start(spinBox);
4009    #endif
4010    #if HAS_GTKMM_STOCK
4011        Gtk::Button* okButton = dialog.add_button(Gtk::Stock::OK, 0);
4012        dialog.add_button(Gtk::Stock::CANCEL, 1);
4013    #else
4014        Gtk::Button* okButton = dialog.add_button(_("_OK"), 0);
4015        dialog.add_button(_("_Cancel"), 1);
4016    #endif
4017        okButton->set_sensitive(false);
4018        // show the dialog at a reasonable screen position
4019        dialog.set_position(Gtk::WIN_POS_MOUSE);
4020        // only enable the 'OK' button if entered new index is not instrument's
4021        // current index already
4022        spinBox.signal_value_changed().connect([&]{
4023            okButton->set_sensitive( spinBox.get_value_as_int() != currentIndex );
4024        });
4025        // usability acceleration: if user hits enter key on the text entry field
4026        // then auto trigger the 'OK' button
4027        spinBox.signal_activate().connect([&]{
4028            if (okButton->get_sensitive())
4029                okButton->clicked();
4030        });
4031    #if HAS_GTKMM_SHOW_ALL_CHILDREN
4032        dialog.show_all_children();
4033    #endif
4034        if (!dialog.run()) { // 'OK' selected ...
4035            int newIndex = spinBox.get_value_as_int();
4036            printf("MOVE TO %d\n", newIndex);
4037            gig::Instrument* dst = file->GetInstrument(newIndex);
4038            instr->MoveTo(dst);
4039            __refreshEntireGUI();
4040            select_instrument(instr);
4041        }
4042    }
4043    
4044  void MainWindow::select_instrument(gig::Instrument* instrument) {  void MainWindow::select_instrument(gig::Instrument* instrument) {
4045      if (!instrument) return;      if (!instrument) return;
4046    
4047      //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!      //NOTE: This is a big mess! Sometimes GTK requires m_refInstrumentsModelFilter->get_model(), here we need m_TreeViewInstruments.get_model(), otherwise treeview selection below causes an error!
4048      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
4049      //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
4050    
4051      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
4052          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
4053          if (row[m_Columns.m_col_instr] == instrument) {          if (row[m_InstrumentsModel.m_col_instr] == instrument) {
4054              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
4055              show_intruments_tab();              show_intruments_tab();
4056              m_TreeView.get_selection()->unselect_all();              m_TreeViewInstruments.get_selection()->unselect_all();
4057                            
4058  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
4059              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
4060              m_TreeView.get_selection()->select(iterSel);              m_TreeViewInstruments.get_selection()->select(iterSel);
4061  #else  #else
4062              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeViewInstruments.get_selection()->select(model->children()[i]);
4063  #endif  #endif
4064              std::vector<Gtk::TreeModel::Path> rows =              std::vector<Gtk::TreeModel::Path> rows =
4065                  m_TreeView.get_selection()->get_selected_rows();                  m_TreeViewInstruments.get_selection()->get_selected_rows();
4066              if (!rows.empty())              if (!rows.empty())
4067                  m_TreeView.scroll_to_row(rows[0]);                  m_TreeViewInstruments.scroll_to_row(rows[0]);
4068              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
4069          }          }
4070      }      }
# Line 3915  bool MainWindow::select_dimension_region Line 4075  bool MainWindow::select_dimension_region
4075      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
4076      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
4077    
4078      //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!      //NOTE: This is a big mess! Sometimes GTK requires m_refInstrumentsModelFilter->get_model(), here we need m_TreeViewInstruments.get_model(), otherwise treeview selection below causes an error!
4079      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
4080      //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
4081    
4082      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
4083          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
4084          if (row[m_Columns.m_col_instr] == pInstrument) {          if (row[m_InstrumentsModel.m_col_instr] == pInstrument) {
4085              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
4086              show_intruments_tab();              show_intruments_tab();
4087              m_TreeView.get_selection()->unselect_all();              m_TreeViewInstruments.get_selection()->unselect_all();
4088  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
4089              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
4090              m_TreeView.get_selection()->select(iterSel);              m_TreeViewInstruments.get_selection()->select(iterSel);
4091  #else  #else
4092              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeViewInstruments.get_selection()->select(model->children()[i]);
4093  #endif  #endif
4094              std::vector<Gtk::TreeModel::Path> rows =              std::vector<Gtk::TreeModel::Path> rows =
4095                  m_TreeView.get_selection()->get_selected_rows();                  m_TreeViewInstruments.get_selection()->get_selected_rows();
4096              if (!rows.empty())              if (!rows.empty())
4097                  m_TreeView.scroll_to_row(rows[0]);                  m_TreeViewInstruments.scroll_to_row(rows[0]);
4098              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
4099    
4100              // select respective region in the region selector              // select respective region in the region selector
# Line 4219  void MainWindow::add_instrument(gig::Ins Line 4379  void MainWindow::add_instrument(gig::Ins
4379    
4380      // update instrument tree view      // update instrument tree view
4381      instrument_name_connection.block();      instrument_name_connection.block();
4382      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refInstrumentsTreeModel->append();
4383      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
4384      const int index = m_refTreeModel->children().size() - 1;      const int index = m_refInstrumentsTreeModel->children().size() - 1;
4385      rowInstr[m_Columns.m_col_nr] = index;      const int iScriptSlots = instrument->ScriptSlotCount();
4386      rowInstr[m_Columns.m_col_name] = name;      rowInstr[m_InstrumentsModel.m_col_nr] = index;
4387      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_InstrumentsModel.m_col_name] = name;
4388      rowInstr[m_Columns.m_col_scripts] = "";      rowInstr[m_InstrumentsModel.m_col_instr] = instrument;
4389      rowInstr[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);      rowInstr[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
4390        rowInstr[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
4391      instrument_name_connection.unblock();      instrument_name_connection.unblock();
4392    
4393  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 4252  void MainWindow::on_action_duplicate_ins Line 4413  void MainWindow::on_action_duplicate_ins
4413    
4414      // retrieve the currently selected instrument      // retrieve the currently selected instrument
4415      // (being the original instrument to be duplicated)      // (being the original instrument to be duplicated)
4416      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
4417      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
4418      for (int r = 0; r < rows.size(); ++r) {      for (int r = 0; r < rows.size(); ++r) {
4419          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
4420          if (it) {          if (it) {
4421              Gtk::TreeModel::Row row = *it;              Gtk::TreeModel::Row row = *it;
4422              gig::Instrument* instrOrig = row[m_Columns.m_col_instr];              gig::Instrument* instrOrig = row[m_InstrumentsModel.m_col_instr];
4423              if (instrOrig) {              if (instrOrig) {
4424                  // duplicate the orginal instrument                  // duplicate the orginal instrument
4425                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
# Line 4285  void MainWindow::on_action_remove_instru Line 4446  void MainWindow::on_action_remove_instru
4446          return;          return;
4447      }      }
4448    
4449      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
4450      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
4451      for (int r = rows.size() - 1; r >= 0; --r) {      for (int r = rows.size() - 1; r >= 0; --r) {
4452          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
4453          if (!it) continue;          if (!it) continue;
4454          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
4455          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_InstrumentsModel.m_col_instr];
4456          try {          try {
4457              Gtk::TreePath path(it);              Gtk::TreePath path(it);
4458              int index = path[0];              int index = path[0];
# Line 4305  void MainWindow::on_action_remove_instru Line 4466  void MainWindow::on_action_remove_instru
4466  #endif  #endif
4467    
4468              // remove row from instruments tree view              // remove row from instruments tree view
4469              m_refTreeModel->erase(it);              m_refInstrumentsTreeModel->erase(it);
4470              // update "Nr" column of all instrument rows              // update "Nr" column of all instrument rows
4471              {              {
4472                  int index = 0;                  int index = 0;
4473                  for (Gtk::TreeModel::iterator it = m_refTreeModel->children().begin();                  for (Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->children().begin();
4474                       it != m_refTreeModel->children().end(); ++it, ++index)                       it != m_refInstrumentsTreeModel->children().end(); ++it, ++index)
4475                  {                  {
4476                      Gtk::TreeModel::Row row = *it;                      Gtk::TreeModel::Row row = *it;
4477                      gig::Instrument* instrument = row[m_Columns.m_col_instr];                      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
4478                      row[m_Columns.m_col_nr] = index;                      row[m_InstrumentsModel.m_col_nr] = index;
4479                      row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);                      row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
4480                  }                  }
4481              }              }
4482    
4483  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
4484              // select another instrument (in gtk3 this is done              // select another instrument (in gtk3 this is done
4485              // automatically)              // automatically)
4486              if (!m_refTreeModel->children().empty()) {              if (!m_refInstrumentsTreeModel->children().empty()) {
4487                  if (index == m_refTreeModel->children().size()) {                  if (index == m_refInstrumentsTreeModel->children().size()) {
4488                      index--;                      index--;
4489                  }                  }
4490                  m_TreeView.get_selection()->select(                  m_TreeViewInstruments.get_selection()->select(
4491                      Gtk::TreePath(ToString(index)));                      Gtk::TreePath(ToString(index)));
4492              }              }
4493  #endif  #endif
# Line 4408  void MainWindow::on_action_edit_script() Line 4569  void MainWindow::on_action_edit_script()
4569      if (!it) return;      if (!it) return;
4570      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
4571      gig::Script* script = row[m_ScriptsModel.m_col_script];      gig::Script* script = row[m_ScriptsModel.m_col_script];
4572      if (!script) return;      editScript(script);
4573    }
4574    
4575    void MainWindow::editScript(gig::Script* script) {
4576        if (!script) return;
4577      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
4578      editor->signal_script_to_be_changed.connect(      editor->signal_script_to_be_changed.connect(
4579          signal_script_to_be_changed.make_slot()          signal_script_to_be_changed.make_slot()
4580      );      );
4581      editor->signal_script_changed.connect(      editor->signal_script_changed.connect([this](gig::Script* script) {
4582          signal_script_changed.make_slot()          // signal to sampler (which will reload the script due to this)
4583      );          signal_script_changed.emit(script);
4584            // force script 'patch' variables editor ("Script" tab) to be refreshed
4585            gig::Instrument* instr = get_instrument();
4586            dimreg_edit.scriptVars.setInstrument(instr, true/*force update*/);
4587        });
4588      editor->setScript(script);      editor->setScript(script);
4589      //editor->reparent(*this);      //editor->reparent(*this);
4590      editor->show();      editor->show();
# Line 4971  void MainWindow::on_instruments_treeview Line 5139  void MainWindow::on_instruments_treeview
5139      // get selected source instrument      // get selected source instrument
5140      gig::Instrument* src = NULL;      gig::Instrument* src = NULL;
5141      {      {
5142          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
5143          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
5144          if (!rows.empty()) {          if (!rows.empty()) {
5145              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);              Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
5146              if (it) {              if (it) {
5147                  Gtk::TreeModel::Row row = *it;                  Gtk::TreeModel::Row row = *it;
5148                  src = row[m_Columns.m_col_instr];                  src = row[m_InstrumentsModel.m_col_instr];
5149              }              }
5150          }          }
5151      }      }
# Line 4999  void MainWindow::on_instruments_treeview Line 5167  void MainWindow::on_instruments_treeview
5167      gig::Instrument* dst = NULL;      gig::Instrument* dst = NULL;
5168      {      {
5169          Gtk::TreeModel::Path path;          Gtk::TreeModel::Path path;
5170          const bool found = m_TreeView.get_path_at_pos(x, y, path);          const bool found = m_TreeViewInstruments.get_path_at_pos(x, y, path);
5171          if (!found) return;          if (!found) return;
5172    
5173          Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path);          Gtk::TreeModel::iterator iter = m_refInstrumentsTreeModel->get_iter(path);
5174          if (!iter) return;          if (!iter) return;
5175          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
5176          dst = row[m_Columns.m_col_instr];          dst = row[m_InstrumentsModel.m_col_instr];
5177      }      }
5178      if (!dst) return;      if (!dst) return;
5179    
# Line 5180  void MainWindow::script_double_clicked(c Line 5348  void MainWindow::script_double_clicked(c
5348      if (!iter) return;      if (!iter) return;
5349      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5350      gig::Script* script = row[m_ScriptsModel.m_col_script];      gig::Script* script = row[m_ScriptsModel.m_col_script];
5351      if (!script) return;      editScript(script);
   
     ScriptEditor* editor = new ScriptEditor;  
     editor->signal_script_to_be_changed.connect(  
         signal_script_to_be_changed.make_slot()  
     );  
     editor->signal_script_changed.connect(  
         signal_script_changed.make_slot()  
     );  
     editor->setScript(script);  
     //editor->reparent(*this);  
     editor->show();  
5352  }  }
5353    
5354  void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path,  void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path,
5355                                           const Gtk::TreeModel::iterator& iter) {                                           const Gtk::TreeModel::iterator& iter) {
5356      if (!iter) return;      if (!iter) return;
5357      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5358      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
5359    
5360  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
5361      // change name in instrument menu      // change name in instrument menu
# Line 5216  void MainWindow::instrument_name_changed Line 5373  void MainWindow::instrument_name_changed
5373  #endif  #endif
5374    
5375      // change name in gig      // change name in gig
5376      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
5377      gig::String gigname(gig_from_utf8(name));      gig::String gigname(gig_from_utf8(name));
5378      if (instrument && instrument->pInfo->Name != gigname) {      if (instrument && instrument->pInfo->Name != gigname) {
5379          instrument->pInfo->Name = gigname;          instrument->pInfo->Name = gigname;
# Line 5244  bool MainWindow::instrument_row_visible( Line 5401  bool MainWindow::instrument_row_visible(
5401  #else  #else
5402      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5403  #endif  #endif
5404      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
5405      name = name.lowercase();      name = name.lowercase();
5406    
5407      std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);      std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);
# Line 5262  void MainWindow::on_action_combine_instr Line 5419  void MainWindow::on_action_combine_instr
5419      // list view as pre-selection      // list view as pre-selection
5420      std::set<int> indeces;      std::set<int> indeces;
5421      {      {
5422          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
5423          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
5424          for (int r = 0; r < rows.size(); ++r) {          for (int r = 0; r < rows.size(); ++r) {
5425              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);              Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
5426              if (it) {              if (it) {
5427                  Gtk::TreeModel::Row row = *it;                  Gtk::TreeModel::Row row = *it;
5428                  int index = row[m_Columns.m_col_nr];                  int index = row[m_InstrumentsModel.m_col_nr];
5429                  indeces.insert(index);                  indeces.insert(index);
5430              }              }
5431          }          }
Legend:
Removed from v.3637  
changed lines
  Added in v.3807
  ViewVC Help
Powered by ViewVC