diff xmms-sid.glade @ 67:ac0ea330175a

Added new options to configuration in GUI
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 30 Jun 2003 17:16:01 +0000
parents 9f3b5e7a0c15
children 77371e84bf33
line wrap: on
line diff
--- a/xmms-sid.glade	Mon Jun 30 17:15:01 2003 +0000
+++ b/xmms-sid.glade	Mon Jun 30 17:16:01 2003 +0000
@@ -11,6 +11,7 @@
   <gnome_support>False</gnome_support>
   <gettext_support>False</gettext_support>
   <use_widget_names>True</use_widget_names>
+  <output_main_file>False</output_main_file>
   <output_build_files>False</output_build_files>
   <main_source_file>xs_interface.c</main_source_file>
   <main_header_file>xs_interface.h</main_header_file>
@@ -342,7 +343,7 @@
 		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
 		<snap>False</snap>
 		<wrap>False</wrap>
-		<value>1</value>
+		<value>2</value>
 		<lower>2</lower>
 		<upper>8</upper>
 		<step>1</step>
@@ -358,7 +359,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label43</name>
-		<label>Large factors require more CPU-power.</label>
+		<label>Large factors require more CPU-power</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -909,7 +910,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame21</name>
 	  <border_width>4</border_width>
-	  <label>Maximum playtime check: </label>
+	  <label>Maximum playtime: </label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -927,15 +928,29 @@
 
 	    <widget>
 	      <class>GtkCheckButton</class>
-	      <name>cfg_sld_usemaxtime</name>
+	      <name>cfg_maxtime_enable</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
-	      <label>Play for specified time (max). Can be combined with
-automatic song-length detection mechanisms below.</label>
+	      <label>Play for specified time</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
-		<padding>2</padding>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_maxtime_unknown</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Only when song-length is unknown</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -944,11 +959,12 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox14</name>
+	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 	      <child>
 		<padding>2</padding>
-		<expand>True</expand>
+		<expand>False</expand>
 		<fill>True</fill>
 	      </child>
 
@@ -971,7 +987,7 @@
 
 	      <widget>
 		<class>GtkSpinButton</class>
-		<name>cfg_sld_maxtime</name>
+		<name>cfg_maxtime</name>
 		<can_focus>True</can_focus>
 		<climb_rate>1</climb_rate>
 		<digits>0</digits>
@@ -1016,7 +1032,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame18</name>
 	  <border_width>4</border_width>
-	  <label>Song-length Database: </label>
+	  <label>Song-length database: </label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1034,7 +1050,7 @@
 
 	    <widget>
 	      <class>GtkCheckButton</class>
-	      <name>cfg_sld</name>
+	      <name>cfg_sld_enable</name>
 	      <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>
@@ -1114,6 +1130,183 @@
 	    </widget>
 	  </widget>
 	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame27</name>
+	  <border_width>4</border_width>
+	  <label>Silence detection: </label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox28</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_silence_enable</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Check for silence before stopping</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox17</name>
+	      <border_width>2</border_width>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label44</name>
+		<label>Minimum silent time: </label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>cfg_silence_min</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
+		<wrap>False</wrap>
+		<value>60</value>
+		<lower>10</lower>
+		<upper>1000</upper>
+		<step>1</step>
+		<page>10</page>
+		<page_size>10</page_size>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label45</name>
+		<label>ms</label>
+		<justify>GTK_JUSTIFY_LEFT</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox18</name>
+	      <border_width>2</border_width>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label46</name>
+		<label>Max check length: </label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>cfg_silence_max</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
+		<wrap>False</wrap>
+		<value>1000</value>
+		<lower>1000</lower>
+		<upper>10000</upper>
+		<step>1</step>
+		<page>10</page>
+		<page_size>10</page_size>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label47</name>
+		<label>ms</label>
+		<justify>GTK_JUSTIFY_LEFT</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
+	</widget>
       </widget>
 
       <widget>
@@ -1157,7 +1350,7 @@
 
 	    <widget>
 	      <class>GtkCheckButton</class>
-	      <name>cfg_stil_use</name>
+	      <name>cfg_stil_enable</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <label>Use STIL information database</label>
@@ -1213,7 +1406,7 @@
 
 		<widget>
 		  <class>GtkEntry</class>
-		  <name>cfg_stil_path</name>
+		  <name>cfg_stil_dbpath</name>
 		  <can_focus>True</can_focus>
 		  <editable>True</editable>
 		  <text_visible>True</text_visible>
@@ -1287,6 +1480,21 @@
 		<fill>False</fill>
 	      </child>
 	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_alwaysraise</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Always raise the song-control window</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
 	  </widget>
 	</widget>
       </widget>
@@ -1487,132 +1695,6 @@
 
 <widget>
   <class>GtkWindow</class>
