Removed Add menu from patch window (in favour of context menu only), other

GUI tweaks


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

6 files changed, 459 insertions, 158 deletions

diff --git a/src/progs/gtk/OmFlowCanvas.cpp b/src/progs/gtk/OmFlowCanvas.cpp
index cac5b87d..863ba014 100644
--- a/src/progs/gtk/OmFlowCanvas.cpp
+++ b/src/progs/gtk/OmFlowCanvas.cpp
@@ -27,7 +27,7 @@
 #include "OmPort.h"
 #include "NodeModel.h"
 #include "OmModule.h"
-
+#include "GladeFactory.h"
 
 namespace OmGtk {
 
@@ -40,13 +40,27 @@ OmFlowCanvas::OmFlowCanvas(PatchController* controller, int width, int height)
 {
 	assert(controller != NULL);
 	
-	Gtk::Menu::MenuList& items = m_menu.items();
+	/*Gtk::Menu::MenuList& items = m_menu.items();
 	items.push_back(Gtk::Menu_Helpers::MenuElem("Load Plugin...",
 		sigc::mem_fun(this, &OmFlowCanvas::menu_load_plugin)));
 	items.push_back(Gtk::Menu_Helpers::MenuElem("Load Subpatch...",
 		sigc::mem_fun(this, &OmFlowCanvas::menu_load_subpatch)));
 	items.push_back(Gtk::Menu_Helpers::MenuElem("New Subpatch...",
-		sigc::mem_fun(this, &OmFlowCanvas::menu_create_subpatch)));
+		sigc::mem_fun(this, &OmFlowCanvas::menu_create_subpatch)));*/
+
+	Glib::RefPtr<Gnome::Glade::Xml> xml = GladeFactory::new_glade_reference();
+	xml->get_widget("canvas_menu", m_menu);
+	
+	xml->get_widget("canvas_menu_load_plugin", m_menu_load_plugin);
+	xml->get_widget("canvas_menu_load_patch", m_menu_load_patch);
+	xml->get_widget("canvas_menu_new_patch", m_menu_new_patch);
+	
+	m_menu_load_plugin->signal_activate().connect(
+		sigc::mem_fun<void>(this, &OmFlowCanvas::menu_load_plugin));
+	m_menu_load_patch->signal_activate().connect(
+		sigc::mem_fun<void>(this, &OmFlowCanvas::menu_load_patch));
+	m_menu_new_patch->signal_activate().connect(
+		sigc::mem_fun<void>(this, &OmFlowCanvas::menu_new_patch));
 }
 
 
@@ -145,7 +159,7 @@ OmFlowCanvas::menu_load_plugin()
 
 
 void
-OmFlowCanvas::menu_load_subpatch()
+OmFlowCanvas::menu_load_patch()
 {
 	m_patch_controller->window()->load_subpatch_window()->set_next_module_location(
 		m_last_click_x, m_last_click_y);
@@ -154,7 +168,7 @@ OmFlowCanvas::menu_load_subpatch()
 
 
 void
-OmFlowCanvas::menu_create_subpatch()
+OmFlowCanvas::menu_new_patch()
 {
 	m_patch_controller->window()->new_subpatch_window()->set_next_module_location(
 		m_last_click_x, m_last_click_y);
diff --git a/src/progs/gtk/OmFlowCanvas.h b/src/progs/gtk/OmFlowCanvas.h
index 2a553f5b..1871de80 100644
--- a/src/progs/gtk/OmFlowCanvas.h
+++ b/src/progs/gtk/OmFlowCanvas.h
@@ -50,18 +50,21 @@ public:
 	void destroy_selected();
 
 	void show_menu(GdkEvent* event)
-	{ m_menu.popup(event->button.button, event->button.time); }
+	{ m_menu->popup(event->button.button, event->button.time); }
 	
 	void menu_load_plugin();
-	void menu_load_subpatch();
-	void menu_create_subpatch();
+	void menu_new_patch();
+	void menu_load_patch();
 
 private:
 	PatchController* m_patch_controller;
 	int              m_last_click_x;
 	int              m_last_click_y;
 	
-	Gtk::Menu m_menu;
+	Gtk::Menu*      m_menu;
+	Gtk::MenuItem*  m_menu_load_plugin;
+	Gtk::MenuItem*  m_menu_load_patch;
+	Gtk::MenuItem*  m_menu_new_patch;
 };
 
 
diff --git a/src/progs/gtk/PatchWindow.cpp b/src/progs/gtk/PatchWindow.cpp
index 0814e1ac..46b5ce91 100644
--- a/src/progs/gtk/PatchWindow.cpp
+++ b/src/progs/gtk/PatchWindow.cpp
@@ -70,9 +70,9 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	xml->get_widget("patch_fullscreen_menuitem", m_menu_fullscreen);
 	xml->get_widget("patch_clear_menuitem", m_menu_clear);
 	xml->get_widget("patch_destroy_menuitem", m_menu_destroy_patch);
-	xml->get_widget("patch_add_plugin_menuitem", m_menu_add_plugin);
+	/*xml->get_widget("patch_add_plugin_menuitem", m_menu_add_plugin);
 	xml->get_widget("patch_add_new_subpatch_menuitem", m_menu_new_subpatch);
-	xml->get_widget("patch_add_subpatch_from_file_menuitem", m_menu_load_subpatch);
+	xml->get_widget("patch_add_subpatch_from_file_menuitem", m_menu_load_subpatch);*/
 	xml->get_widget("patch_view_messages_window_menuitem", m_menu_view_messages_window);
 	xml->get_widget("patch_view_patch_tree_window_menuitem", m_menu_view_patch_tree_window);
 	xml->get_widget("patch_help_about_menuitem", m_menu_help_about);
@@ -105,7 +105,7 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 		sigc::mem_fun(this, &PatchWindow::event_quit));
 	m_menu_configuration->signal_activate().connect(
 		sigc::mem_fun(App::instance().configuration_dialog(), &ConfigWindow::show));
-	m_menu_fullscreen->signal_toggled().connect(
+	m_menu_fullscreen->signal_activate().connect(
 		sigc::mem_fun(this, &PatchWindow::event_fullscreen_toggled));
 	m_menu_view_engine_window->signal_activate().connect(
 		sigc::mem_fun(this, &PatchWindow::event_show_engine));
@@ -117,12 +117,12 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 		sigc::mem_fun(this, &PatchWindow::event_destroy));
 	m_menu_clear->signal_activate().connect(
 		sigc::mem_fun(this, &PatchWindow::event_clear));
-	m_menu_add_plugin->signal_activate().connect(
+	/*m_menu_add_plugin->signal_activate().connect(
 		sigc::mem_fun<void>(m_load_plugin_window, &LoadPluginWindow::present));
 	m_menu_new_subpatch->signal_activate().connect(
 		sigc::mem_fun<void>(m_new_subpatch_window, &NewSubpatchWindow::present));
 	m_menu_load_subpatch->signal_activate().connect(
-		sigc::mem_fun<void>(m_load_subpatch_window, &LoadSubpatchWindow::present));
+		sigc::mem_fun<void>(m_load_subpatch_window, &LoadSubpatchWindow::present));*/
 	m_menu_view_messages_window->signal_activate().connect(
 		sigc::mem_fun<void>(App::instance().messages_dialog(), &MessagesWindow::present));
 	m_menu_view_patch_tree_window->signal_activate().connect(
@@ -567,10 +567,16 @@ PatchWindow::event_clear()
 void
 PatchWindow::event_fullscreen_toggled()
 {
-	if (m_menu_fullscreen->get_active())
+	// FIXME: ugh, use GTK signals to track state and now for sure
+	static bool is_fullscreen = false;
+
+	if (!is_fullscreen) {
 		fullscreen();
-	else
+		is_fullscreen = true;
+	} else {
 		unfullscreen();
+		is_fullscreen = false;
+	}
 }
 
 
diff --git a/src/progs/gtk/PatchWindow.h b/src/progs/gtk/PatchWindow.h
index 2821fa41..e835c9e3 100644
--- a/src/progs/gtk/PatchWindow.h
+++ b/src/progs/gtk/PatchWindow.h
@@ -116,15 +116,15 @@ private:
 	Gtk::MenuItem*      m_menu_configuration;
 	Gtk::MenuItem*      m_menu_close;
 	Gtk::MenuItem*      m_menu_quit;
-	Gtk::CheckMenuItem* m_menu_fullscreen;
+	Gtk::MenuItem*      m_menu_fullscreen;
 	Gtk::MenuItem*      m_menu_clear;
 	Gtk::MenuItem*      m_menu_destroy_patch;
 	Gtk::MenuItem*      m_menu_view_engine_window;
 	Gtk::MenuItem*      m_menu_view_control_window;
 	Gtk::MenuItem*      m_menu_view_patch_properties;
-	Gtk::MenuItem*      m_menu_add_plugin;
+	/*Gtk::MenuItem*      m_menu_add_plugin;
 	Gtk::MenuItem*      m_menu_new_subpatch;
-	Gtk::MenuItem*      m_menu_load_subpatch;
+	Gtk::MenuItem*      m_menu_load_subpatch;*/
 	Gtk::MenuItem*      m_menu_view_messages_window;
 	Gtk::MenuItem*      m_menu_view_patch_tree_window;
 	Gtk::MenuItem*      m_menu_help_about;
diff --git a/src/progs/gtk/om_gtk.glade b/src/progs/gtk/om_gtk.glade
index 39af1fd1..16e15a2e 100644
--- a/src/progs/gtk/om_gtk.glade
+++ b/src/progs/gtk/om_gtk.glade
@@ -52,7 +52,7 @@
 		      <signal name="activate" handler="on_patch_import_menuitem_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1834">
+			<widget class="GtkImage" id="image1911">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -107,7 +107,7 @@
 		      <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1835">
+			<widget class="GtkImage" id="image1912">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -166,13 +166,11 @@
 		<widget class="GtkMenu" id="patch_patch_menu_menu">
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="patch_fullscreen_menuitem">
+		    <widget class="GtkImageMenuItem" id="patch_fullscreen_menuitem">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Fullscreen</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="label">gtk-fullscreen</property>
+		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="patch_fullscreen_menuitem" last_modification_time="Sat, 11 Mar 2006 05:24:13 GMT"/>
-		      <accelerator key="F11" modifiers="0" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -192,7 +190,7 @@
 		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1836">
+			<widget class="GtkImage" id="image1913">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -234,7 +232,7 @@
 		      <signal name="activate" handler="on_patch_destroy_menuitem_activate" last_modification_time="Wed, 25 May 2005 00:22:00 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1837">
+			<widget class="GtkImage" id="image1914">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-delete</property>
 			  <property name="icon_size">1</property>
@@ -252,113 +250,8 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="add_menu">
+	    <widget class="GtkSeparatorMenuItem" id="separator7">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Add</property>
-	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_add_menu_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
-
-	      <child>
-		<widget class="GtkMenu" id="add_menu_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="patch_add_plugin_menuitem">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Load a plugin as a child of this patch</property>
-		      <property name="label" translatable="yes">_Plugin...</property>
-		      <property name="use_underline">True</property>
-		      <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1838">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-execute</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="patch_add_subpatch_from_file_menuitem">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Load a patch as a child of this patch</property>
-		      <property name="label" translatable="yes">_Patch From File...</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_subpatch_from_file1_activate" last_modification_time="Sun, 27 Feb 2005 00:37:03 GMT"/>
-		      <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1839">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-open</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="patch_add_new_subpatch_menuitem">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Create a new (empty) patch as a child of this patch</property>
-		      <property name="label" translatable="yes">_New Patch...</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_add_new_subpatch_menuitem_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
-		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1840">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-new</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator7">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="right_click_on_canvas_to_place_a_new_object1">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="tooltip" translatable="yes">Using this menu will place items randomly - right click!</property>
-		      <property name="label" translatable="yes">Right click on canvas to manually place an object</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_right_click_on_canvas_to_place_a_new_object1_activate" last_modification_time="Sun, 29 Jan 2006 21:22:13 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1841">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-info</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
 	    </widget>
 	  </child>
 
@@ -382,7 +275,7 @@
 		      <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1842">
+			<widget class="GtkImage" id="image1915">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-connect</property>
 			  <property name="icon_size">1</property>
@@ -405,7 +298,7 @@
 		      <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1843">
+			<widget class="GtkImage" id="image1916">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-index</property>
 			  <property name="icon_size">1</property>
@@ -428,7 +321,7 @@
 		      <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1844">
+			<widget class="GtkImage" id="image1917">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-dialog-error</property>
 			  <property name="icon_size">1</property>
@@ -456,6 +349,33 @@
 		<widget class="GtkMenu" id="help_menu_menu">
 
 		  <child>
+		    <widget class="GtkImageMenuItem" id="right-click_the_canvas_to_add_objects1">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Right-click the canvas to add objects</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_right-click_the_canvas_to_add_objects1_activate" last_modification_time="Fri, 16 Jun 2006 17:51:05 GMT"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1918">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-info</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator13">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkImageMenuItem" id="patch_help_about_menuitem">
 		      <property name="visible">True</property>
 		      <property name="label">gtk-about</property>
@@ -3767,4 +3687,184 @@ Contributors:
   </child>
 </widget>
 
+<widget class="GtkMenu" id="canvas_menu">
+  <property name="visible">True</property>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="input1">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Input</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1886">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-connect</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GtkMenu" id="input1_menu">
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_audio_input">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add an audio input to this patch</property>
+	      <property name="label" translatable="yes">Audio</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_audio_input_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_control_input">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a control input (and a control slider for it) to this patch</property>
+	      <property name="label" translatable="yes">Control</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_control_input_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_midi_input">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a MIDI input to this patch</property>
+	      <property name="label" translatable="yes">MIDI</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_midi_input_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="output1">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Output</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1887">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-connect</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GtkMenu" id="output1_menu">
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_audio_output">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add an audio output to this patch</property>
+	      <property name="label" translatable="yes">Audio</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_audio_output_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_control_output">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a control output to this patch</property>
+	      <property name="label" translatable="yes">Control</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_control_output_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_midi_output">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a MIDI output to this patch</property>
+	      <property name="label" translatable="yes">MIDI</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_midi_output_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="canvas_menu_load_plugin">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Load a plugin as a child of this patch</property>
+      <property name="label" translatable="yes">_Plugin...</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_canvas_menu_add_plugin_activate" last_modification_time="Fri, 16 Jun 2006 16:41:40 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1888">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-execute</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="canvas_menu_load_patch">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Load a patch as a child of this patch</property>
+      <property name="label" translatable="yes">Patch From _File...</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_canvas_menu_load_patch_activate" last_modification_time="Fri, 16 Jun 2006 16:41:40 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1889">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-open</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="canvas_menu_new_patch">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Create a new (empty) patch as a child of this patch</property>
+      <property name="label" translatable="yes">_New Patch...</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_canvas_menu_new_patch_activate" last_modification_time="Fri, 16 Jun 2006 16:41:40 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1890">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-new</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff --git a/src/progs/gtk/om_gtk.glade.bak b/src/progs/gtk/om_gtk.glade.bak
index db3e01b4..ac12bb1e 100644
--- a/src/progs/gtk/om_gtk.glade.bak
+++ b/src/progs/gtk/om_gtk.glade.bak
@@ -52,7 +52,7 @@
 		      <signal name="activate" handler="on_patch_import_menuitem_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1834">
+			<widget class="GtkImage" id="image1867">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -107,7 +107,7 @@
 		      <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1835">
+			<widget class="GtkImage" id="image1868">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -166,13 +166,11 @@
 		<widget class="GtkMenu" id="patch_patch_menu_menu">
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="patch_fullscreen_menuitem">
+		    <widget class="GtkImageMenuItem" id="patch_fullscreen_menuitem">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Fullscreen</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="label">gtk-fullscreen</property>
+		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="patch_fullscreen_menuitem" last_modification_time="Sat, 11 Mar 2006 05:24:13 GMT"/>
-		      <accelerator key="F11" modifiers="0" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -192,7 +190,7 @@
 		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1836">
+			<widget class="GtkImage" id="image1869">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -234,7 +232,7 @@
 		      <signal name="activate" handler="on_patch_destroy_menuitem_activate" last_modification_time="Wed, 25 May 2005 00:22:00 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1837">
+			<widget class="GtkImage" id="image1870">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-delete</property>
 			  <property name="icon_size">1</property>
@@ -270,7 +268,7 @@
 		      <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1838">
+			<widget class="GtkImage" id="image1871">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-execute</property>
 			  <property name="icon_size">1</property>
@@ -293,7 +291,7 @@
 		      <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1839">
+			<widget class="GtkImage" id="image1872">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -316,7 +314,7 @@
 		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1840">
+			<widget class="GtkImage" id="image1873">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-new</property>
 			  <property name="icon_size">1</property>
@@ -345,7 +343,7 @@
 		      <signal name="activate" handler="on_right_click_on_canvas_to_place_a_new_object1_activate" last_modification_time="Sun, 29 Jan 2006 21:22:13 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1841">
+			<widget class="GtkImage" id="image1874">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-info</property>
 			  <property name="icon_size">1</property>
@@ -382,7 +380,7 @@
 		      <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1842">
+			<widget class="GtkImage" id="image1875">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-connect</property>
 			  <property name="icon_size">1</property>
@@ -405,7 +403,7 @@
 		      <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1843">
+			<widget class="GtkImage" id="image1876">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-index</property>
 			  <property name="icon_size">1</property>
@@ -428,7 +426,7 @@
 		      <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1844">
+			<widget class="GtkImage" id="image1877">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-dialog-error</property>
 			  <property name="icon_size">1</property>
@@ -3267,7 +3265,7 @@ Contributors:
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 
@@ -3315,7 +3313,7 @@ Contributors:
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -3338,7 +3336,7 @@ Contributors:
 	      <property name="visible">True</property>
 	    </widget>
 	    <packing>
-	      <property name="padding">8</property>
+	      <property name="padding">4</property>
 	      <property name="expand">True</property>
 	      <property name="fill">True</property>
 	    </packing>
@@ -3472,11 +3470,11 @@ Contributors:
 		      <property name="can_focus">True</property>
 		      <property name="climb_rate">1</property>
 		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
+		      <property name="numeric">True</property>
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 100 1 10 10</property>
+		      <property name="adjustment">16180 1 65535 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -3767,4 +3765,184 @@ Contributors:
   </child>
 </widget>
 
+<widget class="GtkMenu" id="canvas_menu">
+  <property name="visible">True</property>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="input1">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Input</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1886">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-connect</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GtkMenu" id="input1_menu">
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_audio_input">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add an audio input to this patch</property>
+	      <property name="label" translatable="yes">Audio</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_audio_input_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_control_input">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a control input (and a control slider for it) to this patch</property>
+	      <property name="label" translatable="yes">Control</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_control_input_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_midi_input">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a MIDI input to this patch</property>
+	      <property name="label" translatable="yes">MIDI</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_midi_input_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="output1">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Output</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1887">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-connect</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GtkMenu" id="output1_menu">
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_audio_output">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add an audio output to this patch</property>
+	      <property name="label" translatable="yes">Audio</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_audio_output_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_control_output">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a control output to this patch</property>
+	      <property name="label" translatable="yes">Control</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_control_output_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="canvas_menu_add_midi_output">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a MIDI output to this patch</property>
+	      <property name="label" translatable="yes">MIDI</property>
+	      <property name="use_underline">True</property>
+	      <signal name="activate" handler="on_canvas_menu_add_midi_output_activate" last_modification_time="Fri, 16 Jun 2006 16:32:59 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="canvas_menu_load_plugin">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Load a plugin as a child of this patch</property>
+      <property name="label" translatable="yes">_Plugin...</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_canvas_menu_add_plugin_activate" last_modification_time="Fri, 16 Jun 2006 16:41:40 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1888">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-execute</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="canvas_menu_load_patch">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Load a patch as a child of this patch</property>
+      <property name="label" translatable="yes">Patch From _File...</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_canvas_menu_load_patch_activate" last_modification_time="Fri, 16 Jun 2006 16:41:40 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1889">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-open</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="canvas_menu_new_patch">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Create a new (empty) patch as a child of this patch</property>
+      <property name="label" translatable="yes">_New Patch...</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_canvas_menu_new_patch_activate" last_modification_time="Fri, 16 Jun 2006 16:41:40 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1890">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-new</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>