Minor GUI touch-ups.

Updated inclusion guards to match filenames.


git-svn-id: http://svn.drobilla.net/lad/ingen@225 a436a847-0d15-0410-975c-d299462d15a1

7 files changed, 275 insertions, 316 deletions

diff --git a/src/progs/ingenuity/App.h b/src/progs/ingenuity/App.h
index 4d7e8e79..e21432dd 100644
--- a/src/progs/ingenuity/App.h
+++ b/src/progs/ingenuity/App.h
@@ -14,8 +14,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OMGTKAPP_H
-#define OMGTKAPP_H
+#ifndef APP_H
+#define APP_H
 
 #include <cassert>
 #include <string>
@@ -122,5 +122,5 @@ protected:
 
 } // namespace Ingenuity
 
-#endif // OMGTKAPP_H
+#endif // APP_H
 
diff --git a/src/progs/ingenuity/LoadPluginWindow.cpp b/src/progs/ingenuity/LoadPluginWindow.cpp
index d909ac67..c5a51d4d 100644
--- a/src/progs/ingenuity/LoadPluginWindow.cpp
+++ b/src/progs/ingenuity/LoadPluginWindow.cpp
@@ -42,7 +42,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
 	xml->get_widget("load_plugin_name_entry", m_node_name_entry);
 	xml->get_widget("load_plugin_clear_button", m_clear_button);
 	xml->get_widget("load_plugin_add_button", m_add_button);
-	xml->get_widget("load_plugin_close_button", m_close_button);
+	//xml->get_widget("load_plugin_close_button", m_close_button);
 	//xml->get_widget("load_plugin_ok_button", m_add_button);
 	
 	xml->get_widget("load_plugin_filter_combo", m_filter_combo);
@@ -71,14 +71,14 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
 	m_filter_combo->set_model(m_criteria_liststore);
 	Gtk::TreeModel::iterator iter = m_criteria_liststore->append();
 	Gtk::TreeModel::Row row = *iter;
-	row[m_criteria_columns.m_col_label] = "Name contains: ";
+	row[m_criteria_columns.m_col_label] = "Name contains";
 	row[m_criteria_columns.m_col_criteria] = CriteriaColumns::NAME;
 	m_filter_combo->set_active(iter);
 	iter = m_criteria_liststore->append(); row = *iter;
-	row[m_criteria_columns.m_col_label] = "Type contains: ";
+	row[m_criteria_columns.m_col_label] = "Type contains";
 	row[m_criteria_columns.m_col_criteria] = CriteriaColumns::TYPE;
 	iter = m_criteria_liststore->append(); row = *iter;