-  <name>xs_aboutwin</name>
-  <title>About XMMS-SID</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <default_width>300</default_width>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>about_vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>about_frame</name>
-      <border_width>4</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>GtkPixmap</class>
-	<name>about_pixmap</name>
-	<filename>xmms-sid-logo.xpm</filename>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>6</ypad>
-	<build_insensitive>True</build_insensitive>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>about_scrwin</name>
-      <border_width>8</border_width>
-      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkText</class>
-	<name>about_text</name>
-	<height>100</height>
-	<can_focus>True</can_focus>
-	<editable>False</editable>
-	<text>Programming and design
-	Matti 'ccr/TNSP' Hämäläinen
-
-libSIDPlay created by
-	Michael Schwendt
-
-libSIDPlay2 and reSID created by
-	Simon White, Dag Lem,
-	Michael Schwendt and rest.
-
-Original XMMS-SID created by
-	Willem Monsuwe
-
-&quot;XMMS-SID Theme&quot;-song (SIDtune)
-	Peter 'Brite-Lite' Halin of Dekadence
-	(C) Copyright 2002 Dekadence
-	http://www.dekadence64.org/
-
-Thanks and greetings ...
-	Everyone at #Linux.Fi, #Fireball,
-	#TNSP and #c-64 of IRCNet...
-
-	PwP, iSO, Byterapers, Fairlight,
-	mfx, Unique, Static, Dekadence,
-	PHn, Creators, Cosine, tAAt ...
-
-Special thanks
-	- All the betatesters.
-	- All the users! Hey it's you!
-</text>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkAlignment</class>
-      <name>alignment6</name>
-      <border_width>8</border_width>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xscale>0.18</xscale>
-      <yscale>1</yscale>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>about_close</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<signal>
-	  <name>clicked</name>
-	  <handler>xs_about_ok</handler>
-	  <last_modification_time>Thu, 19 Jun 2003 21:58:58 GMT</last_modification_time>
-	</signal>
-	<label>Close</label>
-	<relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
   <name>xs_fileinfowin</name>
   <width>400</width>
   <height>350</height>
@@ -2154,7 +2236,7 @@
   <class>GtkWindow</class>
   <name>xs_ctrlwin</name>
   <title>XMMS-SID</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
+  <type>GTK_WINDOW_POPUP</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
   <allow_shrink>False</allow_shrink>
@@ -2169,95 +2251,67 @@
     <shadow_type>GTK_SHADOW_OUT</shadow_type>
 
     <widget>
-      <class>GtkVBox</class>
-      <name>vbox24</name>
-      <border_width>4</border_width>
-      <homogeneous>True</homogeneous>
-      <spacing>0</spacing>
+      <class>GtkHBox</class>
+      <name>hbox15</name>
+      <homogeneous>False</homogeneous>
+      <spacing>4</spacing>
 
       <widget>
-	<class>GtkHBox</class>
-	<name>hbox15</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
+	<class>GtkButton</class>
+	<name>ctrl_song_prev</name>
+	<can_focus>True</can_focus>
+	<signal>
+	  <name>clicked</name>
+	  <handler>xs_ctrl_song_prev</handler>
+	  <last_modification_time>Tue, 23 Apr 2002 21:25:08 GMT</last_modification_time>
+	</signal>
+	<label> &lt; </label>
+	<relief>GTK_RELIEF_NORMAL</relief>
 	<child>
 	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
+	  <expand>False</expand>
+	  <fill>False</fill>
 	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>ctrl_song_prev</name>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>xs_ctrl_song_prev</handler>
-	    <last_modification_time>Tue, 23 Apr 2002 21:25:08 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>ctrl_song_current</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>1</value>
-	  <lower>1</lower>
-	  <upper>6</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>ctrl_song_next</name>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>xs_ctrl_song_next</handler>
-	    <last_modification_time>Tue, 23 Apr 2002 21:25:28 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>
-	<class>GtkEntry</class>
-	<name>ctrl_song_name</name>
+	<class>GtkHScale</class>
+	<name>ctrl_song_current</name>
 	<can_focus>True</can_focus>
-	<editable>False</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text>paski</text>
+	<draw_value>True</draw_value>
+	<value_pos>GTK_POS_TOP</value_pos>
+	<digits>0</digits>
+	<policy>GTK_UPDATE_DELAYED</policy>
+	<value>4</value>
+	<lower>1</lower>
+	<upper>6</upper>
+	<step>1</step>
+	<page>1</page>
+	<page_size>0</page_size>
 	<child>
 	  <padding>0</padding>
-	  <expand>True</expand>
+	  <expand>False</expand>
 	  <fill>True</fill>
 	</child>
       </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>ctrl_song_next</name>
+	<can_focus>True</can_focus>
+	<signal>
+	  <name>clicked</name>
+	  <handler>xs_ctrl_song_next</handler>
+	  <last_modification_time>Tue, 23 Apr 2002 21:25:28 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>