/[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 3619 by schoenebeck, Tue Oct 1 16:21:28 2019 UTC revision 3810 by schoenebeck, Fri Aug 14 11:45:08 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 1484  MainWindow::MainWindow() : Line 1525  MainWindow::MainWindow() :
1525          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
1526      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
1527          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
1528      propDialog.signal_changed().connect(      sampleProps.signal_changed().connect(
1529            sigc::mem_fun(*this, &MainWindow::file_changed));
1530        fileProps.signal_changed().connect(
1531          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
1532      midiRules.signal_changed().connect(      midiRules.signal_changed().connect(
1533          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
# Line 1506  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 1548  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 1792  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 1864  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]);          // convert index of visual selection (i.e. if filtered) to index of model
1949            Gtk::TreeModel::Path row = m_refInstrumentsModelFilter->convert_path_to_child_path(rows[0]);
1950            Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(row);
1951          if (it) {          if (it) {
1952              Gtk::TreePath path(it);              Gtk::TreePath path(it);
1953              int index = path[0];              int index = path[0];
# Line 1879  void MainWindow::on_sel_change() Line 1960  void MainWindow::on_sel_change()
1960    
1961      updateScriptListOfMenu();      updateScriptListOfMenu();
1962    
1963      m_RegionChooser.set_instrument(get_instrument());      gig::Instrument* instr = get_instrument();
1964    
1965        m_RegionChooser.set_instrument(instr);
1966        dimreg_edit.scriptVars.setInstrument(instr, true/*force update*/);
1967    
1968      if (Settings::singleton()->syncSamplerInstrumentSelection) {      if (Settings::singleton()->syncSamplerInstrumentSelection) {
1969          switch_sampler_instrument_signal.emit(get_instrument());          switch_sampler_instrument_signal.emit(get_instrument());
# Line 2071  void MainWindow::__clear() { Line 2155  void MainWindow::__clear() {
2155      // forget all samples that ought to be imported      // forget all samples that ought to be imported
2156      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
2157      // clear the samples and instruments tree views      // clear the samples and instruments tree views
2158      m_refTreeModel->clear();      m_refInstrumentsTreeModel->clear();
2159      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
2160      m_refScriptsTreeModel->clear();      m_refScriptsTreeModel->clear();
2161  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 2088  void MainWindow::__clear() { Line 2172  void MainWindow::__clear() {
2172    
2173  void MainWindow::__refreshEntireGUI() {  void MainWindow::__refreshEntireGUI() {
2174      // clear the samples and instruments tree views      // clear the samples and instruments tree views
2175      m_refTreeModel->clear();      m_refInstrumentsTreeModel->clear();
2176      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
2177      m_refScriptsTreeModel->clear();      m_refScriptsTreeModel->clear();
2178  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 2261  void MainWindow::load_instrument(gig::In Line 2345  void MainWindow::load_instrument(gig::In
2345      {      {
2346          if (instrument == instr) {          if (instrument == instr) {
2347              // select item in "instruments" tree view              // select item in "instruments" tree view
2348              m_TreeView.get_selection()->select(Gtk::TreePath(ToString(i)));              m_TreeViewInstruments.get_selection()->select(Gtk::TreePath(ToString(i)));
2349              // make sure the selected item in the "instruments" tree view is              // make sure the selected item in the "instruments" tree view is
2350              // visible (scroll to it)              // visible (scroll to it)
2351              m_TreeView.scroll_to_row(Gtk::TreePath(ToString(i)));              m_TreeViewInstruments.scroll_to_row(Gtk::TreePath(ToString(i)));
2352  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
2353              // select item in instrument menu              // select item in instrument menu
2354              {              {
# Line 2603  void MainWindow::__import_queued_samples Line 2687  void MainWindow::__import_queued_samples
2687    
2688  void MainWindow::on_action_file_properties()  void MainWindow::on_action_file_properties()
2689  {  {
2690      propDialog.show();      fileProps.show();
2691      propDialog.deiconify();      fileProps.deiconify();
2692  }  }
2693    
2694  void MainWindow::on_action_warn_user_on_extensions() {  void MainWindow::on_action_warn_user_on_extensions() {
# Line 2628  void MainWindow::on_show_tooltips_change Line 2712  void MainWindow::on_show_tooltips_change
2712      dimreg_stereo.set_has_tooltip(b);      dimreg_stereo.set_has_tooltip(b);
2713    
2714      // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell      // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell
2715      //m_TreeView.set_has_tooltip(b);      //m_TreeViewInstruments.set_has_tooltip(b);
2716    
2717      m_TreeViewSamples.set_has_tooltip(b);      m_TreeViewSamples.set_has_tooltip(b);
2718      m_TreeViewScripts.set_has_tooltip(b);      m_TreeViewScripts.set_has_tooltip(b);
# Line 2675  void MainWindow::on_action_help_about() Line 2759  void MainWindow::on_action_help_about()
2759      dialog.run();      dialog.run();
2760  }  }
2761    
2762  PropDialog::PropDialog()  FilePropDialog::FilePropDialog()
2763      : eFileFormat(_("File Format")),      : eFileFormat(_("File Format")),
2764        eName(_("Name")),        eName(_("Name")),
2765        eCreationDate(_("Creation date")),        eCreationDate(_("Creation date")),
# Line 2709  PropDialog::PropDialog() Line 2793  PropDialog::PropDialog()
2793      set_title(_("File Properties"));      set_title(_("File Properties"));
2794      eName.set_width_chars(50);      eName.set_width_chars(50);
2795    
2796      connect(eFileFormat, &PropDialog::set_FileFormat);      connect(eFileFormat, &FilePropDialog::set_FileFormat);
2797      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
2798      connect(eCreationDate, &DLS::Info::CreationDate);      connect(eCreationDate, &DLS::Info::CreationDate);
2799      connect(eComments, &DLS::Info::Comments);      connect(eComments, &DLS::Info::Comments);
# Line 2770  PropDialog::PropDialog() Line 2854  PropDialog::PropDialog()
2854      quitButton.set_can_default();      quitButton.set_can_default();
2855      quitButton.grab_focus();      quitButton.grab_focus();
2856      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
2857          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &FilePropDialog::hide));
2858    
2859      quitButton.show();      quitButton.show();
2860      vbox.show();      vbox.show();
# Line 2779  PropDialog::PropDialog() Line 2863  PropDialog::PropDialog()
2863  #endif  #endif
2864  }  }
2865    
2866  void PropDialog::set_file(gig::File* file)  void FilePropDialog::set_file(gig::File* file)
2867  {  {
2868      m_file = file;      m_file = file;
2869      update(file->pInfo);      update(file->pInfo);
# Line 2805  void PropDialog::set_file(gig::File* fil Line 2889  void PropDialog::set_file(gig::File* fil
2889      update_model--;      update_model--;
2890  }  }
2891    
2892  void PropDialog::set_FileFormat(int value)  void FilePropDialog::set_FileFormat(int value)
2893  {  {
2894      m_file->pVersion->major = value;      m_file->pVersion->major = value;
2895  }  }
# Line 2849  InstrumentProps::InstrumentProps() : Line 2933  InstrumentProps::InstrumentProps() :
2933      eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
2934      eMIDIBank(_("MIDI bank"), 0, 16383),      eMIDIBank(_("MIDI bank"), 0, 16383),
2935      eMIDIProgram(_("MIDI program")),      eMIDIProgram(_("MIDI program")),
2936      eAttenuation(_("Attenuation"), 0, 96, 0, 1),      eAttenuation(_("Attenuation (dB)"), -96, +96, 0, 1),
     eGainPlus6(_("Gain +6dB"), eAttenuation, -6),  
2937      eEffectSend(_("Effect send"), 0, 65535),      eEffectSend(_("Effect send"), 0, 65535),
2938      eFineTune(_("Fine tune"), -8400, 8400),      eFineTune(_("Fine tune"), -8400, 8400),
2939      ePitchbendRange(_("Pitchbend range"), 0, 48),      ePitchbendRange(_("Pitchbend range (halftones)"), 0, 48),
2940      ePianoReleaseMode(_("Piano release mode")),      ePianoReleaseMode(_("Piano release mode")),
2941      eDimensionKeyRangeLow(_("Keyswitching range low")),      eDimensionKeyRangeLow(_("Keyswitching range low")),
2942      eDimensionKeyRangeHigh(_("Keyswitching range high"))      eDimensionKeyRangeHigh(_("Keyswitching range high")),
2943        table2(2,1),
2944        eName2(_("Name")),
2945        eCreationDate(_("Creation date")),
2946        eComments(_("Comments")),
2947        eProduct(_("Product")),
2948        eCopyright(_("Copyright")),
2949        eArtists(_("Artists")),
2950        eGenre(_("Genre")),
2951        eKeywords(_("Keywords")),
2952        eEngineer(_("Engineer")),
2953        eTechnician(_("Technician")),
2954        eSoftware(_("Software")),
2955        eMedium(_("Medium")),
2956        eSource(_("Source")),
2957        eSourceForm(_("Source form")),
2958        eCommissioned(_("Commissioned")),
2959        eSubject(_("Subject"))
2960  {  {
2961      if (!Settings::singleton()->autoRestoreWindowDimension) {      if (!Settings::singleton()->autoRestoreWindowDimension) {
2962          //set_default_size(470, 390);          //set_default_size(470, 390);
# Line 2865  InstrumentProps::InstrumentProps() : Line 2965  InstrumentProps::InstrumentProps() :
2965    
2966      set_title(_("Instrument Properties"));      set_title(_("Instrument Properties"));
2967    
2968        tabs.append_page(vbox[1], _("Settings"));
2969        tabs.append_page(vbox[2], _("Info"));
2970    
2971      eDimensionKeyRangeLow.set_tip(      eDimensionKeyRangeLow.set_tip(
2972          _("start of the keyboard area which should switch the "          _("start of the keyboard area which should switch the "
2973            "\"keyswitching\" dimension")            "\"keyswitching\" dimension")
# Line 2879  InstrumentProps::InstrumentProps() : Line 2982  InstrumentProps::InstrumentProps() :
2982      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
2983      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
2984      connect(eAttenuation, &gig::Instrument::Attenuation);      connect(eAttenuation, &gig::Instrument::Attenuation);
     connect(eGainPlus6, &gig::Instrument::Attenuation);  
2985      connect(eEffectSend, &gig::Instrument::EffectSend);      connect(eEffectSend, &gig::Instrument::EffectSend);
2986      connect(eFineTune, &gig::Instrument::FineTune);      connect(eFineTune, &gig::Instrument::FineTune);
2987      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
# Line 2889  InstrumentProps::InstrumentProps() : Line 2991  InstrumentProps::InstrumentProps() :
2991    
2992      eName.signal_value_changed().connect(sig_name_changed.make_slot());      eName.signal_value_changed().connect(sig_name_changed.make_slot());
2993    
2994        connect(eName2, &InstrumentProps::set_Name);
2995        connectLambda(eCreationDate, [this](gig::String s) {
2996            m->pInfo->CreationDate = s;
2997        });
2998        connectLambda(eComments, [this](gig::String s) {
2999            m->pInfo->Comments = s;
3000        });
3001        connectLambda(eProduct, [this](gig::String s) {
3002            m->pInfo->Product = s;
3003        });
3004        connectLambda(eCopyright, [this](gig::String s) {
3005            m->pInfo->Copyright = s;
3006        });
3007        connectLambda(eArtists, [this](gig::String s) {
3008            m->pInfo->Artists = s;
3009        });
3010        connectLambda(eGenre, [this](gig::String s) {
3011            m->pInfo->Genre = s;
3012        });
3013        connectLambda(eKeywords, [this](gig::String s) {
3014            m->pInfo->Keywords = s;
3015        });
3016        connectLambda(eEngineer, [this](gig::String s) {
3017            m->pInfo->Engineer = s;
3018        });
3019        connectLambda(eTechnician, [this](gig::String s) {
3020            m->pInfo->Technician = s;
3021        });
3022        connectLambda(eSoftware, [this](gig::String s) {
3023            m->pInfo->Software = s;
3024        });
3025        connectLambda(eMedium, [this](gig::String s) {
3026            m->pInfo->Medium = s;
3027        });
3028        connectLambda(eSource, [this](gig::String s) {
3029            m->pInfo->Source = s;
3030        });
3031        connectLambda(eSourceForm, [this](gig::String s) {
3032            m->pInfo->SourceForm = s;
3033        });
3034        connectLambda(eCommissioned, [this](gig::String s) {
3035            m->pInfo->Commissioned = s;
3036        });
3037        connectLambda(eSubject, [this](gig::String s) {
3038            m->pInfo->Subject = s;
3039        });
3040    
3041        // tab 1
3042  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
3043      table.set_column_spacing(5);      table.set_column_spacing(5);
3044  #else  #else
3045      table.set_col_spacings(5);      table.set_col_spacings(5);
3046  #endif  #endif
   
3047      table.add(eName);      table.add(eName);
3048      table.add(eIsDrum);      table.add(eIsDrum);
3049      table.add(eMIDIBank);      table.add(eMIDIBank);
3050      table.add(eMIDIProgram);      table.add(eMIDIProgram);
3051      table.add(eAttenuation);      table.add(eAttenuation);
     table.add(eGainPlus6);  
3052      table.add(eEffectSend);      table.add(eEffectSend);
3053      table.add(eFineTune);      table.add(eFineTune);
3054      table.add(ePitchbendRange);      table.add(ePitchbendRange);
# Line 2908  InstrumentProps::InstrumentProps() : Line 3056  InstrumentProps::InstrumentProps() :
3056      table.add(eDimensionKeyRangeLow);      table.add(eDimensionKeyRangeLow);
3057      table.add(eDimensionKeyRangeHigh);      table.add(eDimensionKeyRangeHigh);
3058    
3059      add(vbox);      // tab 2
3060    #if USE_GTKMM_GRID
3061        table2.set_column_spacing(5);
3062    #else
3063        table2.set_col_spacings(5);
3064    #endif
3065        table2.add(eName2);
3066        table2.add(eCreationDate);
3067        table2.add(eComments);
3068        table2.add(eProduct);
3069        table2.add(eCopyright);
3070        table2.add(eArtists);
3071        table2.add(eGenre);
3072        table2.add(eKeywords);
3073        table2.add(eEngineer);
3074        table2.add(eTechnician);
3075        table2.add(eSoftware);
3076        table2.add(eMedium);
3077        table2.add(eSource);
3078        table2.add(eSourceForm);
3079        table2.add(eCommissioned);
3080        table2.add(eSubject);
3081    
3082        add(vbox[0]);
3083  #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)
3084      table.set_margin(5);      table.set_margin(5);
3085  #else  #else
3086      table.set_border_width(5);      table.set_border_width(5);
3087  #endif  #endif
3088      vbox.pack_start(table);      vbox[1].pack_start(table);
3089        vbox[2].pack_start(table2);
3090      table.show();      table.show();
3091      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);      table2.show();
3092        vbox[0].pack_start(tabs);
3093        vbox[0].pack_start(buttonBox, Gtk::PACK_SHRINK);
3094      buttonBox.set_layout(Gtk::BUTTONBOX_END);      buttonBox.set_layout(Gtk::BUTTONBOX_END);
3095  #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)
3096      buttonBox.set_margin(5);      buttonBox.set_margin(5);
# Line 2932  InstrumentProps::InstrumentProps() : Line 3106  InstrumentProps::InstrumentProps() :
3106          sigc::mem_fun(*this, &InstrumentProps::hide));          sigc::mem_fun(*this, &InstrumentProps::hide));
3107    
3108      quitButton.show();      quitButton.show();
3109      vbox.show();      vbox[0].show();
3110  #if HAS_GTKMM_SHOW_ALL_CHILDREN  #if HAS_GTKMM_SHOW_ALL_CHILDREN
3111      show_all_children();      show_all_children();
3112  #endif  #endif
# Line 2943  void InstrumentProps::set_instrument(gig Line 3117  void InstrumentProps::set_instrument(gig
3117      update(instrument);      update(instrument);
3118    
3119      update_model++;      update_model++;
3120    
3121        // tab 1
3122      eName.set_value(instrument->pInfo->Name);      eName.set_value(instrument->pInfo->Name);
3123      eIsDrum.set_value(instrument->IsDrum);      eIsDrum.set_value(instrument->IsDrum);
3124      eMIDIBank.set_value(instrument->MIDIBank);      eMIDIBank.set_value(instrument->MIDIBank);
3125      eMIDIProgram.set_value(instrument->MIDIProgram);      eMIDIProgram.set_value(instrument->MIDIProgram);
3126        // tab 2
3127        eName2.set_value(instrument->pInfo->Name);
3128        eCreationDate.set_value(instrument->pInfo->CreationDate);
3129        eComments.set_value(instrument->pInfo->Comments);
3130        eProduct.set_value(instrument->pInfo->Product);
3131        eCopyright.set_value(instrument->pInfo->Copyright);
3132        eArtists.set_value(instrument->pInfo->Artists);
3133        eGenre.set_value(instrument->pInfo->Genre);
3134        eKeywords.set_value(instrument->pInfo->Keywords);
3135        eEngineer.set_value(instrument->pInfo->Engineer);
3136        eTechnician.set_value(instrument->pInfo->Technician);
3137        eSoftware.set_value(instrument->pInfo->Software);
3138        eMedium.set_value(instrument->pInfo->Medium);
3139        eSource.set_value(instrument->pInfo->Source);
3140        eSourceForm.set_value(instrument->pInfo->SourceForm);
3141        eCommissioned.set_value(instrument->pInfo->Commissioned);
3142        eSubject.set_value(instrument->pInfo->Subject);
3143    
3144        update_model--;
3145    }
3146    
3147    
3148    SampleProps::SampleProps() :
3149    #if HAS_GTKMM_STOCK
3150        quitButton(Gtk::Stock::CLOSE),
3151    #else
3152        quitButton(_("_Close")),
3153    #endif
3154        table(2,1),
3155        eName(_("Name")),
3156        eUnityNote(_("Unity Note")),
3157        eSampleGroup(_("Sample Group")),
3158        eSampleFormatInfo(_("Sample Format")),
3159        eSampleID("Sample ID"),
3160        eChecksum("Wave Data CRC-32"),
3161        eLoopsCount(_("Loops"), 0, 1), // we might support more than 1 loop in future
3162        eLoopStart(_("Loop start position"), 0, 9999999),
3163        eLoopLength(_("Loop size"), 0, 9999999),
3164        eLoopType(_("Loop type")),
3165        eLoopPlayCount(_("Playback count")),
3166        table2(2,1),
3167        eName2(_("Name")),
3168        eCreationDate(_("Creation date")),
3169        eComments(_("Comments")),
3170        eProduct(_("Product")),
3171        eCopyright(_("Copyright")),
3172        eArtists(_("Artists")),
3173        eGenre(_("Genre")),
3174        eKeywords(_("Keywords")),
3175        eEngineer(_("Engineer")),
3176        eTechnician(_("Technician")),
3177        eSoftware(_("Software")),
3178        eMedium(_("Medium")),
3179        eSource(_("Source")),
3180        eSourceForm(_("Source form")),
3181        eCommissioned(_("Commissioned")),
3182        eSubject(_("Subject"))
3183    {
3184        if (!Settings::singleton()->autoRestoreWindowDimension) {
3185            //set_default_size(470, 390);
3186            set_position(Gtk::WIN_POS_MOUSE);
3187        }
3188    
3189        set_title(_("Sample Properties"));
3190    
3191        tabs.append_page(vbox[1], _("Settings"));
3192        tabs.append_page(vbox[2], _("Info"));
3193    
3194        connect(eName, &SampleProps::set_Name);
3195        connect(eUnityNote, &gig::Sample::MIDIUnityNote);
3196        connect(eLoopsCount, &gig::Sample::Loops);
3197        connectLambda(eLoopStart, [this](uint32_t start){
3198            m->LoopStart = start;
3199            m->LoopEnd = start + m->LoopSize;
3200        });
3201        connectLambda(eLoopLength, [this](uint32_t length){
3202            m->LoopSize = length;
3203            m->LoopEnd = m->LoopStart + length;
3204        });
3205        {
3206            const char* choices[] = { _("normal"), _("bidirectional"), _("backward"), 0 };
3207            static const gig::loop_type_t values[] = {
3208                gig::loop_type_normal,
3209                gig::loop_type_bidirectional,
3210                gig::loop_type_backward
3211            };
3212            eLoopType.set_choices(choices, values);
3213        }
3214        connect(eLoopType, &gig::Sample::LoopType);
3215        connect(eLoopPlayCount, &gig::Sample::LoopPlayCount);
3216    
3217        eName.signal_value_changed().connect(sig_name_changed.make_slot());
3218    
3219        connect(eName2, &SampleProps::set_Name);
3220        connectLambda(eCreationDate, [this](gig::String s) {
3221            m->pInfo->CreationDate = s;
3222        });
3223        connectLambda(eComments, [this](gig::String s) {
3224            m->pInfo->Comments = s;
3225        });
3226        connectLambda(eProduct, [this](gig::String s) {
3227            m->pInfo->Product = s;
3228        });
3229        connectLambda(eCopyright, [this](gig::String s) {
3230            m->pInfo->Copyright = s;
3231        });
3232        connectLambda(eArtists, [this](gig::String s) {
3233            m->pInfo->Artists = s;
3234        });
3235        connectLambda(eGenre, [this](gig::String s) {
3236            m->pInfo->Genre = s;
3237        });
3238        connectLambda(eKeywords, [this](gig::String s) {
3239            m->pInfo->Keywords = s;
3240        });
3241        connectLambda(eEngineer, [this](gig::String s) {
3242            m->pInfo->Engineer = s;
3243        });
3244        connectLambda(eTechnician, [this](gig::String s) {
3245            m->pInfo->Technician = s;
3246        });
3247        connectLambda(eSoftware, [this](gig::String s) {
3248            m->pInfo->Software = s;
3249        });
3250        connectLambda(eMedium, [this](gig::String s) {
3251            m->pInfo->Medium = s;
3252        });
3253        connectLambda(eSource, [this](gig::String s) {
3254            m->pInfo->Source = s;
3255        });
3256        connectLambda(eSourceForm, [this](gig::String s) {
3257            m->pInfo->SourceForm = s;
3258        });
3259        connectLambda(eCommissioned, [this](gig::String s) {
3260            m->pInfo->Commissioned = s;
3261        });
3262        connectLambda(eSubject, [this](gig::String s) {
3263            m->pInfo->Subject = s;
3264        });
3265    
3266        // tab 1
3267    #if USE_GTKMM_GRID
3268        table.set_column_spacing(5);
3269    #else
3270        table.set_col_spacings(5);
3271    #endif
3272        table.add(eName);
3273        table.add(eUnityNote);
3274        table.add(eSampleGroup);
3275        table.add(eSampleFormatInfo);
3276        table.add(eSampleID);
3277        table.add(eChecksum);
3278        table.add(eLoopsCount);
3279        table.add(eLoopStart);
3280        table.add(eLoopLength);
3281        table.add(eLoopType);
3282        table.add(eLoopPlayCount);
3283    
3284        // tab 2
3285    #if USE_GTKMM_GRID
3286        table2.set_column_spacing(5);
3287    #else
3288        table2.set_col_spacings(5);
3289    #endif
3290        table2.add(eName2);
3291        table2.add(eCreationDate);
3292        table2.add(eComments);
3293        table2.add(eProduct);
3294        table2.add(eCopyright);
3295        table2.add(eArtists);
3296        table2.add(eGenre);
3297        table2.add(eKeywords);
3298        table2.add(eEngineer);
3299        table2.add(eTechnician);
3300        table2.add(eSoftware);
3301        table2.add(eMedium);
3302        table2.add(eSource);
3303        table2.add(eSourceForm);
3304        table2.add(eCommissioned);
3305        table2.add(eSubject);
3306    
3307        add(vbox[0]);
3308    #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3309        table.set_margin(5);
3310    #else
3311        table.set_border_width(5);
3312    #endif
3313        vbox[1].pack_start(table);
3314        vbox[2].pack_start(table2);
3315        table.show();
3316        table2.show();
3317        vbox[0].pack_start(tabs);
3318        vbox[0].pack_start(buttonBox, Gtk::PACK_SHRINK);
3319        buttonBox.set_layout(Gtk::BUTTONBOX_END);
3320    #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3321        buttonBox.set_margin(5);
3322    #else
3323        buttonBox.set_border_width(5);
3324    #endif
3325        buttonBox.show();
3326        buttonBox.pack_start(quitButton);
3327        quitButton.set_can_default();
3328        quitButton.grab_focus();
3329    
3330        quitButton.signal_clicked().connect(
3331            sigc::mem_fun(*this, &SampleProps::hide));
3332    
3333        quitButton.show();
3334        vbox[0].show();
3335    #if HAS_GTKMM_SHOW_ALL_CHILDREN
3336        show_all_children();
3337    #endif
3338    }
3339    
3340    void SampleProps::set_sample(gig::Sample* sample)
3341    {
3342        update(sample);
3343    
3344        update_model++;
3345    
3346        // tab 1
3347        eName.set_value(sample->pInfo->Name);
3348        eUnityNote.set_value(sample->MIDIUnityNote);
3349        // show sample group name
3350        {
3351            Glib::ustring s = "---";
3352            if (sample && sample->GetGroup())
3353                s = sample->GetGroup()->Name;
3354            eSampleGroup.text.set_text(s);
3355        }
3356        // assemble sample format info string
3357        {
3358            Glib::ustring s;
3359            if (sample) {
3360                switch (sample->Channels) {
3361                    case 1: s = _("Mono"); break;
3362                    case 2: s = _("Stereo"); break;
3363                    default:
3364                        s = ToString(sample->Channels) + _(" audio channels");
3365                        break;
3366                }
3367                s += " " + ToString(sample->BitDepth) + " Bits";
3368                s += " " + ToString(sample->SamplesPerSecond/1000) + "."
3369                         + ToString((sample->SamplesPerSecond%1000)/100) + " kHz";
3370            } else {
3371                s = _("No sample assigned to this dimension region.");
3372            }
3373            eSampleFormatInfo.text.set_text(s);
3374        }
3375        // generate sample's memory address pointer string
3376        {
3377            Glib::ustring s;
3378            if (sample) {
3379                char buf[64] = {};
3380                snprintf(buf, sizeof(buf), "%p", sample);
3381                s = buf;
3382            } else {
3383                s = "---";
3384            }
3385            eSampleID.text.set_text(s);
3386        }
3387        // generate raw wave form data CRC-32 checksum string
3388        {
3389            Glib::ustring s = "---";
3390            if (sample) {
3391                char buf[64] = {};
3392                snprintf(buf, sizeof(buf), "%x", sample->GetWaveDataCRC32Checksum());
3393                s = buf;
3394            }
3395            eChecksum.text.set_text(s);
3396        }
3397        eLoopsCount.set_value(sample->Loops);
3398        eLoopStart.set_value(sample->LoopStart);
3399        eLoopLength.set_value(sample->LoopSize);
3400        eLoopType.set_value(sample->LoopType);
3401        eLoopPlayCount.set_value(sample->LoopPlayCount);
3402        // tab 2
3403        eName2.set_value(sample->pInfo->Name);
3404        eCreationDate.set_value(sample->pInfo->CreationDate);
3405        eComments.set_value(sample->pInfo->Comments);
3406        eProduct.set_value(sample->pInfo->Product);
3407        eCopyright.set_value(sample->pInfo->Copyright);
3408        eArtists.set_value(sample->pInfo->Artists);
3409        eGenre.set_value(sample->pInfo->Genre);
3410        eKeywords.set_value(sample->pInfo->Keywords);
3411        eEngineer.set_value(sample->pInfo->Engineer);
3412        eTechnician.set_value(sample->pInfo->Technician);
3413        eSoftware.set_value(sample->pInfo->Software);
3414        eMedium.set_value(sample->pInfo->Medium);
3415        eSource.set_value(sample->pInfo->Source);
3416        eSourceForm.set_value(sample->pInfo->SourceForm);
3417        eCommissioned.set_value(sample->pInfo->Commissioned);
3418        eSubject.set_value(sample->pInfo->Subject);
3419    
3420        update_model--;
3421    }
3422    
3423    void SampleProps::set_Name(const gig::String& name)
3424    {
3425        m->pInfo->Name = name;
3426    }
3427    
3428    void SampleProps::update_name()
3429    {
3430        update_model++;
3431        eName.set_value(m->pInfo->Name);
3432      update_model--;      update_model--;
3433  }  }
3434    
# Line 2982  void MainWindow::updateSampleRefCountMap Line 3464  void MainWindow::updateSampleRefCountMap
3464    
3465  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) {
3466      Gtk::TreeModel::iterator iter;      Gtk::TreeModel::iterator iter;
3467      if (!m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter)) {      if (!m_TreeViewInstruments.get_tooltip_context_iter(x, y, keyboardTip, iter)) {
3468          return false;          return false;
3469      }      }
3470      Gtk::TreeModel::Path path(iter);      Gtk::TreeModel::Path path(iter);
# Line 2992  bool MainWindow::onQueryTreeViewTooltip( Line 3474  bool MainWindow::onQueryTreeViewTooltip(
3474      {      {
3475          Gtk::TreeModel::Path path; // unused          Gtk::TreeModel::Path path; // unused
3476          int cellX, cellY; // unused          int cellX, cellY; // unused
3477          m_TreeView.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);          m_TreeViewInstruments.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);
3478      }      }
3479      Gtk::TreeViewColumn* scriptsColumn = m_TreeView.get_column(2);      Gtk::TreeViewColumn* scriptsColumn = m_TreeViewInstruments.get_column(2);
3480      if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...      if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...
3481          // show the script(s) assigned to the hovered instrument as tooltip          // show the script(s) assigned to the hovered instrument as tooltip
3482          tooltip->set_markup( row[m_Columns.m_col_tooltip] );          tooltip->set_markup( row[m_InstrumentsModel.m_col_tooltip] );
3483          m_TreeView.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);          m_TreeViewInstruments.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);
3484      } else {      } else {
3485          // if beginners' tooltips is disabled then don't show the following one          // if beginners' tooltips is disabled then don't show the following one
3486          if (!Settings::singleton()->showTooltips)          if (!Settings::singleton()->showTooltips)
# Line 3008  bool MainWindow::onQueryTreeViewTooltip( Line 3490  bool MainWindow::onQueryTreeViewTooltip(
3490              "Right click here for actions on instruments & MIDI Rules. "              "Right click here for actions on instruments & MIDI Rules. "
3491              "Drag & drop to change the order of instruments."              "Drag & drop to change the order of instruments."
3492          ));          ));
3493          m_TreeView.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);          m_TreeViewInstruments.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);
3494      }      }
3495      return true;      return true;
3496  }  }
# Line 3042  void MainWindow::load_gig(gig::File* gig Line 3524  void MainWindow::load_gig(gig::File* gig
3524      file_has_name = filename;      file_has_name = filename;
3525      file_is_changed = false;      file_is_changed = false;
3526    
3527      propDialog.set_file(gig);      fileProps.set_file(gig);
3528    
3529      instrument_name_connection.block();      instrument_name_connection.block();
3530      int index = 0;      int index = 0;
# Line 3051  void MainWindow::load_gig(gig::File* gig Line 3533  void MainWindow::load_gig(gig::File* gig
3533          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
3534          const int iScriptSlots = instrument->ScriptSlotCount();          const int iScriptSlots = instrument->ScriptSlotCount();
3535    
3536          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refInstrumentsTreeModel->append();
3537          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
3538          row[m_Columns.m_col_nr] = index;          row[m_InstrumentsModel.m_col_nr] = index;
3539          row[m_Columns.m_col_name] = name;          row[m_InstrumentsModel.m_col_name] = name;
3540          row[m_Columns.m_col_instr] = instrument;          row[m_InstrumentsModel.m_col_instr] = instrument;
3541          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3542          row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
3543    
3544  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
3545          add_instrument_to_menu(name);          add_instrument_to_menu(name);
# Line 3119  void MainWindow::load_gig(gig::File* gig Line 3601  void MainWindow::load_gig(gig::File* gig
3601      file = gig;      file = gig;
3602    
3603      // select the first instrument      // select the first instrument
3604      m_TreeView.get_selection()->select(Gtk::TreePath("0"));      m_TreeViewInstruments.get_selection()->select(Gtk::TreePath("0"));
3605    
3606      instr_props_set_instrument();      instr_props_set_instrument();
3607      gig::Instrument* instrument = get_instrument();      gig::Instrument* instrument = get_instrument();
# Line 3132  bool MainWindow::instr_props_set_instrum Line 3614  bool MainWindow::instr_props_set_instrum
3614  {  {
3615      instrumentProps.signal_name_changed().clear();      instrumentProps.signal_name_changed().clear();
3616    
3617      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();      // get visual selection
3618        std::vector<Gtk::TreeModel::Path> rows = m_TreeViewInstruments.get_selection()->get_selected_rows();
3619      if (rows.empty()) {      if (rows.empty()) {
3620          instrumentProps.hide();          instrumentProps.hide();
3621          return false;          return false;
3622      }      }
3623    
3624        // convert index of visual selection (i.e. if filtered) to index of model
3625        Gtk::TreeModel::Path path = m_refInstrumentsModelFilter->convert_path_to_child_path(rows[0]);
3626    
3627      //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.
3628      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(path);
3629      if (it) {      if (it) {
3630          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
3631          gig::Instrument* instrument = row[m_Columns.m_col_instr];          gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3632    
3633          instrumentProps.set_instrument(instrument);          instrumentProps.set_instrument(instrument);
3634    
# Line 3170  void MainWindow::show_instr_props() Line 3657  void MainWindow::show_instr_props()
3657  void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)  void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
3658  {  {
3659      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3660      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
3661    
3662      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3663      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
3664      if (gigname != name) {      if (gigname != name) {
3665          Gtk::TreeModel::Path path(*it);          Gtk::TreeModel::Path path(*it);
3666          const int index = path[0];          const int index = path[0];
3667          row[m_Columns.m_col_name] = gigname;          row[m_InstrumentsModel.m_col_name] = gigname;
3668          row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
3669        }
3670    }
3671    
3672    bool MainWindow::sample_props_set_sample()
3673    {
3674        sampleProps.signal_name_changed().clear();
3675    
3676        std::vector<Gtk::TreeModel::Path> rows = m_TreeViewSamples.get_selection()->get_selected_rows();
3677        if (rows.empty()) {
3678            sampleProps.hide();
3679            return false;
3680        }
3681        //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.
3682        Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
3683        if (it) {
3684            Gtk::TreeModel::Row row = *it;
3685            gig::Sample* sample = row[m_SamplesModel.m_col_sample];
3686    
3687            sampleProps.set_sample(sample);
3688    
3689            // make sure sample tree is updated when user changes the
3690            // sample name in sample properties window
3691            sampleProps.signal_name_changed().connect(
3692                sigc::bind(
3693                    sigc::mem_fun(*this,
3694                        &MainWindow::sample_name_changed_by_sample_props
3695                    ), it
3696                )
3697            );
3698        } else {
3699            sampleProps.hide();
3700        }
3701        //NOTE: explicit boolean cast required for GTKMM4 development branch here
3702        return it ? true : false;
3703    }
3704    
3705    void MainWindow::show_sample_props()
3706    {
3707        if (sample_props_set_sample()) {
3708            sampleProps.show();
3709            sampleProps.deiconify();
3710        }
3711    }
3712    
3713    void MainWindow::sample_name_changed_by_sample_props(Gtk::TreeModel::iterator& it)
3714    {
3715        Gtk::TreeModel::Row row = *it;
3716        Glib::ustring name = row[m_SamplesModel.m_col_name];
3717    
3718        gig::Sample* sample = row[m_SamplesModel.m_col_sample];
3719        Glib::ustring gigname(gig_to_utf8(sample->pInfo->Name));
3720        if (gigname != name) {
3721            Gtk::TreeModel::Path path(*it);
3722            row[m_SamplesModel.m_col_name] = gigname;
3723      }      }
3724  }  }
3725    
# Line 3194  void MainWindow::show_midi_rules() Line 3735  void MainWindow::show_midi_rules()
3735    
3736  void MainWindow::show_script_slots() {  void MainWindow::show_script_slots() {
3737      if (!file) return;      if (!file) return;
3738    
3739      // get selected instrument      // get selected instrument
3740      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();      gig::Instrument* instrument = get_instrument();
     if (rows.empty()) return;  
     Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);  
     if (!it) return;  
     Gtk::TreeModel::Row row = *it;  
     gig::Instrument* instrument = row[m_Columns.m_col_instr];  
3741      if (!instrument) return;      if (!instrument) return;
3742    
3743      ScriptSlots* window = new ScriptSlots;      ScriptSlots* window = new ScriptSlots;
# Line 3216  void MainWindow::onScriptSlotsModified(g Line 3753  void MainWindow::onScriptSlotsModified(g
3753      if (!pInstrument) return;      if (!pInstrument) return;
3754      const int iScriptSlots = pInstrument->ScriptSlotCount();      const int iScriptSlots = pInstrument->ScriptSlotCount();
3755    
3756      //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!
3757      //Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
3758      Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
3759    
3760      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
3761          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
3762          if (row[m_Columns.m_col_instr] != pInstrument) continue;          if (row[m_InstrumentsModel.m_col_instr] != pInstrument) continue;
3763          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3764          row[m_Columns.m_col_tooltip] = scriptTooltipFor(pInstrument, i);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(pInstrument, i);
3765          break;          break;
3766      }      }
3767    
3768      // causes the sampler to reload the instrument with the new script      // causes the sampler to reload the instrument with the new script
3769      on_sel_change();      on_sel_change();
3770    
3771        // force script 'patch' variables editor ("Script" tab) to be refreshed
3772        dimreg_edit.scriptVars.setInstrument(pInstrument, true/*force update*/);
3773  }  }
3774    
3775  void MainWindow::assignScript(gig::Script* pScript) {  void MainWindow::assignScript(gig::Script* pScript) {
# Line 3310  void MainWindow::on_auto_restore_win_dim Line 3850  void MainWindow::on_auto_restore_win_dim
3850  #endif  #endif
3851  }  }
3852    
3853    void MainWindow::on_instr_double_click_opens_props() {
3854    #if USE_GLIB_ACTION
3855        bool active = false;
3856        m_actionInstrDoubleClickOpensProps->get_state(active);
3857        // for some reason toggle state does not change automatically
3858        active = !active;
3859        m_actionInstrDoubleClickOpensProps->change_state(active);
3860        Settings::singleton()->instrumentDoubleClickOpensProps = active;
3861    #else
3862        Gtk::CheckMenuItem* item =
3863            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/OpenInstrPropsByDoubleClick"));
3864        if (!item) {
3865            std::cerr << "/MenuBar/MenuView/OpenInstrPropsByDoubleClick == NULL\n";
3866            return;
3867        }
3868        Settings::singleton()->instrumentDoubleClickOpensProps = item->get_active();
3869    #endif
3870    }
3871    
3872  void MainWindow::on_save_with_temporary_file() {  void MainWindow::on_save_with_temporary_file() {
3873  #if USE_GLIB_ACTION  #if USE_GLIB_ACTION
3874      bool active = false;      bool active = false;
# Line 3384  bool MainWindow::on_button_release(Gdk:: Line 3943  bool MainWindow::on_button_release(Gdk::
3943  void MainWindow::on_button_release(GdkEventButton* button) {  void MainWindow::on_button_release(GdkEventButton* button) {
3944  #endif  #endif
3945      if (button->type == GDK_2BUTTON_PRESS) {      if (button->type == GDK_2BUTTON_PRESS) {
3946          show_instr_props();          if (Settings::singleton()->instrumentDoubleClickOpensProps)
3947                show_instr_props();
3948      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
3949          // gig v2 files have no midi rules          // gig v2 files have no midi rules
3950          const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);          const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);
# Line 3416  void MainWindow::on_instrument_selection Line 3976  void MainWindow::on_instrument_selection
3976              find(children.begin(), children.end(), item);              find(children.begin(), children.end(), item);
3977          if (it != children.end()) {          if (it != children.end()) {
3978              int index = it - children.begin();              int index = it - children.begin();
3979              m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));              m_TreeViewInstruments.get_selection()->select(Gtk::TreePath(ToString(index)));
3980    
3981              m_RegionChooser.set_instrument(file->GetInstrument(index));              m_RegionChooser.set_instrument(file->GetInstrument(index));
3982          }          }
# Line 3424  void MainWindow::on_instrument_selection Line 3984  void MainWindow::on_instrument_selection
3984  }  }
3985  #endif  #endif
3986    
3987    void MainWindow::on_action_move_instr() {
3988        gig::Instrument* instr = get_instrument();
3989        if (!instr) return;
3990    
3991        int currentIndex = getIndexOf(instr);
3992    
3993        Gtk::Dialog dialog(_("Move Instrument"), true /*modal*/);
3994    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
3995        Gtk::Adjustment adjustment(
3996            currentIndex,
3997            0 /*min*/, file->CountInstruments() - 1 /*max*/
3998        );
3999        Gtk::SpinButton spinBox(adjustment);
4000    #else
4001        Gtk::SpinButton spinBox(
4002            Gtk::Adjustment::create(
4003                currentIndex,
4004                0 /*min*/, file->CountInstruments() - 1 /*max*/
4005            )
4006        );
4007    #endif
4008    #if USE_GTKMM_BOX
4009        dialog.get_content_area()->pack_start(spinBox);
4010    #else
4011        dialog.get_vbox()->pack_start(spinBox);
4012    #endif
4013    #if HAS_GTKMM_STOCK
4014        Gtk::Button* okButton = dialog.add_button(Gtk::Stock::OK, 0);
4015        dialog.add_button(Gtk::Stock::CANCEL, 1);
4016    #else
4017        Gtk::Button* okButton = dialog.add_button(_("_OK"), 0);
4018        dialog.add_button(_("_Cancel"), 1);
4019    #endif
4020        okButton->set_sensitive(false);
4021        // show the dialog at a reasonable screen position
4022        dialog.set_position(Gtk::WIN_POS_MOUSE);
4023        // only enable the 'OK' button if entered new index is not instrument's
4024        // current index already
4025        spinBox.signal_value_changed().connect([&]{
4026            okButton->set_sensitive( spinBox.get_value_as_int() != currentIndex );
4027        });
4028        // usability acceleration: if user hits enter key on the text entry field
4029        // then auto trigger the 'OK' button
4030        spinBox.signal_activate().connect([&]{
4031            if (okButton->get_sensitive())
4032                okButton->clicked();
4033        });
4034    #if HAS_GTKMM_SHOW_ALL_CHILDREN
4035        dialog.show_all_children();
4036    #endif
4037        if (!dialog.run()) { // 'OK' selected ...
4038            int newIndex = spinBox.get_value_as_int();
4039            printf("MOVE TO %d\n", newIndex);
4040            gig::Instrument* dst = file->GetInstrument(newIndex);
4041            instr->MoveTo(dst);
4042            __refreshEntireGUI();
4043            select_instrument(instr);
4044        }
4045    }
4046    
4047  void MainWindow::select_instrument(gig::Instrument* instrument) {  void MainWindow::select_instrument(gig::Instrument* instrument) {
4048      if (!instrument) return;      if (!instrument) return;
4049    
4050      //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!
4051      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
4052      //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
4053    
4054      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
4055          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
4056          if (row[m_Columns.m_col_instr] == instrument) {          if (row[m_InstrumentsModel.m_col_instr] == instrument) {
4057              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
4058              show_intruments_tab();              show_intruments_tab();
4059              m_TreeView.get_selection()->unselect_all();              m_TreeViewInstruments.get_selection()->unselect_all();
4060                            
4061  #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)
4062              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
4063              m_TreeView.get_selection()->select(iterSel);              m_TreeViewInstruments.get_selection()->select(iterSel);
4064  #else  #else
4065              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeViewInstruments.get_selection()->select(model->children()[i]);
4066  #endif  #endif
4067              std::vector<Gtk::TreeModel::Path> rows =              std::vector<Gtk::TreeModel::Path> rows =
4068                  m_TreeView.get_selection()->get_selected_rows();                  m_TreeViewInstruments.get_selection()->get_selected_rows();
4069              if (!rows.empty())              if (!rows.empty())
4070                  m_TreeView.scroll_to_row(rows[0]);                  m_TreeViewInstruments.scroll_to_row(rows[0]);
4071              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
4072          }          }
4073      }      }
# Line 3458  bool MainWindow::select_dimension_region Line 4078  bool MainWindow::select_dimension_region
4078      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
4079      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
4080    
4081      //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!
4082      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
4083      //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
4084    
4085      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
4086          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
4087          if (row[m_Columns.m_col_instr] == pInstrument) {          if (row[m_InstrumentsModel.m_col_instr] == pInstrument) {
4088              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
4089              show_intruments_tab();              show_intruments_tab();
4090              m_TreeView.get_selection()->unselect_all();              m_TreeViewInstruments.get_selection()->unselect_all();
4091  #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)
4092              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
4093              m_TreeView.get_selection()->select(iterSel);              m_TreeViewInstruments.get_selection()->select(iterSel);
4094  #else  #else
4095              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeViewInstruments.get_selection()->select(model->children()[i]);
4096  #endif  #endif
4097              std::vector<Gtk::TreeModel::Path> rows =              std::vector<Gtk::TreeModel::Path> rows =
4098                  m_TreeView.get_selection()->get_selected_rows();                  m_TreeViewInstruments.get_selection()->get_selected_rows();
4099              if (!rows.empty())              if (!rows.empty())
4100                  m_TreeView.scroll_to_row(rows[0]);                  m_TreeViewInstruments.scroll_to_row(rows[0]);
4101              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
4102    
4103              // select respective region in the region selector              // select respective region in the region selector
# Line 3762  void MainWindow::add_instrument(gig::Ins Line 4382  void MainWindow::add_instrument(gig::Ins
4382    
4383      // update instrument tree view      // update instrument tree view
4384      instrument_name_connection.block();      instrument_name_connection.block();
4385      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refInstrumentsTreeModel->append();
4386      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
4387      const int index = m_refTreeModel->children().size() - 1;      const int index = m_refInstrumentsTreeModel->children().size() - 1;
4388      rowInstr[m_Columns.m_col_nr] = index;      const int iScriptSlots = instrument->ScriptSlotCount();
4389      rowInstr[m_Columns.m_col_name] = name;      rowInstr[m_InstrumentsModel.m_col_nr] = index;
4390      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_InstrumentsModel.m_col_name] = name;
4391      rowInstr[m_Columns.m_col_scripts] = "";      rowInstr[m_InstrumentsModel.m_col_instr] = instrument;
4392      rowInstr[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);      rowInstr[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
4393        rowInstr[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
4394      instrument_name_connection.unblock();      instrument_name_connection.unblock();
4395    
4396  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 3795  void MainWindow::on_action_duplicate_ins Line 4416  void MainWindow::on_action_duplicate_ins
4416    
4417      // retrieve the currently selected instrument      // retrieve the currently selected instrument
4418      // (being the original instrument to be duplicated)      // (being the original instrument to be duplicated)
4419      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
4420      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
4421      for (int r = 0; r < rows.size(); ++r) {      for (int r = 0; r < rows.size(); ++r) {
4422          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
4423          if (it) {          if (it) {
4424              Gtk::TreeModel::Row row = *it;              Gtk::TreeModel::Row row = *it;
4425              gig::Instrument* instrOrig = row[m_Columns.m_col_instr];              gig::Instrument* instrOrig = row[m_InstrumentsModel.m_col_instr];
4426              if (instrOrig) {              if (instrOrig) {
4427                  // duplicate the orginal instrument                  // duplicate the orginal instrument
4428                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
# Line 3828  void MainWindow::on_action_remove_instru Line 4449  void MainWindow::on_action_remove_instru
4449          return;          return;
4450      }      }
4451    
4452      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
4453      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
4454      for (int r = rows.size() - 1; r >= 0; --r) {      for (int r = rows.size() - 1; r >= 0; --r) {
4455          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
4456          if (!it) continue;          if (!it) continue;
4457          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
4458          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_InstrumentsModel.m_col_instr];
4459          try {          try {
4460              Gtk::TreePath path(it);              Gtk::TreePath path(it);
4461              int index = path[0];              int index = path[0];
# Line 3848  void MainWindow::on_action_remove_instru Line 4469  void MainWindow::on_action_remove_instru
4469  #endif  #endif
4470    
4471              // remove row from instruments tree view              // remove row from instruments tree view
4472              m_refTreeModel->erase(it);              m_refInstrumentsTreeModel->erase(it);
4473              // update "Nr" column of all instrument rows              // update "Nr" column of all instrument rows
4474              {              {
4475                  int index = 0;                  int index = 0;
4476                  for (Gtk::TreeModel::iterator it = m_refTreeModel->children().begin();                  for (Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->children().begin();
4477                       it != m_refTreeModel->children().end(); ++it, ++index)                       it != m_refInstrumentsTreeModel->children().end(); ++it, ++index)
4478                  {                  {
4479                      Gtk::TreeModel::Row row = *it;                      Gtk::TreeModel::Row row = *it;
4480                      gig::Instrument* instrument = row[m_Columns.m_col_instr];                      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
4481                      row[m_Columns.m_col_nr] = index;                      row[m_InstrumentsModel.m_col_nr] = index;
4482                      row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);                      row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
4483                  }                  }
4484              }              }
4485    
4486  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
4487              // select another instrument (in gtk3 this is done              // select another instrument (in gtk3 this is done
4488              // automatically)              // automatically)
4489              if (!m_refTreeModel->children().empty()) {              if (!m_refInstrumentsTreeModel->children().empty()) {
4490                  if (index == m_refTreeModel->children().size()) {                  if (index == m_refInstrumentsTreeModel->children().size()) {
4491                      index--;                      index--;
4492                  }                  }
4493                  m_TreeView.get_selection()->select(                  m_TreeViewInstruments.get_selection()->select(
4494                      Gtk::TreePath(ToString(index)));                      Gtk::TreePath(ToString(index)));
4495              }              }
4496  #endif  #endif
# Line 3888  void MainWindow::on_action_remove_instru Line 4509  void MainWindow::on_action_remove_instru
4509  }  }
4510    
4511  void MainWindow::on_action_sample_properties() {  void MainWindow::on_action_sample_properties() {
4512      //TODO: show a dialog where the selected sample's properties can be edited      show_sample_props();
     Gtk::MessageDialog msg(  
         *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO  
     );  
     msg.run();  
4513  }  }
4514    
4515  void MainWindow::on_action_add_script_group() {  void MainWindow::on_action_add_script_group() {
# Line 3955  void MainWindow::on_action_edit_script() Line 4572  void MainWindow::on_action_edit_script()
4572      if (!it) return;      if (!it) return;
4573      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
4574      gig::Script* script = row[m_ScriptsModel.m_col_script];      gig::Script* script = row[m_ScriptsModel.m_col_script];
4575      if (!script) return;      editScript(script);
4576    }
4577    
4578    void MainWindow::editScript(gig::Script* script) {
4579        if (!script) return;
4580      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
4581      editor->signal_script_to_be_changed.connect(      editor->signal_script_to_be_changed.connect(
4582          signal_script_to_be_changed.make_slot()          signal_script_to_be_changed.make_slot()
4583      );      );
4584      editor->signal_script_changed.connect(      editor->signal_script_changed.connect([this](gig::Script* script) {
4585          signal_script_changed.make_slot()          // signal to sampler (which will reload the script due to this)
4586      );          signal_script_changed.emit(script);
4587            // force script 'patch' variables editor ("Script" tab) to be refreshed
4588            gig::Instrument* instr = get_instrument();
4589            dimreg_edit.scriptVars.setInstrument(instr, true/*force update*/);
4590        });
4591      editor->setScript(script);      editor->setScript(script);
4592      //editor->reparent(*this);      //editor->reparent(*this);
4593      editor->show();      editor->show();
# Line 4518  void MainWindow::on_instruments_treeview Line 5142  void MainWindow::on_instruments_treeview
5142      // get selected source instrument      // get selected source instrument
5143      gig::Instrument* src = NULL;      gig::Instrument* src = NULL;
5144      {      {
5145          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
5146          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
5147          if (!rows.empty()) {          if (!rows.empty()) {
5148              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);              Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
5149              if (it) {              if (it) {
5150                  Gtk::TreeModel::Row row = *it;                  Gtk::TreeModel::Row row = *it;
5151                  src = row[m_Columns.m_col_instr];                  src = row[m_InstrumentsModel.m_col_instr];
5152              }              }
5153          }          }
5154      }      }
# Line 4546  void MainWindow::on_instruments_treeview Line 5170  void MainWindow::on_instruments_treeview
5170      gig::Instrument* dst = NULL;      gig::Instrument* dst = NULL;
5171      {      {
5172          Gtk::TreeModel::Path path;          Gtk::TreeModel::Path path;
5173          const bool found = m_TreeView.get_path_at_pos(x, y, path);          const bool found = m_TreeViewInstruments.get_path_at_pos(x, y, path);
5174          if (!found) return;          if (!found) return;
5175    
5176          Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path);          Gtk::TreeModel::iterator iter = m_refInstrumentsTreeModel->get_iter(path);
5177          if (!iter) return;          if (!iter) return;
5178          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
5179          dst = row[m_Columns.m_col_instr];          dst = row[m_InstrumentsModel.m_col_instr];
5180      }      }
5181      if (!dst) return;      if (!dst) return;
5182    
# Line 4691  void MainWindow::sample_name_changed(con Line 5315  void MainWindow::sample_name_changed(con
5315              file_changed();              file_changed();
5316          }          }
5317      }      }
5318        // change name in the sample properties window
5319        if (sampleProps.get_sample() == sample && sample) {
5320            sampleProps.set_sample(sample);
5321        }
5322  }  }
5323    
5324  void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path,  void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path,
# Line 4723  void MainWindow::script_double_clicked(c Line 5351  void MainWindow::script_double_clicked(c
5351      if (!iter) return;      if (!iter) return;
5352      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5353      gig::Script* script = row[m_ScriptsModel.m_col_script];      gig::Script* script = row[m_ScriptsModel.m_col_script];
5354      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();  
5355  }  }
5356    
5357  void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path,  void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path,
5358                                           const Gtk::TreeModel::iterator& iter) {                                           const Gtk::TreeModel::iterator& iter) {
5359      if (!iter) return;      if (!iter) return;
5360      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5361      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
5362    
5363  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
5364      // change name in instrument menu      // change name in instrument menu
# Line 4759  void MainWindow::instrument_name_changed Line 5376  void MainWindow::instrument_name_changed
5376  #endif  #endif
5377    
5378      // change name in gig      // change name in gig
5379      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
5380      gig::String gigname(gig_from_utf8(name));      gig::String gigname(gig_from_utf8(name));
5381      if (instrument && instrument->pInfo->Name != gigname) {      if (instrument && instrument->pInfo->Name != gigname) {
5382          instrument->pInfo->Name = gigname;          instrument->pInfo->Name = gigname;
# Line 4787  bool MainWindow::instrument_row_visible( Line 5404  bool MainWindow::instrument_row_visible(
5404  #else  #else
5405      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5406  #endif  #endif
5407      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
5408      name = name.lowercase();      name = name.lowercase();
5409    
5410      std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);      std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);
# Line 4805  void MainWindow::on_action_combine_instr Line 5422  void MainWindow::on_action_combine_instr
5422      // list view as pre-selection      // list view as pre-selection
5423      std::set<int> indeces;      std::set<int> indeces;
5424      {      {
5425          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
5426          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
5427          for (int r = 0; r < rows.size(); ++r) {          for (int r = 0; r < rows.size(); ++r) {
5428              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);              Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
5429              if (it) {              if (it) {
5430                  Gtk::TreeModel::Row row = *it;                  Gtk::TreeModel::Row row = *it;
5431                  int index = row[m_Columns.m_col_nr];                  int index = row[m_InstrumentsModel.m_col_nr];
5432                  indeces.insert(index);                  indeces.insert(index);
5433              }              }
5434          }          }
Legend:
Removed from v.3619  
changed lines
  Added in v.3810
  ViewVC Help
Powered by ViewVC