-	row[m_criteria_columns.m_col_label] = "URI contains: ";
+	row[m_criteria_columns.m_col_label] = "URI contains";
 	row[m_criteria_columns.m_col_criteria] = CriteriaColumns::URI;
 	/*iter = m_criteria_liststore->append(); row = *iter;
 	row[m_criteria_columns.m_col_label] = "Library contains: ";
@@ -89,7 +89,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
 
 	m_clear_button->signal_clicked().connect(          sigc::mem_fun(this, &LoadPluginWindow::clear_clicked));
 	m_add_button->signal_clicked().connect(            sigc::mem_fun(this, &LoadPluginWindow::add_clicked));
-	m_close_button->signal_clicked().connect(          sigc::mem_fun(this, &LoadPluginWindow::close_clicked));
+	//m_close_button->signal_clicked().connect(          sigc::mem_fun(this, &LoadPluginWindow::close_clicked));
 	//m_add_button->signal_clicked().connect(             sigc::mem_fun(this, &LoadPluginWindow::ok_clicked));
 	m_plugins_treeview->signal_row_activated().connect(sigc::mem_fun(this, &LoadPluginWindow::plugin_activated));
 	m_search_entry->signal_activate().connect(         sigc::mem_fun(this, &LoadPluginWindow::add_clicked));
@@ -316,6 +316,7 @@ LoadPluginWindow::add_clicked()
 }
 
 
+/*
 void
 LoadPluginWindow::close_clicked()
 {
@@ -323,7 +324,6 @@ LoadPluginWindow::close_clicked()
 }
 
 
-/*
 void
 LoadPluginWindow::ok_clicked()
 {
diff --git a/src/progs/ingenuity/LoadPluginWindow.h b/src/progs/ingenuity/LoadPluginWindow.h
index afa3be85..ec416f15 100644
--- a/src/progs/ingenuity/LoadPluginWindow.h
+++ b/src/progs/ingenuity/LoadPluginWindow.h
@@ -102,7 +102,7 @@ protected:
 	
 private:
 	void add_clicked();
-	void close_clicked();
+	//void close_clicked();
 	//void ok_clicked();
 	void filter_changed();
 	void clear_clicked();
@@ -133,7 +133,7 @@ private:
 	Gtk::Entry*       m_node_name_entry;
 	Gtk::Button*      m_clear_button;
 	Gtk::Button*      m_add_button;
-	Gtk::Button*      m_close_button;
+	//Gtk::Button*      m_close_button;
 	//Gtk::Button*      m_ok_button;
 	Gtk::ComboBox*    m_filter_combo;
 	Gtk::Entry*       m_search_entry;
diff --git a/src/progs/ingenuity/NodeModule.h b/src/progs/ingenuity/NodeModule.h
index 6b973f2b..625241e7 100644
--- a/src/progs/ingenuity/NodeModule.h
+++ b/src/progs/ingenuity/NodeModule.h
@@ -14,8 +14,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OMMODULE_H
-#define OMMODULE_H
+#ifndef NODEMODULE_H
+#define NODEMODULE_H
 
 #include <string>
 #include <boost/enable_shared_from_this.hpp>
@@ -80,10 +80,10 @@ protected:
 	void remove_port(SharedPtr<PortModel> port) { Module::remove_port(port->path().name()); }
 	
 	SharedPtr<NodeModel> m_node;
-	NodeMenu              m_menu;
+	NodeMenu             m_menu;
 };
 
 
 } // namespace Ingenuity
 
-#endif // OMMODULE_H
+#endif // NODEMODULE_H
diff --git a/src/progs/ingenuity/PatchCanvas.h b/src/progs/ingenuity/PatchCanvas.h
index c91bb6ec..72f79a9b 100644
--- a/src/progs/ingenuity/PatchCanvas.h
+++ b/src/progs/ingenuity/PatchCanvas.h
@@ -14,8 +14,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OMPATCHBAYAREA_H
-#define OMPATCHBAYAREA_H
+#ifndef PATCHCANVAS_H
+#define PATCHCANVAS_H
 
 #include <string>
 #include <boost/shared_ptr.hpp>
@@ -112,4 +112,4 @@ private:
 
 } // namespace Ingenuity
 
-#endif // OMPATCHBAYAREA_H
+#endif // PATCHCANVAS_H
diff --git a/src/progs/ingenuity/PatchPortModule.h b/src/progs/ingenuity/PatchPortModule.h
index 516d912d..619b8ecf 100644
--- a/src/progs/ingenuity/PatchPortModule.h
+++ b/src/progs/ingenuity/PatchPortModule.h
@@ -14,8 +14,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OMPORTMODULE_H
-#define OMPORTMODULE_H
+#ifndef PATCHPORTMODULE_H
+#define PATCHPORTMODULE_H
 
 #include <string>
 #include <boost/enable_shared_from_this.hpp>
@@ -73,4 +73,4 @@ protected:
 
 } // namespace Ingenuity
 
-#endif // OMPORTMODULE_H
+#endif // PATCHPORTMODULE_H
diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index 7fef84d5..cdbee7d9 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -489,297 +489,140 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox5">
+    <widget class="GtkVBox" id="vbox9">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">10</property>
+      <property name="spacing">1</property>
 
       <child>
-	<widget class="GtkHBox" id="hbox7">
+	<widget class="GtkScrolledWindow" id="scrolledwindow3">
+	  <property name="border_width">2</property>
 	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">10</property>
+	  <property name="can_focus">True</property>
+	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	  <property name="shadow_type">GTK_SHADOW_NONE</property>
+	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox7">
+	    <widget class="GtkTreeView" id="load_plugin_plugins_treeview">
+	      <property name="border_width">2</property>
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">5</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox9">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">1</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="load_plugin_plugins_treeview">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">All plugins available for loading</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">True</property>
-			  <property name="reorderable">True</property>
-			  <property name="enable_search">True</property>
-			  <property name="fixed_height_mode">False</property>
-			  <property name="hover_selection">False</property>
-			  <property name="hover_expand">False</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table16">
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">12</property>
-		      <property name="column_spacing">0</property>
-
-		      <child>
-			<widget class="GtkButton" id="load_plugin_clear_button">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Clear filter text (show all plugins)</property>
-			  <property name="can_focus">True</property>
-			  <property name="label">gtk-clear</property>
-			  <property name="use_stock">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label66">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Module Name:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="load_plugin_close_button">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Close dialog</property>
-			  <property name="can_focus">True</property>
-			  <property name="label">gtk-close</property>
-			  <property name="use_stock">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHSeparator" id="hseparator1">
-			  <property name="visible">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHSeparator" id="hseparator2">
-			  <property name="visible">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
+	      <property name="tooltip" translatable="yes">All plugins available for loading</property>
+	      <property name="can_focus">True</property>
+	      <property name="headers_visible">True</property>
+	      <property name="rules_hint">True</property>
+	      <property name="reorderable">True</property>
+	      <property name="enable_search">True</property>
+	      <property name="fixed_height_mode">False</property>
+	      <property name="hover_selection">False</property>
+	      <property name="hover_expand">False</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
 
-		      <child>
-			<widget class="GtkHSeparator" id="hseparator3">
-			  <property name="visible">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
+      <child>
+	<widget class="GtkTable" id="table16">
+	  <property name="visible">True</property>
+	  <property name="n_rows">3</property>
+	  <property name="n_columns">3</property>
+	  <property name="homogeneous">False</property>
+	  <property name="row_spacing">12</property>
+	  <property name="column_spacing">0</property>
 
-		      <child>
-			<widget class="GtkHBox" id="hbox63">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
+	  <child>
+	    <widget class="GtkLabel" id="label66">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Node Name:</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">1</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
 
-			  <child>
-			    <widget class="GtkEntry" id="load_plugin_name_entry">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Name of new Module</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
+	  <child>
+	    <widget class="GtkHSeparator" id="hseparator1">
+	      <property name="visible">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	    </packing>
+	  </child>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="load_plugin_polyphonic_checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Polyphonic</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">True</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">8</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+	  <child>
+	    <widget class="GtkHSeparator" id="hseparator2">
+	      <property name="visible">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 
-			  <child>
-			    <widget class="GtkButton" id="load_plugin_add_button">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Add selected plugin to patch</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-add</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_padding">6</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
+	  <child>
+	    <widget class="GtkHSeparator" id="hseparator3">
+	      <property name="visible">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">2</property>
+	      <property name="right_attach">3</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 
-		      <child>
-			<widget class="GtkEntry" id="load_plugin_search_entry">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Search string to filter plugin list</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_padding">6</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
+	  <child>
+	    <widget class="GtkHBox" id="hbox63">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
 
-		      <child>
-			<widget class="GtkComboBox" id="load_plugin_filter_combo">
-			  <property name="visible">True</property>
-			  <property name="items" translatable="yes">Name contains: </property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+	      <child>
+		<widget class="GtkEntry" id="load_plugin_name_entry">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Name of new Module</property>
+		  <property name="can_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">*</property>
+		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -787,18 +630,120 @@
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkCheckButton" id="load_plugin_polyphonic_checkbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Polyphonic</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">True</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">8</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_padding">6</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="load_plugin_add_button">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add selected plugin to patch</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-add</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">2</property>
+	      <property name="right_attach">3</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkEntry" id="load_plugin_search_entry">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Search string to filter plugin list</property>
+	      <property name="can_focus">True</property>
+	      <property name="editable">True</property>
+	      <property name="visibility">True</property>
+	      <property name="max_length">0</property>
+	      <property name="text" translatable="yes"></property>
+	      <property name="has_frame">True</property>
+	      <property name="invisible_char">*</property>
+	      <property name="activates_default">False</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_padding">6</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkComboBox" id="load_plugin_filter_combo">
+	      <property name="visible">True</property>
+	      <property name="items" translatable="yes">Name contains: </property>
+	      <property name="add_tearoffs">False</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="load_plugin_clear_button">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Clear filter text (show all plugins)</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-clear</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">2</property>
+	      <property name="right_attach">3</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
 	</packing>
       </child>
     </widget>
@@ -1918,7 +1863,8 @@
 		      <child>
 			<widget class="GtkSpinButton" id="patch_view_poly_spin">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Polyphony (Patch must be disabled to modify)</property>
+			  <property name="sensitive">False</property>
+			  <property name="tooltip" translatable="yes">Polyphony</property>
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
@@ -1950,12 +1896,10 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolButton" id="patch_view_clear_but">
+		    <widget class="GtkToolButton" id="patch_view_save_but">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Clear (Destroy all children nodes, click twice to clear ports as well)</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
-		      <property name="stock_id">gtk-clear</property>
+		      <property name="tooltip" translatable="yes">Save patch to a file</property>
+		      <property name="stock_id">gtk-save</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>
 		      <property name="is_important">False</property>
@@ -1967,17 +1911,15 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolButton" id="patch_view_destroy_but">
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem15">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Destroy this patch</property>
-		      <property name="stock_id">gtk-delete</property>
+		      <property name="draw">True</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>
-		      <property name="is_important">False</property>
 		    </widget>
 		    <packing>
 		      <property name="expand">False</property>
-		      <property name="homogeneous">True</property>
+		      <property name="homogeneous">False</property>
 		    </packing>
 		  </child>
 
@@ -1997,10 +1939,27 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolButton" id="patch_view_save_but">
+		    <widget class="GtkToolButton" id="patch_view_clear_but">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Save patch to a file</property>
-		      <property name="stock_id">gtk-save</property>
+		      <property name="tooltip" translatable="yes">Clear (Destroy all children)</property>
+		      <property name="label" translatable="yes"></property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-clear</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkToolButton" id="patch_view_destroy_but">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Destroy this patch</property>
+		      <property name="stock_id">gtk-delete</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>
 		      <property name="is_important">False</property>