GUI tweaks.

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

2 files changed, 40 insertions, 51 deletions

diff --git a/src/progs/ingenuity/NodeMenu.cpp b/src/progs/ingenuity/NodeMenu.cpp
index e559dc3d..7811e3de 100644
--- a/src/progs/ingenuity/NodeMenu.cpp
+++ b/src/progs/ingenuity/NodeMenu.cpp
@@ -39,11 +39,6 @@ NodeMenu::NodeMenu(SharedPtr<NodeModel> node)
 			node));
 	_controls_menuitem = controls_elem.get_child();
 	items().push_back(controls_elem);
-
-	items().push_back(Gtk::Menu_Helpers::MenuElem("Properties",
-		sigc::bind(
-			sigc::mem_fun(app.window_factory(), &WindowFactory::present_properties),
-			node)));
 	
 	items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 
@@ -73,6 +68,13 @@ NodeMenu::NodeMenu(SharedPtr<NodeModel> node)
 			sigc::mem_fun(this, &NodeMenu::on_menu_learn)));
 	}
 	*/
+	
+	items().push_back(Gtk::Menu_Helpers::SeparatorElem());
+	
+	items().push_back(Gtk::Menu_Helpers::MenuElem("Properties",
+		sigc::bind(
+			sigc::mem_fun(app.window_factory(), &WindowFactory::present_properties),
+			node)));
 
 	//model->new_port_sig.connect(sigc::mem_fun(this, &NodeMenu::add_port));
 	//model->destroyed_sig.connect(sigc::mem_fun(this, &NodeMenu::destroy));
diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index edfb60dd..b271f63a 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -1829,25 +1829,31 @@
 		  <property name="show_arrow">False</property>
 
 		  <child>
-		    <widget class="GtkToggleToolButton" id="patch_view_process_but">
+		    <widget class="GtkToolItem" id="toolitem4">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Enable DSP processing</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
-		      <property name="stock_id">gtk-execute</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>
 		      <property name="is_important">False</property>
-		      <property name="active">True</property>
+
+		      <child>
+			<widget class="GtkViewport" id="patch_view_breadcrumb_container">
+			  <property name="visible">True</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+			  <child>
+			    <placeholder/>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="expand">False</property>
-		      <property name="homogeneous">True</property>
+		      <property name="homogeneous">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorToolItem" id="separatortoolitem6">
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem14">
 		      <property name="visible">True</property>
 		      <property name="draw">True</property>
 		      <property name="visible_horizontal">True</property>
@@ -1860,6 +1866,24 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkToggleToolButton" id="patch_view_process_but">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Enable DSP processing</property>
+		      <property name="label" translatable="yes"></property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-execute</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		      <property name="active">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
 		    <widget class="GtkToolItem" id="toolitem2">
 		      <property name="visible">True</property>
 		      <property name="visible_horizontal">True</property>
@@ -2020,7 +2044,7 @@
 		  <child>
 		    <widget class="GtkToolButton" id="patch_view_zoom_full_but">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Fit patch in window</property>
+		      <property name="tooltip" translatable="yes">Fit patch to window</property>
 		      <property name="label" translatable="yes"></property>
 		      <property name="use_underline">True</property>
 		      <property name="stock_id">gtk-zoom-fit</property>
@@ -2033,43 +2057,6 @@
 		      <property name="homogeneous">True</property>
 		    </packing>
 		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorToolItem" id="separatortoolitem14">
-		      <property name="visible">True</property>
-		      <property name="draw">True</property>
-		      <property name="visible_horizontal">True</property>
-		      <property name="visible_vertical">True</property>
-		    </widget>
-		    <packing>
-		      <property name="expand">False</property>
-		      <property name="homogeneous">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkToolItem" id="toolitem4">
-		      <property name="visible">True</property>
-		      <property name="visible_horizontal">True</property>
-		      <property name="visible_vertical">True</property>
-		      <property name="is_important">False</property>
-
-		      <child>
-			<widget class="GtkViewport" id="patch_view_breadcrumb_container">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="expand">False</property>
-		      <property name="homogeneous">False</property>
-		    </packing>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>