diff xmms-sid.glade @ 177:6e350784aa57

Various cleanups. Min-playtime option now works. Configuration has more consistent operation while graying out unavailable settings.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 18 Aug 2004 03:27:00 +0000
parents 7515712b4af7
children eee1b3230d70
line wrap: on
line diff
--- a/xmms-sid.glade	Wed Aug 18 03:24:04 2004 +0000
+++ b/xmms-sid.glade	Wed Aug 18 03:27:00 2004 +0000
@@ -295,6 +295,11 @@
 	      <name>cfg_oversample</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_oversample_toggled</handler>
+		<last_modification_time>Wed, 18 Aug 2004 02:20:35 GMT</last_modification_time>
+	      </signal>
 	      <label>Use oversampling</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -319,7 +324,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label42</name>
+		<name>cfg_oversample_label1</name>
 		<label>Factor:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -359,7 +364,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label43</name>
+		<name>cfg_oversample_label2</name>
 		<label>Large factors require more CPU-power</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1042,6 +1047,11 @@
 	      <name>cfg_mintime_enable</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_mintime_enable_toggled</handler>
+		<last_modification_time>Wed, 18 Aug 2004 02:51:28 GMT</last_modification_time>
+	      </signal>
 	      <label>Play at least for specified time (adds silence)</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -1066,7 +1076,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label51</name>
+		<name>cfg_mintime_label1</name>
 		<label>Playtime: </label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1111,7 +1121,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label52</name>
+		<name>cfg_mintime_label2</name>
 		<label>seconds</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1154,6 +1164,11 @@
 	      <name>cfg_maxtime_enable</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_maxtime_enable_toggled</handler>
+		<last_modification_time>Wed, 18 Aug 2004 02:51:37 GMT</last_modification_time>
+	      </signal>
 	      <label>Play for specified time maximum</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -1193,7 +1208,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label37</name>
+		<name>cfg_maxtime_label1</name>
 		<label>Playtime: </label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1238,7 +1253,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label36</name>
+		<name>cfg_maxtime_label2</name>
 		<label>seconds</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1282,6 +1297,11 @@
 	      <border_width>2</border_width>
 	      <tooltip>This option enables using of XSIDPLAY compatible HVSC Song-length database. (See documentation for more information)</tooltip>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_sld_enable_toggled</handler>
+		<last_modification_time>Wed, 18 Aug 2004 02:51:47 GMT</last_modification_time>
+	      </signal>
 	      <label>Use XSIDPLAY-compatible database</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -1306,7 +1326,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label33</name>
+		<name>cfg_sld_label1</name>
 		<label>DB-file: </label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1404,6 +1424,11 @@
 	      <name>cfg_stil_enable</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_stil_enable_toggled</handler>
+		<last_modification_time>Wed, 18 Aug 2004 02:52:39 GMT</last_modification_time>
+	      </signal>
 	      <label>Use STIL information database</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -1427,7 +1452,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label4</name>
+		<name>cfg_stil_label1</name>
 		<label>STIL-file:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1510,7 +1535,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label49</name>
+		<name>cfg_hvsc_label1</name>
 		<label>HVSC path:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -1714,7 +1739,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame28</name>
 	  <border_width>4</border_width>
-	  <label>Sub-song control: </label>
+	  <label>Sub-tune control: </label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1820,8 +1845,9 @@
 	      <class>GtkCheckButton</class>
 	      <name>cfg_detectmagic</name>
 	      <border_width>2</border_width>
+	      <tooltip>Determine if file is a SID-tune by checking the file contents. If NOT selected, filetype is determined by checking filename extension (.sid, .dat, ...)</tooltip>
 	      <can_focus>True</can_focus>
-	      <label>Determine filetype by contents (slower)</label>
+	      <label>Detect file by contents (slower)</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
@@ -1902,7 +1928,6 @@
   <class>GtkWindow</class>
   <name>xs_fileinfowin</name>
   <width>400</width>
-  <height>350</height>
   <title>XMMS-SID Fileinfo</title>
   <type>GTK_WINDOW_DIALOG</type>
   <position>GTK_WIN_POS_MOUSE</position>
@@ -1919,6 +1944,84 @@
 
     <widget>
       <class>GtkFrame</class>
+      <name>frame30</name>
+      <border_width>2</border_width>
+      <label_xalign>0</label_xalign>
+      <shadow_type>GTK_SHADOW_OUT</shadow_type>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
+
+      <widget>
+	<class>GtkHBox</class>
+	<name>hbox19</name>
+	<border_width>4</border_width>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>fileinfo_subctrl_prev</name>
+	  <can_focus>True</can_focus>
+	  <signal>
+	    <name>clicked</name>
+	    <handler>xs_subctrl_prevsong</handler>
+	    <last_modification_time>Wed, 18 Aug 2004 01:40:46 GMT</last_modification_time>
+	  </signal>
+	  <label> &lt; </label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkHScale</class>
+	  <name>fileinfo_subctrl_adj</name>
+	  <can_focus>True</can_focus>
+	  <draw_value>True</draw_value>
+	  <value_pos>GTK_POS_TOP</value_pos>
+	  <digits>0</digits>
+	  <policy>GTK_UPDATE_CONTINUOUS</policy>
+	  <value>0</value>
+	  <lower>0</lower>
+	  <upper>0</upper>
+	  <step>0</step>
+	  <page>0</page>
+	  <page_size>0</page_size>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>fileinfo_subctrl_next</name>
+	  <can_focus>True</can_focus>
+	  <signal>
+	    <name>clicked</name>
+	    <handler>xs_subctrl_nextsong</handler>
+	    <last_modification_time>Wed, 18 Aug 2004 01:41:09 GMT</last_modification_time>
+	  </signal>
+	  <label> &gt; </label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkFrame</class>
       <name>frame14</name>
       <border_width>4</border_width>
       <label>Song Information:</label>
@@ -2146,7 +2249,7 @@
       <class>GtkFrame</class>
       <name>frame15</name>
       <border_width>4</border_width>
-      <label>Tune Information:</label>
+      <label>Sub-tune Information:</label>
       <label_xalign>0</label_xalign>
       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
       <child>
@@ -2191,19 +2294,11 @@
 	  </widget>
 
 	  <widget>
-	    <class>GtkHScale</class>
+	    <class>GtkOptionMenu</class>
 	    <name>fileinfo_sub_tune</name>
 	    <can_focus>True</can_focus>
-	    <draw_value>True</draw_value>
-	    <value_pos>GTK_POS_TOP</value_pos>
-	    <digits>0</digits>
-	    <policy>GTK_UPDATE_CONTINUOUS</policy>
-	    <value>10</value>
-	    <lower>1</lower>
-	    <upper>12</upper>
-	    <step>0</step>
-	    <page>0</page>
-	    <page_size>0</page_size>
+	    <items></items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>2</padding>
 	      <expand>True</expand>