/[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 3197 by schoenebeck, Sat May 20 17:15:36 2017 UTC revision 3344 by schoenebeck, Wed Aug 2 10:39:46 2017 UTC
# Line 32  Line 32 
32  #include <glibmm/dispatcher.h>  #include <glibmm/dispatcher.h>
33  #include <glibmm/miscutils.h>  #include <glibmm/miscutils.h>
34  #include <glibmm/stringutils.h>  #include <glibmm/stringutils.h>
35    #include <glibmm/regex.h>
36  #include <gtkmm/aboutdialog.h>  #include <gtkmm/aboutdialog.h>
37  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
38  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
# Line 62  Line 63 
63  #include "gfx/builtinpix.h"  #include "gfx/builtinpix.h"
64  #include "MacroEditor.h"  #include "MacroEditor.h"
65  #include "MacrosSetup.h"  #include "MacrosSetup.h"
66    #if defined(__APPLE__)
67    # include "MacHelper.h"
68    #endif
69    
70    static const Gdk::ModifierType primaryModifierKey =
71        #if defined(__APPLE__)
72        Gdk::META_MASK; // Cmd key on Mac
73        #else
74        Gdk::CONTROL_MASK; // Ctrl key on all other OSs
75        #endif
76    
77  MainWindow::MainWindow() :  MainWindow::MainWindow() :
78      m_DimRegionChooser(*this),      m_DimRegionChooser(*this),
# Line 77  MainWindow::MainWindow() : Line 88  MainWindow::MainWindow() :
88  {  {
89      loadBuiltInPix();      loadBuiltInPix();
90    
91        this->file = NULL;
92    
93  //    set_border_width(5);  //    set_border_width(5);
94  //    set_default_size(400, 200);  
95        if (!Settings::singleton()->autoRestoreWindowDimension) {
96            set_default_size(800, 600);
97            set_position(Gtk::WIN_POS_CENTER);
98        }
99    
100      add(m_VBox);      add(m_VBox);
101    
# Line 105  MainWindow::MainWindow() : Line 122  MainWindow::MainWindow() :
122    
123      m_TreeViewNotebook.set_size_request(300);      m_TreeViewNotebook.set_size_request(300);
124    
125      m_HPaned.add1(m_TreeViewNotebook);      m_searchLabel.set_text(Glib::ustring(" ") + _("Filter:"));
126        m_searchField.pack_start(m_searchLabel, Gtk::PACK_SHRINK);
127        m_searchField.pack_start(m_searchText);
128        m_searchField.set_spacing(5);
129    
130        m_left_vbox.pack_start(m_TreeViewNotebook);
131        m_left_vbox.pack_start(m_searchField, Gtk::PACK_SHRINK);
132    
133        m_HPaned.add1(m_left_vbox);
134    
135      dimreg_hbox.add(dimreg_label);      dimreg_hbox.add(dimreg_label);
136      dimreg_hbox.add(dimreg_all_regions);      dimreg_hbox.add(dimreg_all_regions);
137      dimreg_hbox.add(dimreg_all_dimregs);      dimreg_hbox.add(dimreg_all_dimregs);
# Line 207  MainWindow::MainWindow() : Line 233  MainWindow::MainWindow() :
233          sigc::mem_fun(*this, &MainWindow::show_scripts_tab)          sigc::mem_fun(*this, &MainWindow::show_scripts_tab)
234      );      );
235      actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select")));      actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select")));
236        actionGroup->add(Gtk::Action::create("AssignScripts", _("Assign Script")));
237    
238      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
239    
# Line 232  MainWindow::MainWindow() : Line 259  MainWindow::MainWindow() :
259                       Gtk::AccelKey(GDK_KEY_x, Gdk::MOD1_MASK),                       Gtk::AccelKey(GDK_KEY_x, Gdk::MOD1_MASK),
260                       sigc::mem_fun(*this, &MainWindow::adjust_clipboard_content));                       sigc::mem_fun(*this, &MainWindow::adjust_clipboard_content));
261    
262        actionGroup->add(Gtk::Action::create("SelectPrevInstr",
263                                             _("Select Previous Instrument")),
264                         Gtk::AccelKey(GDK_KEY_Up, primaryModifierKey),
265                         sigc::mem_fun(*this, &MainWindow::select_prev_instrument));
266    
267        actionGroup->add(Gtk::Action::create("SelectNextInstr",
268                                             _("Select Next Instrument")),
269                         Gtk::AccelKey(GDK_KEY_Down, primaryModifierKey),
270                         sigc::mem_fun(*this, &MainWindow::select_next_instrument));
271    
272      actionGroup->add(Gtk::Action::create("SelectPrevRegion",      actionGroup->add(Gtk::Action::create("SelectPrevRegion",
273                                           _("Select Previous Region")),                                           _("Select Previous Region")),
274                       Gtk::AccelKey(GDK_KEY_Left, primaryModifierKey),                       Gtk::AccelKey(GDK_KEY_Left, primaryModifierKey),
# Line 333  MainWindow::MainWindow() : Line 370  MainWindow::MainWindow() :
370          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
371      );      );
372      actionGroup->add(      actionGroup->add(
373            Gtk::Action::create("CombInstruments", _("_Combine Instruments ...")),
374            Gtk::AccelKey(GDK_KEY_j, primaryModifierKey),
375            sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
376        );
377        actionGroup->add(
378          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),
379          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
380      );      );
# Line 455  MainWindow::MainWindow() : Line 497  MainWindow::MainWindow() :
497          "      <menuitem action='AdjustClipboard'/>"          "      <menuitem action='AdjustClipboard'/>"
498          "      <menuitem action='PasteDimRgn'/>"          "      <menuitem action='PasteDimRgn'/>"
499          "      <separator/>"          "      <separator/>"
500            "      <menuitem action='SelectPrevInstr'/>"
501            "      <menuitem action='SelectNextInstr'/>"
502            "      <separator/>"
503          "      <menuitem action='SelectPrevRegion'/>"          "      <menuitem action='SelectPrevRegion'/>"
504          "      <menuitem action='SelectNextRegion'/>"          "      <menuitem action='SelectNextRegion'/>"
505          "      <separator/>"          "      <separator/>"
# Line 489  MainWindow::MainWindow() : Line 534  MainWindow::MainWindow() :
534          "      <menuitem action='InstrProperties'/>"          "      <menuitem action='InstrProperties'/>"
535          "      <menuitem action='MidiRules'/>"          "      <menuitem action='MidiRules'/>"
536          "      <menuitem action='ScriptSlots'/>"          "      <menuitem action='ScriptSlots'/>"
537            "      <menu action='AssignScripts'/>"
538          "      <menuitem action='AddInstrument'/>"          "      <menuitem action='AddInstrument'/>"
539          "      <menuitem action='DupInstrument'/>"          "      <menuitem action='DupInstrument'/>"
540            "      <menuitem action='CombInstruments'/>"
541          "      <separator/>"          "      <separator/>"
542          "      <menuitem action='RemoveInstrument'/>"          "      <menuitem action='RemoveInstrument'/>"
543          "    </menu>"          "    </menu>"
# Line 527  MainWindow::MainWindow() : Line 574  MainWindow::MainWindow() :
574          "    <menuitem action='ScriptSlots'/>"          "    <menuitem action='ScriptSlots'/>"
575          "    <menuitem action='AddInstrument'/>"          "    <menuitem action='AddInstrument'/>"
576          "    <menuitem action='DupInstrument'/>"          "    <menuitem action='DupInstrument'/>"
577            "    <menuitem action='CombInstruments'/>"
578          "    <separator/>"          "    <separator/>"
579          "    <menuitem action='RemoveInstrument'/>"          "    <menuitem action='RemoveInstrument'/>"
580          "  </popup>"          "  </popup>"
# Line 621  MainWindow::MainWindow() : Line 669  MainWindow::MainWindow() :
669      instrument_menu = static_cast<Gtk::MenuItem*>(      instrument_menu = static_cast<Gtk::MenuItem*>(
670          uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments"))->get_submenu();          uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments"))->get_submenu();
671    
672        assign_scripts_menu = static_cast<Gtk::MenuItem*>(
673            uiManager->get_widget("/MenuBar/MenuInstrument/AssignScripts"))->get_submenu();
674    
675      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");
676      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
677      m_VBox.pack_start(m_HPaned);      m_VBox.pack_start(m_HPaned);
# Line 644  MainWindow::MainWindow() : Line 695  MainWindow::MainWindow() :
695    
696      // Create the Tree model:      // Create the Tree model:
697      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
698      m_TreeView.set_model(m_refTreeModel);      m_refTreeModelFilter = Gtk::TreeModelFilter::create(m_refTreeModel);
699        m_refTreeModelFilter->set_visible_func(
700            sigc::mem_fun(*this, &MainWindow::instrument_row_visible)
701        );
702        m_TreeView.set_model(m_refTreeModelFilter);
703    
704      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
705      m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));      m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));
706      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
# Line 820  MainWindow::MainWindow() : Line 876  MainWindow::MainWindow() :
876      dimreg_stereo.signal_toggled().connect(      dimreg_stereo.signal_toggled().connect(
877          sigc::mem_fun(*this, &MainWindow::update_dimregs));          sigc::mem_fun(*this, &MainWindow::update_dimregs));
878    
879        m_searchText.signal_changed().connect(
880            sigc::mem_fun(m_refTreeModelFilter.operator->(), &Gtk::TreeModelFilter::refilter)
881        );
882    
883      file = 0;      file = 0;
884      file_is_changed = false;      file_is_changed = false;
885    
# Line 828  MainWindow::MainWindow() : Line 888  MainWindow::MainWindow() :
888      // start with a new gig file by default      // start with a new gig file by default
889      on_action_file_new();      on_action_file_new();
890    
891        m_TreeViewNotebook.signal_switch_page().connect(
892            sigc::mem_fun(*this, &MainWindow::on_notebook_tab_switched)
893        );
894    
895      // select 'Instruments' tab by default      // select 'Instruments' tab by default
896      // (gtk allows this only if the tab childs are visible, thats why it's here)      // (gtk allows this only if the tab childs are visible, thats why it's here)
897      m_TreeViewNotebook.set_current_page(1);      m_TreeViewNotebook.set_current_page(1);
# Line 844  MainWindow::MainWindow() : Line 908  MainWindow::MainWindow() :
908              uiManager->get_widget("/MenuBar/MenuMacro")              uiManager->get_widget("/MenuBar/MenuMacro")
909          )->get_submenu();          )->get_submenu();
910    
         const Gdk::ModifierType primaryModifierKey =  
 #if defined(__APPLE__)  
             Gdk::META_MASK; // Cmd key on Mac  
 #else  
             Gdk::CONTROL_MASK; // Ctrl key on all other OSs  
 #endif  
   
