GUI pimpifications.

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

1 files changed, 118 insertions, 277 deletions

diff --git a/src/patchage.glade b/src/patchage.glade
index 399d8fe..71496ff 100644
--- a/src/patchage.glade
+++ b/src/patchage.glade
@@ -375,9 +375,9 @@
 		<widget class="GtkMenu" id="view_menu_menu">
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="view_jack_toolbar_menuitem">
+		    <widget class="GtkCheckMenuItem" id="view_toolbar_menuitem">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Jack Toolbar</property>
+		      <property name="label" translatable="yes">_Toolbar</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
 		      <signal name="activate" handler="on_view_jack_toolbar_menuitem_activate" last_modification_time="Thu, 15 Feb 2007 19:41:28 GMT"/>
@@ -453,131 +453,14 @@
       </child>
 
       <child>
-	<widget class="GtkToolbar" id="jack_toolbar">
+	<widget class="GtkToolbar" id="toolbar">
 	  <property name="visible">True</property>
 	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
 	  <property name="tooltips">True</property>
 	  <property name="show_arrow">True</property>
 
 	  <child>
-	    <widget class="GtkToolItem" id="toolitem15">
-	      <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="GtkToggleButton" id="main_jack_connect_toggle">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox3">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image621">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-connect</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">JACK</property>
-			      <property name="use_underline">True</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>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolItem" id="toolitem16">
-	      <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="GtkCheckButton" id="main_jack_realtime_check">
-		  <property name="border_width">1</property>
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Realtime</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkToolItem" id="toolitem28">
 	      <property name="visible">True</property>
 	      <property name="visible_horizontal">True</property>
@@ -603,32 +486,9 @@
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkComboBoxEntry" id="main_buffer_size_combo">
-			  <property name="border_width">1</property>
-			  <property name="visible">True</property>
-			  <property name="items" translatable="yes">32
-64
-128
-256
-512
-1024
-2048
-4096</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="has_frame">True</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">1</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="main_frames_at_label">
+			<widget class="GtkLabel" id="label10">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">frames @</property>
+			  <property name="label" translatable="yes">  Latency: </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -636,7 +496,7 @@
 			  <property name="selectable">False</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">1</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
@@ -644,15 +504,37 @@
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">1</property>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="main_sample_rate_label">
+			<widget class="GtkComboBoxEntry" id="main_buffer_size_combo">
+			  <property name="border_width">1</property>
 			  <property name="visible">True</property>
+			  <property name="items" translatable="yes">32 frames
+64 frames
+128 frames
+256 frames
+512 frames
+1024 frames
+2048 frames
+4096 frames</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="has_frame">True</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">1</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="main_sample_rate_label">
 			  <property name="label" translatable="yes">48</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
@@ -677,7 +559,6 @@
 
 		      <child>
 			<widget class="GtkLabel" id="label9">
-			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">kHz</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
@@ -712,7 +593,7 @@
 
 	  <child>
 	    <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
-	      <property name="border_width">4</property>
+	      <property name="border_width">8</property>
 	      <property name="visible">True</property>
 	      <property name="draw">True</property>
 	      <property name="visible_horizontal">True</property>
@@ -725,36 +606,16 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkToolItem" id="toolitem22">
+	    <widget class="GtkToolButton" id="main_clear_load_button">
 	      <property name="visible">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>
-
-	      <child>
-		<widget class="GtkButton" id="main_clear_load_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image622">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-clear</property>
-		      <property name="icon_size">4</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>
 	    <packing>
 	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
+	      <property name="homogeneous">True</property>
 	    </packing>
 	  </child>
 
@@ -778,49 +639,16 @@
 		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox5">
+		    <widget class="GtkProgressBar" id="main_xrun_progress">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkProgressBar" id="main_xrun_progress">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Delay/XRun Indicator
+		      <property name="tooltip" translatable="yes">Delay/XRun Indicator
 
 The bar represents the maximum processing delay as a fraction of the time available for a cycle.  If the bar reaches 100%, an XRun will occur.</property>
-			  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
-			  <property name="fraction">0</property>
-			  <property name="pulse_step">0.10000000149</property>
-			  <property name="text" translatable="yes">XRun %</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			</widget>
-			<packing>
-			  <property name="padding">1</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="main_xrun_counter">
-			  <property name="visible">True</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">0</property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			  <property name="width_chars">3</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+		      <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+		      <property name="fraction">0</property>
+		      <property name="pulse_step">0.10000000149</property>
+		      <property name="text" translatable="yes">0 Dropouts</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		    </widget>
 		  </child>
 		</widget>
@@ -831,17 +659,85 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkSeparatorToolItem" id="separatortoolitem4">
+	      <property name="border_width">8</property>
+	      <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="GtkToolButton" id="zoom_normal_but">
+	      <property name="visible">True</property>
+	      <property name="stock_id">gtk-zoom-100</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="zoom_full_but">
+	      <property name="visible">True</property>
+	      <property name="stock_id">gtk-zoom-fit</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="GtkToolItem" id="toolitem32">
+	      <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="GtkHScale" id="zoom_scale">
+		  <property name="width_request">180</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="draw_value">False</property>
+		  <property name="value_pos">GTK_POS_TOP</property>
+		  <property name="digits">1</property>
+		  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+		  <property name="inverted">False</property>
+		  <property name="adjustment">1 0.10000000149 2 0 0 0</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">False</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
 	  <property name="expand">False</property>
-	  <property name="fill">False</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
 
       <child>
 	<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="tooltips">True</property>
@@ -996,37 +892,7 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	  </child>
 
 	  <child>
-	    <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="GtkButton" id="zoom_normal_but">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="zoom_normal_but_icon">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-zoom-100</property>
-		      <property name="icon_size">4</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>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
+	    <placeholder/>
 	  </child>
 
 	  <child>
@@ -1037,25 +903,7 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	      <property name="is_important">False</property>
 
 	      <child>
-		<widget class="GtkButton" id="zoom_full_but">
-		  <property name="border_width">1</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image361">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-zoom-fit</property>
-		      <property name="icon_size">4</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>
+		<placeholder/>
 	      </child>
 	    </widget>
 	    <packing>
@@ -1073,17 +921,7 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	      <property name="is_important">False</property>
 
 	      <child>
-		<widget class="GtkHScale" id="zoom_scale">
-		  <property name="width_request">180</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="draw_value">False</property>
-		  <property name="value_pos">GTK_POS_TOP</property>
-		  <property name="digits">1</property>
-		  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		  <property name="inverted">False</property>
-		  <property name="adjustment">1 0.10000000149 2 0 0 0</property>
-		</widget>
+		<placeholder/>
 	      </child>
 	    </widget>
 	    <packing>
@@ -1108,7 +946,10 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	  <child>
 	    <widget class="GtkScrolledWindow" id="canvas_scrolledwindow">
 	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
+	      <property name="has_focus">True</property>
 	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
 	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
 	      <property name="shadow_type">GTK_SHADOW_IN</property>