GUI touchups.

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

1 files changed, 95 insertions, 49 deletions

diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index b95f9f2e..afbe8c22 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -1760,18 +1760,18 @@
 	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox1">
+	    <widget class="GtkHBox" id="hbox70">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkToolbar" id="patch_view_toolbar">
+		<widget class="GtkToolbar" id="toolbar1">
 		  <property name="visible">True</property>
 		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-		  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+		  <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
 		  <property name="tooltips">True</property>
-		  <property name="show_arrow">False</property>
+		  <property name="show_arrow">True</property>
 
 		  <child>
 		    <widget class="GtkToolItem" id="toolitem4">
@@ -1796,9 +1796,72 @@
 		      <property name="homogeneous">False</property>
 		    </packing>
 		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolbar" id="toolbar4">
+		  <property name="visible">True</property>
+		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+		  <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+		  <property name="tooltips">True</property>
+		  <property name="show_arrow">True</property>
 
 		  <child>
-		    <widget class="GtkSeparatorToolItem" id="separatortoolitem14">
+		    <widget class="GtkToolItem" id="toolitem11">
+		      <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="GtkLabel" id="label132">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"> </property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</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>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="expand">True</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolbar" id="toolbar3">
+		  <property name="visible">True</property>
+		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+		  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+		  <property name="tooltips">True</property>
+		  <property name="show_arrow">False</property>
+
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem17">
 		      <property name="visible">True</property>
 		      <property name="draw">True</property>
 		      <property name="visible_horizontal">True</property>
@@ -1829,14 +1892,14 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolItem" id="toolitem2">
+		    <widget class="GtkToolItem" id="toolitem7">
 		      <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="GtkImage" id="image1934">
+			<widget class="GtkImage" id="image1978">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-copy</property>
 			  <property name="icon_size">4</property>
@@ -1854,7 +1917,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolItem" id="toolitem1">
+		    <widget class="GtkToolItem" id="toolitem10">
 		      <property name="visible">True</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>
@@ -1863,8 +1926,6 @@
 		      <child>
 			<widget class="GtkSpinButton" id="patch_view_poly_spin">
 			  <property name="visible">True</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>
@@ -1872,7 +1933,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 999 1 10 10</property>
+			  <property name="adjustment">1 0 100 1 10 10</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -1883,7 +1944,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem18">
 		      <property name="visible">True</property>
 		      <property name="draw">True</property>
 		      <property name="visible_horizontal">True</property>
@@ -1911,7 +1972,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorToolItem" id="separatortoolitem15">
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem19">
 		      <property name="visible">True</property>
 		      <property name="draw">True</property>
 		      <property name="visible_horizontal">True</property>
@@ -1924,21 +1985,6 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolButton" id="patch_view_refresh_but">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Refresh view</property>
-		      <property name="stock_id">gtk-refresh</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_clear_but">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Clear (Destroy all children)</property>
@@ -1971,7 +2017,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorToolItem" id="separatortoolitem10">
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem22">
 		      <property name="visible">True</property>
 		      <property name="draw">True</property>
 		      <property name="visible_horizontal">True</property>
@@ -1984,6 +2030,21 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkToolButton" id="patch_view_refresh_but">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Refresh view</property>
+		      <property name="stock_id">gtk-refresh</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_zoom_normal_but">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Zoom to normal size</property>
@@ -2019,28 +2080,13 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkToolbar" id="patch_view_crumb_toolbar">
-		  <property name="visible">True</property>
-		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-		  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-		  <property name="tooltips">True</property>
-		  <property name="show_arrow">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="padding">1</property>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
 	    </packing>
@@ -3316,15 +3362,15 @@ Contributors:
   <property name="border_width">6</property>
   <property name="title" translatable="yes">Connect to Engine</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="icon">ingen-icon.svg</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>