911          const Gdk::ModifierType noModifier = (Gdk::ModifierType)0;          const Gdk::ModifierType noModifier = (Gdk::ModifierType)0;
912          Gtk::AccelMap::add_entry("<Macros>/macro_0", GDK_KEY_F1, noModifier);          Gtk::AccelMap::add_entry("<Macros>/macro_0", GDK_KEY_F1, noModifier);
913          Gtk::AccelMap::add_entry("<Macros>/macro_1", GDK_KEY_F2, noModifier);          Gtk::AccelMap::add_entry("<Macros>/macro_1", GDK_KEY_F2, noModifier);
# Line 871  MainWindow::MainWindow() : Line 928  MainWindow::MainWindow() :
928    
929          updateMacroMenu();          updateMacroMenu();
930      }      }
931    
932        // setup "Assign Scripts" keyboard accelerators
933        {
934            Gtk::AccelMap::add_entry("<Scripts>/script_0", GDK_KEY_F1, Gdk::SHIFT_MASK);
935            Gtk::AccelMap::add_entry("<Scripts>/script_1", GDK_KEY_F2, Gdk::SHIFT_MASK);
936            Gtk::AccelMap::add_entry("<Scripts>/script_2", GDK_KEY_F3, Gdk::SHIFT_MASK);
937            Gtk::AccelMap::add_entry("<Scripts>/script_3", GDK_KEY_F4, Gdk::SHIFT_MASK);
938            Gtk::AccelMap::add_entry("<Scripts>/script_4", GDK_KEY_F5, Gdk::SHIFT_MASK);
939            Gtk::AccelMap::add_entry("<Scripts>/script_5", GDK_KEY_F6, Gdk::SHIFT_MASK);
940            Gtk::AccelMap::add_entry("<Scripts>/script_6", GDK_KEY_F7, Gdk::SHIFT_MASK);
941            Gtk::AccelMap::add_entry("<Scripts>/script_7", GDK_KEY_F8, Gdk::SHIFT_MASK);
942            Gtk::AccelMap::add_entry("<Scripts>/script_8", GDK_KEY_F9, Gdk::SHIFT_MASK);
943            Gtk::AccelMap::add_entry("<Scripts>/script_9", GDK_KEY_F10, Gdk::SHIFT_MASK);
944            Gtk::AccelMap::add_entry("<Scripts>/script_10", GDK_KEY_F11, Gdk::SHIFT_MASK);
945            Gtk::AccelMap::add_entry("<Scripts>/script_11", GDK_KEY_F12, Gdk::SHIFT_MASK);
946    
947            Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
948            assign_scripts_menu->set_accel_group(accelGroup);
949        }
950    
951        Glib::signal_idle().connect_once(
952            sigc::mem_fun(*this, &MainWindow::bringToFront),
953            200
954        );
955  }  }
956    
957  MainWindow::~MainWindow()  MainWindow::~MainWindow()
958  {  {
959  }  }
960    
961    void MainWindow::bringToFront() {
962        #if defined(__APPLE__)
963        macRaiseAppWindow();
964        #endif
965        raise();
966        present();
967    }
968    
969  void MainWindow::updateMacroMenu() {  void MainWindow::updateMacroMenu() {
970      Gtk::Menu* menuMacro = dynamic_cast<Gtk::MenuItem*>(      Gtk::Menu* menuMacro = dynamic_cast<Gtk::MenuItem*>(
971          uiManager->get_widget("/MenuBar/MenuMacro")          uiManager->get_widget("/MenuBar/MenuMacro")
# Line 975  void MainWindow::onMacrosSetupChanged(co Line 1064  void MainWindow::onMacrosSetupChanged(co
1064      updateMacroMenu();      updateMacroMenu();
1065  }  }
1066    
1067    //NOTE: the actual signal's first argument for argument 'page' is on some gtkmm version GtkNotebookPage* and on some Gtk::Widget*. Since we don't need that argument, it is simply void* here for now.
1068    void MainWindow::on_notebook_tab_switched(void* page, guint page_num) {
1069        bool isInstrumentsPage = (page_num == 1);
1070        // so far we only support filtering for the instruments list, so hide the
1071        // filter text entry field if another tab is selected
1072        m_searchField.set_visible(isInstrumentsPage);
1073    }
1074    
1075  bool MainWindow::on_delete_event(GdkEventAny* event)  bool MainWindow::on_delete_event(GdkEventAny* event)
1076  {  {
1077      return !file_is_shared && file_is_changed && !close_confirmation_dialog();      return !file_is_shared && file_is_changed && !close_confirmation_dialog();
# Line 1075  void MainWindow::on_sel_change() Line 1172  void MainWindow::on_sel_change()
1172          }          }
1173      }      }
1174    
1175        updateScriptListOfMenu();
1176    
1177      m_RegionChooser.set_instrument(get_instrument());      m_RegionChooser.set_instrument(get_instrument());
1178    
1179      if (Settings::singleton()->syncSamplerInstrumentSelection) {      if (Settings::singleton()->syncSamplerInstrumentSelection) {
# Line 1816  void MainWindow::on_action_help_about() Line 1915  void MainWindow::on_action_help_about()
1915      dialog.set_comments(sComment.c_str());      dialog.set_comments(sComment.c_str());
1916      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
1917      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
1918        dialog.set_position(Gtk::WIN_POS_CENTER);
1919      dialog.run();      dialog.run();
1920  }  }
1921    
# Line 1841  PropDialog::PropDialog() Line 1941  PropDialog::PropDialog()
1941        table(2, 1),        table(2, 1),
1942        m_file(NULL)        m_file(NULL)
1943  {  {
1944        if (!Settings::singleton()->autoRestoreWindowDimension) {
1945            set_default_size(470, 390);
1946            set_position(Gtk::WIN_POS_MOUSE);
1947        }
1948    
1949      set_title(_("File Properties"));      set_title(_("File Properties"));
1950      eName.set_width_chars(50);      eName.set_width_chars(50);
1951    
# Line 1975  InstrumentProps::InstrumentProps() : Line 2080  InstrumentProps::InstrumentProps() :
2080      eDimensionKeyRangeLow(_("Keyswitching range low")),      eDimensionKeyRangeLow(_("Keyswitching range low")),
2081      eDimensionKeyRangeHigh(_("Keyswitching range high"))      eDimensionKeyRangeHigh(_("Keyswitching range high"))
2082  {  {
2083        if (!Settings::singleton()->autoRestoreWindowDimension) {
2084            //set_default_size(470, 390);
2085            set_position(Gtk::WIN_POS_MOUSE);
2086        }
2087    
2088      set_title(_("Instrument Properties"));      set_title(_("Instrument Properties"));
2089    
2090      eDimensionKeyRangeLow.set_tip(      eDimensionKeyRangeLow.set_tip(
# Line 2256  void MainWindow::onScriptSlotsModified(g Line 2366  void MainWindow::onScriptSlotsModified(g
2366      if (!pInstrument) return;      if (!pInstrument) return;
2367      const int iScriptSlots = pInstrument->ScriptSlotCount();      const int iScriptSlots = pInstrument->ScriptSlotCount();
2368    
2369      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      //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!
2370        //Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
2371        Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();
2372    
2373      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
2374          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
2375          if (row[m_Columns.m_col_instr] != pInstrument) continue;          if (row[m_Columns.m_col_instr] != pInstrument) continue;
2376          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
2377          break;          break;
2378      }      }
2379    
2380        // causes the sampler to reload the instrument with the new script
2381        on_sel_change();
2382    }
2383    
2384    void MainWindow::assignScript(gig::Script* pScript) {
2385        if (!pScript) {
2386            printf("assignScript() : !script\n");
2387            return;
2388        }
2389        printf("assignScript('%s')\n", pScript->Name.c_str());
2390    
2391        gig::Instrument* pInstrument = get_instrument();
2392        if (!pInstrument) {
2393            printf("!instrument\n");
2394            return;
2395        }
2396    
2397        pInstrument->AddScriptSlot(pScript);
2398    
2399        onScriptSlotsModified(pInstrument);
2400  }  }
2401    
2402  void MainWindow::on_action_refresh_all() {  void MainWindow::on_action_refresh_all() {
# Line 2367  void MainWindow::on_instrument_selection Line 2501  void MainWindow::on_instrument_selection
2501  void MainWindow::select_instrument(gig::Instrument* instrument) {  void MainWindow::select_instrument(gig::Instrument* instrument) {
2502      if (!instrument) return;      if (!instrument) return;
2503    
2504        //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!
2505      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
2506        //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();
2507    
2508      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
2509          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
2510          if (row[m_Columns.m_col_instr] == instrument) {          if (row[m_Columns.m_col_instr] == instrument) {
# Line 2389  bool MainWindow::select_dimension_region Line 2526  bool MainWindow::select_dimension_region
2526      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();      gig::Region* pRegion = (gig::Region*) dimRgn->GetParent();
2527      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();      gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent();
2528    
2529        //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!
2530      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();      Glib::RefPtr<Gtk::TreeModel> model = m_TreeView.get_model();
2531        //Glib::RefPtr<Gtk::TreeModel> model = m_refTreeModelFilter->get_model();
2532    
2533      for (int i = 0; i < model->children().size(); ++i) {      for (int i = 0; i < model->children().size(); ++i) {
2534          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
2535          if (row[m_Columns.m_col_instr] == pInstrument) {          if (row[m_Columns.m_col_instr] == pInstrument) {
# Line 2537  void MainWindow::on_script_treeview_butt Line 2677  void MainWindow::on_script_treeview_butt
2677      }      }
2678  }  }
2679    
2680    void MainWindow::updateScriptListOfMenu() {
2681        // remove all entries from "Assign Script" menu
2682        {
2683            const std::vector<Gtk::Widget*> children = assign_scripts_menu->get_children();
2684            for (int i = 0; i < children.size(); ++i) {
2685                Gtk::Widget* child = children[i];
2686                assign_scripts_menu->remove(*child);
2687                delete child;
2688            }
2689        }
2690    
2691        int iTotalScripts = 0;
2692    
2693        if (!file) goto noScripts;
2694    
2695        // add all configured macros as menu items to the "Macro" menu
2696        for (int iGroup = 0; file->GetScriptGroup(iGroup); ++iGroup) {
2697            gig::ScriptGroup* pGroup = file->GetScriptGroup(iGroup);
2698            for (int iScript = 0; pGroup->GetScript(iScript); ++iScript, ++iTotalScripts) {
2699                gig::Script* pScript = pGroup->GetScript(iScript);
2700                std::string name = pScript->Name;
2701    
2702                Gtk::MenuItem* item = new Gtk::MenuItem(name);
2703                item->signal_activate().connect(
2704                    sigc::bind(
2705                        sigc::mem_fun(*this, &MainWindow::assignScript), pScript
2706                    )
2707                );
2708                assign_scripts_menu->append(*item);
2709                item->set_accel_path("<Scripts>/script_" + ToString(iTotalScripts));
2710                //item->set_tooltip_text(comment);
2711            }
2712        }
2713    
2714        noScripts:
2715    
2716        // if there are no macros configured at all, then show a dummy entry instead
2717        if (!iTotalScripts) {
2718            Gtk::MenuItem* item = new Gtk::MenuItem(_("No Scripts"));
2719            item->set_sensitive(false);
2720            assign_scripts_menu->append(*item);
2721        }
2722    
2723        assign_scripts_menu->show_all_children();
2724    }
2725    
2726  Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(  Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
2727      const Glib::ustring& name, int position) {      const Glib::ustring& name, int position) {
2728    
# Line 2583  void MainWindow::add_instrument(gig::Ins Line 2769  void MainWindow::add_instrument(gig::Ins
2769      instrument_name_connection.unblock();      instrument_name_connection.unblock();
2770    
2771      add_instrument_to_menu(name);      add_instrument_to_menu(name);
2772        select_instrument(instrument);
     m_TreeView.get_selection()->select(iterInstr);  
   
2773      file_changed();      file_changed();
2774  }  }
2775    
# Line 3555  void MainWindow::instrument_name_changed Line 3739  void MainWindow::instrument_name_changed
3739      }      }
3740  }  }
3741    
3742    bool MainWindow::instrument_row_visible(const Gtk::TreeModel::const_iterator& iter) {
3743        if (!iter)
3744            return true;
3745    
3746        Glib::ustring pattern = m_searchText.get_text().lowercase();
3747        trim(pattern);
3748        if (pattern.empty()) return true;
3749    
3750        Gtk::TreeModel::Row row = *iter;
3751        Glib::ustring name = row[m_Columns.m_col_name];
3752        name = name.lowercase();
3753    
3754        std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(" ", pattern);
3755        for (int t = 0; t < tokens.size(); ++t)
3756            if (name.find(tokens[t]) == Glib::ustring::npos)
3757                return false;
3758    
3759        return true;
3760    }
3761    
3762  void MainWindow::on_action_combine_instruments() {  void MainWindow::on_action_combine_instruments() {
3763      CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file);      CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file);
3764    
3765        // take over selection from instruments list view for the combine dialog's
3766        // list view as pre-selection
3767        std::set<int> indeces;
3768        {
3769            Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
3770            std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3771            for (int r = 0; r < rows.size(); ++r) {
3772                Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);
3773                if (it) {
3774                    Gtk::TreeModel::Row row = *it;
3775                    int index = row[m_Columns.m_col_nr];
3776                    indeces.insert(index);
3777                }
3778            }
3779        }
3780        d->setSelectedInstruments(indeces);
3781    
3782      d->show_all();      d->show_all();
     d->resize(500, 400);  
3783      d->run();      d->run();
3784      if (d->fileWasChanged()) {      if (d->fileWasChanged()) {
3785          // update GUI with new instrument just created          // update GUI with new instrument just created
# Line 3820  void MainWindow::show_scripts_tab() { Line 4041  void MainWindow::show_scripts_tab() {
4041      m_TreeViewNotebook.set_current_page(2);      m_TreeViewNotebook.set_current_page(2);
4042  }  }
4043    
4044    void MainWindow::select_instrument_by_dir(int dir) {
4045        if (!file) return;
4046        gig::Instrument* pInstrument = get_instrument();
4047        if (!pInstrument) {
4048            select_instrument( file->GetInstrument(0) );
4049            return;
4050        }
4051        for (int i = 0; file->GetInstrument(i); ++i) {
4052            if (file->GetInstrument(i) == pInstrument) {
4053                select_instrument( file->GetInstrument(i + dir) );
4054                return;
4055            }
4056        }
4057    }
4058    
4059    void MainWindow::select_prev_instrument() {
4060        select_instrument_by_dir(-1);
4061    }
4062    
4063    void MainWindow::select_next_instrument() {
4064        select_instrument_by_dir(1);
4065    }
4066    
4067  void MainWindow::select_prev_region() {  void MainWindow::select_prev_region() {
4068      m_RegionChooser.select_prev_region();      m_RegionChooser.select_prev_region();
4069  }  }
Legend:
Removed from v.3197  
changed lines
  Added in v.3344
  ViewVC Help
Powered by ViewVC