/[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 3800 by schoenebeck, Sun Jul 26 13:27:16 2020 UTC revision 3806 by schoenebeck, Thu Aug 13 13:35:33 2020 UTC
# 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 1383  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 1620  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 1865  void MainWindow::region_changed() Line 1865  void MainWindow::region_changed()
1865  gig::Instrument* MainWindow::get_instrument()  gig::Instrument* MainWindow::get_instrument()
1866  {  {
1867      gig::Instrument* instrument = 0;      gig::Instrument* instrument = 0;
1868      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();
1869      if (rows.empty()) return NULL;      if (rows.empty()) return NULL;
1870      //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.
1871      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
1872      if (it) {      if (it) {
1873          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
1874          instrument = row[m_Columns.m_col_instr];          instrument = row[m_InstrumentsModel.m_col_instr];
1875      }      }
1876      return instrument;      return instrument;
1877  }  }
# Line 1936  void MainWindow::on_sel_change() Line 1936  void MainWindow::on_sel_change()
1936  {  {
1937  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
1938      // select item in instrument menu      // select item in instrument menu
1939      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();
1940      if (!rows.empty()) {      if (!rows.empty()) {
1941          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
1942          if (it) {          if (it) {
1943              Gtk::TreePath path(it);              Gtk::TreePath path(it);
1944              int index = path[0];              int index = path[0];
# Line 2146  void MainWindow::__clear() { Line 2146  void MainWindow::__clear() {
2146      // forget all samples that ought to be imported      // forget all samples that ought to be imported
2147      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
2148      // clear the samples and instruments tree views      // clear the samples and instruments tree views
2149      m_refTreeModel->clear();      m_refInstrumentsTreeModel->clear();
2150      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
2151      m_refScriptsTreeModel->clear();      m_refScriptsTreeModel->clear();
2152  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 2163  void MainWindow::__clear() { Line 2163  void MainWindow::__clear() {
2163    
2164  void MainWindow::__refreshEntireGUI() {  void MainWindow::__refreshEntireGUI() {
2165      // clear the samples and instruments tree views      // clear the samples and instruments tree views
2166      m_refTreeModel->clear();      m_refInstrumentsTreeModel->clear();
2167      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
2168      m_refScriptsTreeModel->clear();      m_refScriptsTreeModel->clear();
2169  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 2336  void MainWindow::load_instrument(gig::In Line 2336  void MainWindow::load_instrument(gig::In
2336      {      {
2337          if (instrument == instr) {          if (instrument == instr) {
2338              // select item in "instruments" tree view              // select item in "instruments" tree view
2339              m_TreeView.get_selection()->select(Gtk::TreePath(ToString(i)));              m_TreeViewInstruments.get_selection()->select(Gtk::TreePath(ToString(i)));
2340              // make sure the selected item in the "instruments" tree view is              // make sure the selected item in the "instruments" tree view is
2341              // visible (scroll to it)              // visible (scroll to it)
2342              m_TreeView.scroll_to_row(Gtk::TreePath(ToString(i)));              m_TreeViewInstruments.scroll_to_row(Gtk::TreePath(ToString(i)));
2343  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
2344              // select item in instrument menu              // select item in instrument menu
2345              {              {
# Line 2703  void MainWindow::on_show_tooltips_change Line 2703  void MainWindow::on_show_tooltips_change
2703      dimreg_stereo.set_has_tooltip(b);      dimreg_stereo.set_has_tooltip(b);
2704    
2705      // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell      // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell
2706      //m_TreeView.set_has_tooltip(b);      //m_TreeViewInstruments.set_has_tooltip(b);
2707    
2708      m_TreeViewSamples.set_has_tooltip(b);      m_TreeViewSamples.set_has_tooltip(b);
2709      m_TreeViewScripts.set_has_tooltip(b);      m_TreeViewScripts.set_has_tooltip(b);
# Line 3455  void MainWindow::updateSampleRefCountMap Line 3455  void MainWindow::updateSampleRefCountMap
3455    
3456  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) {
3457      Gtk::TreeModel::iterator iter;      Gtk::TreeModel::iterator iter;
3458      if (!m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter)) {      if (!m_TreeViewInstruments.get_tooltip_context_iter(x, y, keyboardTip, iter)) {
3459          return false;          return false;
3460      }      }
3461      Gtk::TreeModel::Path path(iter);      Gtk::TreeModel::Path path(iter);
# Line 3465  bool MainWindow::onQueryTreeViewTooltip( Line 3465  bool MainWindow::onQueryTreeViewTooltip(
3465      {      {
3466          Gtk::TreeModel::Path path; // unused          Gtk::TreeModel::Path path; // unused
3467          int cellX, cellY; // unused          int cellX, cellY; // unused
3468          m_TreeView.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);          m_TreeViewInstruments.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);
3469      }      }
3470      Gtk::TreeViewColumn* scriptsColumn = m_TreeView.get_column(2);      Gtk::TreeViewColumn* scriptsColumn = m_TreeViewInstruments.get_column(2);
3471      if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...      if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...
3472          // show the script(s) assigned to the hovered instrument as tooltip          // show the script(s) assigned to the hovered instrument as tooltip
3473          tooltip->set_markup( row[m_Columns.m_col_tooltip] );          tooltip->set_markup( row[m_InstrumentsModel.m_col_tooltip] );
3474          m_TreeView.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);          m_TreeViewInstruments.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);
3475      } else {      } else {
3476          // if beginners' tooltips is disabled then don't show the following one          // if beginners' tooltips is disabled then don't show the following one
3477          if (!Settings::singleton()->showTooltips)          if (!Settings::singleton()->showTooltips)
# Line 3481  bool MainWindow::onQueryTreeViewTooltip( Line 3481  bool MainWindow::onQueryTreeViewTooltip(
3481              "Right click here for actions on instruments & MIDI Rules. "              "Right click here for actions on instruments & MIDI Rules. "
3482              "Drag & drop to change the order of instruments."              "Drag & drop to change the order of instruments."
3483          ));          ));
3484          m_TreeView.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);          m_TreeViewInstruments.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);
3485      }      }
3486      return true;      return true;
3487  }  }
# Line 3524  void MainWindow::load_gig(gig::File* gig Line 3524  void MainWindow::load_gig(gig::File* gig
3524          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
3525          const int iScriptSlots = instrument->ScriptSlotCount();          const int iScriptSlots = instrument->ScriptSlotCount();
3526    
3527          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refInstrumentsTreeModel->append();
3528          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
3529          row[m_Columns.m_col_nr] = index;          row[m_InstrumentsModel.m_col_nr] = index;
3530          row[m_Columns.m_col_name] = name;          row[m_InstrumentsModel.m_col_name] = name;
3531          row[m_Columns.m_col_instr] = instrument;          row[m_InstrumentsModel.m_col_instr] = instrument;
3532          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3533          row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
3534    
3535  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
3536          add_instrument_to_menu(name);          add_instrument_to_menu(name);
# Line 3592  void MainWindow::load_gig(gig::File* gig Line 3592  void MainWindow::load_gig(gig::File* gig
3592      file = gig;      file = gig;
3593    
3594      // select the first instrument      // select the first instrument
3595      m_TreeView.get_selection()->select(Gtk::TreePath("0"));      m_TreeViewInstruments.get_selection()->select(Gtk::TreePath("0"));
3596    
3597      instr_props_set_instrument();      instr_props_set_instrument();
3598      gig::Instrument* instrument = get_instrument();      gig::Instrument* instrument = get_instrument();
# Line 3605  bool MainWindow::instr_props_set_instrum Line 3605  bool MainWindow::instr_props_set_instrum
3605  {  {
3606      instrumentProps.signal_name_changed().clear();      instrumentProps.signal_name_changed().clear();
3607    
3608      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();
3609      if (rows.empty()) {      if (rows.empty()) {
3610          instrumentProps.hide();          instrumentProps.hide();
3611          return false;          return false;
3612      }      }
3613      //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.
3614      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
3615      if (it) {      if (it) {
3616          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
3617          gig::Instrument* instrument = row[m_Columns.m_col_instr];          gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3618    
3619          instrumentProps.set_instrument(instrument);          instrumentProps.set_instrument(instrument);
3620    
# Line 3643  void MainWindow::show_instr_props() Line 3643  void MainWindow::show_instr_props()
3643  void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)  void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
3644  {  {
3645      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3646      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
3647    
3648      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3649      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
3650      if (gigname != name) {      if (gigname != name) {
3651          Gtk::TreeModel::Path path(*it);          Gtk::TreeModel::Path path(*it);
3652          const int index = path[0];          const int index = path[0];
3653          row[m_Columns.m_col_name] = gigname;          row[m_InstrumentsModel.m_col_name] = gigname;
3654          row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
3655      }      }
3656  }  }
3657    
# Line 3722  void MainWindow::show_midi_rules() Line 3722  void MainWindow::show_midi_rules()
3722  void MainWindow::show_script_slots() {  void MainWindow::show_script_slots() {
3723      if (!file) return;      if (!file) return;
3724      // get selected instrument      // get selected instrument
3725      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();
3726      if (rows.empty()) return;      if (rows.empty()) return;
3727      Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);      Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
3728      if (!it) return;      if (!it) return;
3729      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3730      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
3731      if (!instrument) return;      if (!instrument) return;
3732    
3733      ScriptSlots* window = new ScriptSlots;      ScriptSlots* window = new ScriptSlots;
# Line 3743  void MainWindow::onScriptSlotsModified(g Line 3743  void MainWindow::onScriptSlotsModified(g
3743      if (!pInstrument) return;      if (!pInstrument) return;
3744      const int iScriptSlots = pInstrument->ScriptSlotCount();      const int iScriptSlots = pInstrument->ScriptSlotCount();
3745    
3746      //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!
3747      //Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
3748      Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
3749    
3750      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
3751          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
3752          if (row[m_Columns.m_col_instr] != pInstrument) continue;          if (row[m_InstrumentsModel.m_col_instr] != pInstrument) continue;
3753          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3754          row[m_Columns.m_col_tooltip] = scriptTooltipFor(pInstrument, i);          row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(pInstrument, i);
3755          break;          break;
3756      }      }
3757    
# Line 3966  void MainWindow::on_instrument_selection Line 3966  void MainWindow::on_instrument_selection
3966              find(children.begin(), children.end(), item);              find(children.begin(), children.end(), item);
3967          if (it != children.end()) {          if (it != children.end()) {
3968              int index = it - children.begin();              int index = it - children.begin();
3969              m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));              m_TreeViewInstruments.get_selection()->select(Gtk::TreePath(ToString(index)));
3970    
3971              m_RegionChooser.set_instrument(file->GetInstrument(index));              m_RegionChooser.set_instrument(file->GetInstrument(index));
3972          }          }
# Line 4037  void MainWindow::on_action_move_instr() Line 4037  void MainWindow::on_action_move_instr()
4037  void MainWindow::select_instrument(gig::Instrument* instrument) {  void MainWindow::select_instrument(gig::Instrument* instrument) {
4038      if (!instrument) return;      if (!instrument) return;
4039    
4040      //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!
4041      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
4042      //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
4043    
4044      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
4045          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
4046          if (row[m_Columns.m_col_instr] == instrument) {          if (row[m_InstrumentsModel.m_col_instr] == instrument) {
4047              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
4048              show_intruments_tab();              show_intruments_tab();
4049              m_TreeView.get_selection()->unselect_all();              m_TreeViewInstruments.get_selection()->unselect_all();
4050                            
4051  #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)
4052              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
4053              m_TreeView.get_selection()->select(iterSel);              m_TreeViewInstruments.get_selection()->select(iterSel);
4054  #else  #else
4055              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeViewInstruments.get_selection()->select(model->children()[i]);
4056  #endif  #endif
4057              std::vector<Gtk::TreeModel::Path> rows =              std::vector<Gtk::TreeModel::Path> rows =
4058                  m_TreeView.get_selection()->get_selected_rows();                  m_TreeViewInstruments.get_selection()->get_selected_rows();
4059              if (!rows.empty())              if (!rows.empty())
4060                  m_TreeView.scroll_to_row(rows[0]);                  m_TreeViewInstruments.scroll_to_row(rows[0]);
4061              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
4062          }          }
4063      }      }
# Line 4068  bool MainWindow::select_dimension_region Line 4068  bool MainWindow::select_dimension_region
4068      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
4069      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
4070    
4071      //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!
4072      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeViewInstruments.get_model();
4073      //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();      //Glib::RefPtr<Gtk::TreeModel> model = m_refInstrumentsModelFilter->get_model();
4074    
4075      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
4076          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
4077          if (row[m_Columns.m_col_instr] == pInstrument) {          if (row[m_InstrumentsModel.m_col_instr] == pInstrument) {
4078              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
4079              show_intruments_tab();              show_intruments_tab();
4080              m_TreeView.get_selection()->unselect_all();              m_TreeViewInstruments.get_selection()->unselect_all();
4081  #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)
4082              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
4083              m_TreeView.get_selection()->select(iterSel);              m_TreeViewInstruments.get_selection()->select(iterSel);
4084  #else  #else
4085              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeViewInstruments.get_selection()->select(model->children()[i]);
4086  #endif  #endif
4087              std::vector<Gtk::TreeModel::Path> rows =              std::vector<Gtk::TreeModel::Path> rows =
4088                  m_TreeView.get_selection()->get_selected_rows();                  m_TreeViewInstruments.get_selection()->get_selected_rows();
4089              if (!rows.empty())              if (!rows.empty())
4090                  m_TreeView.scroll_to_row(rows[0]);                  m_TreeViewInstruments.scroll_to_row(rows[0]);
4091              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
4092    
4093              // select respective region in the region selector              // select respective region in the region selector
# Line 4372  void MainWindow::add_instrument(gig::Ins Line 4372  void MainWindow::add_instrument(gig::Ins
4372    
4373      // update instrument tree view      // update instrument tree view
4374      instrument_name_connection.block();      instrument_name_connection.block();
4375      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refInstrumentsTreeModel->append();
4376      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
4377      const int index = m_refTreeModel->children().size() - 1;      const int index = m_refInstrumentsTreeModel->children().size() - 1;
4378      const int iScriptSlots = instrument->ScriptSlotCount();      const int iScriptSlots = instrument->ScriptSlotCount();
4379      rowInstr[m_Columns.m_col_nr] = index;      rowInstr[m_InstrumentsModel.m_col_nr] = index;
4380      rowInstr[m_Columns.m_col_name] = name;      rowInstr[m_InstrumentsModel.m_col_name] = name;
4381      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_InstrumentsModel.m_col_instr] = instrument;
4382      rowInstr[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";      rowInstr[m_InstrumentsModel.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
4383      rowInstr[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);      rowInstr[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
4384      instrument_name_connection.unblock();      instrument_name_connection.unblock();
4385    
4386  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 4406  void MainWindow::on_action_duplicate_ins Line 4406  void MainWindow::on_action_duplicate_ins
4406    
4407      // retrieve the currently selected instrument      // retrieve the currently selected instrument
4408      // (being the original instrument to be duplicated)      // (being the original instrument to be duplicated)
4409      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
4410      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
4411      for (int r = 0; r < rows.size(); ++r) {      for (int r = 0; r < rows.size(); ++r) {
4412          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
4413          if (it) {          if (it) {
4414              Gtk::TreeModel::Row row = *it;              Gtk::TreeModel::Row row = *it;
4415              gig::Instrument* instrOrig = row[m_Columns.m_col_instr];              gig::Instrument* instrOrig = row[m_InstrumentsModel.m_col_instr];
4416              if (instrOrig) {              if (instrOrig) {
4417                  // duplicate the orginal instrument                  // duplicate the orginal instrument
4418                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
# Line 4439  void MainWindow::on_action_remove_instru Line 4439  void MainWindow::on_action_remove_instru
4439          return;          return;
4440      }      }
4441    
4442      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
4443      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
4444      for (int r = rows.size() - 1; r >= 0; --r) {      for (int r = rows.size() - 1; r >= 0; --r) {
4445          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);          Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
4446          if (!it) continue;          if (!it) continue;
4447          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
4448          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_InstrumentsModel.m_col_instr];
4449          try {          try {
4450              Gtk::TreePath path(it);              Gtk::TreePath path(it);
4451              int index = path[0];              int index = path[0];
# Line 4459  void MainWindow::on_action_remove_instru Line 4459  void MainWindow::on_action_remove_instru
4459  #endif  #endif
4460    
4461              // remove row from instruments tree view              // remove row from instruments tree view
4462              m_refTreeModel->erase(it);              m_refInstrumentsTreeModel->erase(it);
4463              // update "Nr" column of all instrument rows              // update "Nr" column of all instrument rows
4464              {              {
4465                  int index = 0;                  int index = 0;
4466                  for (Gtk::TreeModel::iterator it = m_refTreeModel->children().begin();                  for (Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->children().begin();
4467                       it != m_refTreeModel->children().end(); ++it, ++index)                       it != m_refInstrumentsTreeModel->children().end(); ++it, ++index)
4468                  {                  {
4469                      Gtk::TreeModel::Row row = *it;                      Gtk::TreeModel::Row row = *it;
4470                      gig::Instrument* instrument = row[m_Columns.m_col_instr];                      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
4471                      row[m_Columns.m_col_nr] = index;                      row[m_InstrumentsModel.m_col_nr] = index;
4472                      row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);                      row[m_InstrumentsModel.m_col_tooltip] = scriptTooltipFor(instrument, index);
4473                  }                  }
4474              }              }
4475    
4476  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
4477              // select another instrument (in gtk3 this is done              // select another instrument (in gtk3 this is done
4478              // automatically)              // automatically)
4479              if (!m_refTreeModel->children().empty()) {              if (!m_refInstrumentsTreeModel->children().empty()) {
4480                  if (index == m_refTreeModel->children().size()) {                  if (index == m_refInstrumentsTreeModel->children().size()) {
4481                      index--;                      index--;
4482                  }                  }
4483                  m_TreeView.get_selection()->select(                  m_TreeViewInstruments.get_selection()->select(
4484                      Gtk::TreePath(ToString(index)));                      Gtk::TreePath(ToString(index)));
4485              }              }
4486  #endif  #endif
# Line 5132  void MainWindow::on_instruments_treeview Line 5132  void MainWindow::on_instruments_treeview
5132      // get selected source instrument      // get selected source instrument
5133      gig::Instrument* src = NULL;      gig::Instrument* src = NULL;
5134      {      {
5135          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
5136          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
5137          if (!rows.empty()) {          if (!rows.empty()) {
5138              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);              Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[0]);
5139              if (it) {              if (it) {
5140                  Gtk::TreeModel::Row row = *it;                  Gtk::TreeModel::Row row = *it;
5141                  src = row[m_Columns.m_col_instr];                  src = row[m_InstrumentsModel.m_col_instr];
5142              }              }
5143          }          }
5144      }      }
# Line 5160  void MainWindow::on_instruments_treeview Line 5160  void MainWindow::on_instruments_treeview
5160      gig::Instrument* dst = NULL;      gig::Instrument* dst = NULL;
5161      {      {
5162          Gtk::TreeModel::Path path;          Gtk::TreeModel::Path path;
5163          const bool found = m_TreeView.get_path_at_pos(x, y, path);          const bool found = m_TreeViewInstruments.get_path_at_pos(x, y, path);
5164          if (!found) return;          if (!found) return;
5165    
5166          Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path);          Gtk::TreeModel::iterator iter = m_refInstrumentsTreeModel->get_iter(path);
5167          if (!iter) return;          if (!iter) return;
5168          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
5169          dst = row[m_Columns.m_col_instr];          dst = row[m_InstrumentsModel.m_col_instr];
5170      }      }
5171      if (!dst) return;      if (!dst) return;
5172    
# Line 5348  void MainWindow::instrument_name_changed Line 5348  void MainWindow::instrument_name_changed
5348                                           const Gtk::TreeModel::iterator& iter) {                                           const Gtk::TreeModel::iterator& iter) {
5349      if (!iter) return;      if (!iter) return;
5350      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5351      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
5352    
5353  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
5354      // change name in instrument menu      // change name in instrument menu
# Line 5366  void MainWindow::instrument_name_changed Line 5366  void MainWindow::instrument_name_changed
5366  #endif  #endif
5367    
5368      // change name in gig      // change name in gig
5369      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_InstrumentsModel.m_col_instr];
5370      gig::String gigname(gig_from_utf8(name));      gig::String gigname(gig_from_utf8(name));
5371      if (instrument && instrument->pInfo->Name != gigname) {      if (instrument && instrument->pInfo->Name != gigname) {
5372          instrument->pInfo->Name = gigname;          instrument->pInfo->Name = gigname;
# Line 5394  bool MainWindow::instrument_row_visible( Line 5394  bool MainWindow::instrument_row_visible(
5394  #else  #else
5395      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
5396  #endif  #endif
5397      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_InstrumentsModel.m_col_name];
5398      name = name.lowercase();      name = name.lowercase();
5399    
5400      std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);      std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);
# Line 5412  void MainWindow::on_action_combine_instr Line 5412  void MainWindow::on_action_combine_instr
5412      // list view as pre-selection      // list view as pre-selection
5413      std::set<int> indeces;      std::set<int> indeces;
5414      {      {
5415          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewInstruments.get_selection();
5416          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
5417          for (int r = 0; r < rows.size(); ++r) {          for (int r = 0; r < rows.size(); ++r) {
5418              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);              Gtk::TreeModel::iterator it = m_refInstrumentsTreeModel->get_iter(rows[r]);
5419              if (it) {              if (it) {
5420                  Gtk::TreeModel::Row row = *it;                  Gtk::TreeModel::Row row = *it;
5421                  int index = row[m_Columns.m_col_nr];                  int index = row[m_InstrumentsModel.m_col_nr];
5422                  indeces.insert(index);                  indeces.insert(index);
5423              }              }
5424          }          }
Legend:
Removed from v.3800  
changed lines
  Added in v.3806
  ViewVC Help
Powered by ViewVC