--- gigedit/trunk/src/gigedit/mainwindow.h	2017/05/20 17:15:36	3197
+++ gigedit/trunk/src/gigedit/mainwindow.h	2017/07/31 11:35:30	3343
@@ -39,10 +39,14 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treestore.h>
+#include <gtkmm/treemodelfilter.h>
 #include <gtkmm/uimanager.h>
 #include <gtkmm/window.h>
 #include <gtkmm/statusbar.h>
 #include <gtkmm/image.h>
+#include <gtkmm/entry.h>
+#include <gtk/gtknotebook.h>
+#include <gtkmm/notebook.h>
 
 #include <sstream>
 
@@ -292,6 +296,7 @@
     void onMacrosSetupChanged(const std::vector<Serialization::Archive>& macros);
     void applyMacro(Serialization::Archive& macro);
     void onScriptSlotsModified(gig::Instrument* pInstrument);
+    void bringToFront();
 
     void dimreg_all_dimregs_toggled();
     gig::Instrument* get_instrument();
@@ -320,8 +325,10 @@
 
     Gtk::TreeView m_TreeView;
     Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
+    Glib::RefPtr<Gtk::TreeModelFilter> m_refTreeModelFilter; //FIXME: I really would love to get rid of TreeModelFilter, because it causes behavior conflicts with get_model() all over the place (see the respective comments regarding get_model()), however I found no other way to filter a treeview effectively.
 
     Gtk::Menu* instrument_menu;
+    Gtk::Menu* assign_scripts_menu;
 
     std::map<gig::Sample*,int> sample_ref_count;
 
@@ -400,7 +407,11 @@
     Gtk::Label labelSomeLoops;
     DimRegionEdit dimreg_edit;
 
+    Gtk::VBox m_left_vbox;
     Gtk::Notebook m_TreeViewNotebook;
+    Gtk::HBox m_searchField;
+    Gtk::Label m_searchLabel;
+    Gtk::Entry m_searchText;
 
     struct SampleImportItem {
         gig::Sample*  gig_sample;  // pointer to the gig::Sample to
@@ -431,6 +442,8 @@
     void on_action_move_root_note_with_region_moved();
     void on_action_help_about();
 
+    void on_notebook_tab_switched(GtkNotebookPage* page, guint page_num);
+
     // sample right-click popup actions
     void on_sample_treeview_button_release(GdkEventButton* button);
     void on_action_sample_properties();
@@ -456,6 +469,10 @@
     void show_intruments_tab();
     void show_scripts_tab();
 
+    void select_prev_instrument();
+    void select_next_instrument();
+    void select_instrument_by_dir(int dir);
+
     void select_prev_region();
     void select_next_region();
 
@@ -532,6 +549,7 @@
     void instrument_name_changed(const Gtk::TreeModel::Path& path,
                                  const Gtk::TreeModel::iterator& iter);
     void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it);
+    bool instrument_row_visible(const Gtk::TreeModel::const_iterator& iter);
     sigc::connection instrument_name_connection;
 
     void on_action_combine_instruments();
@@ -548,6 +566,8 @@
     void __import_queued_samples();
     void __clear();
     void __refreshEntireGUI();
+    void updateScriptListOfMenu();
+    void assignScript(gig::Script* pScript);
 
     bool close_confirmation_dialog();
     bool leaving_shared_mode_dialog();