Mercurial > hg > xmms-sid

diff xmms-sid.glade @ 200:ec8b735f5418

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support for libNanoSID dropped.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 19 Aug 2004 19:06:02 +0000
parents 11d0f9555717
children 4306881d0244
line wrap: on
line diff
--- a/xmms-sid.glade	Wed Aug 18 15:23:05 2004 +0000
+++ b/xmms-sid.glade	Thu Aug 19 19:06:02 2004 +0000
@@ -91,12 +91,11 @@
 	      <name>vbox9</name>
 	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>2</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_res_8bit</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>8-bit</label>
 		<active>False</active>
@@ -112,7 +111,6 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_res_16bit</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>16-bit</label>
 		<active>False</active>
@@ -145,12 +143,11 @@
 	      <name>vbox10</name>
 	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>2</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_chn_mono</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>Mono</label>
 		<active>False</active>
@@ -166,7 +163,6 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_chn_stereo</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>Stereo</label>
 		<active>False</active>
@@ -182,7 +178,6 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_chn_autopan</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>Autopanning</label>
 		<active>False</active>
@@ -288,12 +283,11 @@
 	    <name>vbox27</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_oversample</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <signal>
 		<name>toggled</name>
@@ -420,12 +414,11 @@
 	    <name>vbox26</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkRadioButton</class>
 	      <name>cfg_emu_sidplay1</name>
-	      <border_width>2</border_width>
 	      <tooltip>Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though.</tooltip>
 	      <can_focus>True</can_focus>
 	      <signal>
@@ -447,7 +440,6 @@
 	    <widget>
 	      <class>GtkRadioButton</class>
 	      <name>cfg_emu_sidplay2</name>
-	      <border_width>2</border_width>
 	      <tooltip>Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation.</tooltip>
 	      <can_focus>True</can_focus>
 	      <signal>
@@ -465,28 +457,6 @@
 		<fill>False</fill>
 	      </child>
 	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_nanosid</name>
-	      <border_width>2</border_width>
-	      <tooltip>Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation.</tooltip>
-	      <can_focus>True</can_focus>
-	      <signal>
-		<name>toggled</name>
-		<handler>xs_cfg_emu_nanosid_toggled</handler>
-		<last_modification_time>Mon, 15 Sep 2003 12:13:09 GMT</last_modification_time>
-	      </signal>
-	      <label>NanoSID</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>emulator</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
 	  </widget>
 	</widget>
 
@@ -508,7 +478,7 @@
 	    <name>vbox5</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkRadioButton</class>
@@ -621,12 +591,11 @@
 	      <name>vbox4</name>
 	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>2</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_emu_clock_pal</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>PAL (50 Hz)</label>
 		<active>False</active>
@@ -642,7 +611,6 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_emu_clock_ntsc</name>
-		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>NTSC (60 Hz)</label>
 		<active>False</active>
@@ -689,7 +657,7 @@
 	      <name>vbox3</name>
 	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>2</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
@@ -740,13 +708,13 @@
 	  <widget>
 	    <class>GtkVBox</class>
 	    <name>vbox30</name>
+	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_emu_sidplay2_opt</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <label>Optimization mode (faster, inaccurate)</label>
 	      <active>False</active>
@@ -761,7 +729,6 @@
 	    <widget>
 	      <class>GtkRadioButton</class>
 	      <name>cfg_emu_sidplay2_resid</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <label>reSID-emulation</label>
 	      <active>False</active>
@@ -777,7 +744,6 @@
 	    <widget>
 	      <class>GtkRadioButton</class>
 	      <name>cfg_emu_sidplay2_hardsid</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <label>HardSID</label>
 	      <active>False</active>
@@ -1040,12 +1006,11 @@
 	    <name>vbox32</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_mintime_enable</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <signal>
 		<name>toggled</name>
@@ -1065,9 +1030,8 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox18</name>
-	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>2</spacing>
 	      <child>
 		<padding>2</padding>
 		<expand>False</expand>
@@ -1157,12 +1121,11 @@
 	    <name>vbox21</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_maxtime_enable</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <signal>
 		<name>toggled</name>
@@ -1182,7 +1145,6 @@
 	    <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>
@@ -1197,9 +1159,8 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox14</name>
-	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>2</spacing>
 	      <child>
 		<padding>2</padding>
 		<expand>False</expand>
@@ -1289,12 +1250,11 @@
 	    <name>vbox18</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <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>
 	      <signal>
@@ -1315,7 +1275,6 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox13</name>
-	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>4</spacing>
 	      <child>
@@ -1417,12 +1376,11 @@
 	    <name>vbox8</name>
 	    <border_width>2</border_width>
 	    <homogeneous>True</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_stil_enable</name>
-	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <signal>
 		<name>toggled</name>
@@ -1625,7 +1583,7 @@
 	    <name>vbox16</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
@@ -1753,11 +1711,11 @@
 	    <name>vbox31</name>
 	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <spacing>2</spacing>
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_subsong_none</name>
+	      <name>cfg_subctrl_none</name>
 	      <tooltip>No sub-song control.</tooltip>
 	      <can_focus>True</can_focus>
 	      <label>Disabled</label>
@@ -1773,7 +1731,7 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_subsong_seek</name>
+	      <name>cfg_subctrl_seek</name>
 	      <tooltip>Seeking backwards/forwards selects previous/next sub-song, similar to selector used in XMMS-SidPlay.</tooltip>
 	      <can_focus>True</can_focus>
 	      <label>Seek back/forward changes sub-song</label>
@@ -1789,7 +1747,7 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_subsong_popup</name>
+	      <name>cfg_subctrl_popup</name>
 	      <tooltip>By pressing the seekbar a sub-song control window pops up, in style of UADE (Unix Amiga Delitracker Emulator)</tooltip>
 	      <can_focus>True</can_focus>
 	      <label>Pop-up via seekbar (UADE-style)</label>
@@ -1805,7 +1763,7 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_subsong_patch</name>
+	      <name>cfg_subctrl_patch</name>
 	      <tooltip>Seekbar works as a subtune selector (Best option if you have patched your XMMS with the song-position patch.)</tooltip>
 	      <can_focus>True</can_focus>
 	      <label>Song-position patch</label>
@@ -1823,6 +1781,50 @@
 
 	<widget>
 	  <class>GtkFrame</class>
+	  <name>frame31</name>
+	  <border_width>4</border_width>
+	  <label>Automatic sub-tune changes: </label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox35</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>2</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_subauto_enable</name>
+	      <can_focus>True</can_focus>
+	      <label>Go through all sub-tunes in file</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>Placeholder</class>
+	    </widget>
+
+	    <widget>
+	      <class>Placeholder</class>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
 	  <name>frame22</name>
 	  <border_width>4</border_width>
 	  <label>Miscellaneous options: </label>
@@ -1844,7 +1846,6 @@
 	    <widget>
 	      <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>Detect file by contents (slower)</label>
@@ -1943,12 +1944,10 @@
     <spacing>0</spacing>
 
     <widget>
-      <class>GtkAlignment</class>
-      <name>alignment8</name>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xscale>0.1</xscale>
-      <yscale>1</yscale>
+      <class>GtkHBox</class>
+      <name>hbox19</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
       <child>
 	<padding>0</padding>
 	<expand>False</expand>
@@ -1956,11 +1955,20 @@
       </child>
 
       <widget>
+	<class>Placeholder</class>
+      </widget>
+
+      <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>True</fill>
+	</child>
 
 	<widget>
 	  <class>GtkHBox</class>
@@ -2027,6 +2035,48 @@
 	  </widget>
 	</widget>
       </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>vbox34</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>GtkCheckButton</class>
+	  <name>fileinfo_subctrl_loop</name>
+	  <tooltip>Disable playtime checks for currently playing song.</tooltip>
+	  <can_focus>True</can_focus>
+	  <label>Loop forever</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkCheckButton</class>
+	  <name>fileinfo_subctrl_tmp1</name>
+	  <can_focus>True</can_focus>
+	  <label>?</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+      </widget>
     </widget>
 
     <widget>
@@ -2274,53 +2324,24 @@
 	<spacing>0</spacing>
 
 	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox7</name>
-	  <border_width>2</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
+	  <class>GtkOptionMenu</class>
+	  <name>fileinfo_sub_tune</name>
+	  <border_width>4</border_width>
+	  <can_focus>True</can_focus>
+	  <items></items>
+	  <initial_choice>0</initial_choice>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
-	    <fill>True</fill>
+	    <fill>False</fill>
 	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label20</name>
-	    <label>Sub-tune:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</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>GtkOptionMenu</class>
-	    <name>fileinfo_sub_tune</name>
-	    <can_focus>True</can_focus>
-	    <items></items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>2</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
 	</widget>
 
 	<widget>
 	  <class>GtkTable</class>
 	  <name>table2</name>
 	  <border_width>4</border_width>
-	  <rows>2</rows>
+	  <rows>3</rows>
 	  <columns>2</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>2</row_spacing>
@@ -2430,6 +2451,56 @@
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label51</name>
+	    <label>Duration:</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkEntry</class>
+	    <name>entry1</name>
+	    <can_focus>True</can_focus>
+	    <editable>False</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
+	    <child>
+	      <left_attach>1</left_attach>
+	      <right_attach>2</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
 	</widget>
 
 	<widget>
@@ -2458,33 +2529,24 @@
     </widget>
 
     <widget>
-      <class>GtkAlignment</class>
-      <name>alignment5</name>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xscale>0.1</xscale>
-      <yscale>1</yscale>
+      <class>GtkButton</class>
+      <name>button2</name>
+      <can_default>True</can_default>
+      <has_default>True</has_default>
+      <can_focus>True</can_focus>
+      <has_focus>True</has_focus>
+      <signal>
+	<name>clicked</name>
+	<handler>xs_fileinfo_ok</handler>
+	<last_modification_time>Sun, 11 Jan 2004 17:04:28 GMT</last_modification_time>
+      </signal>
+      <label>Close</label>
+      <relief>GTK_RELIEF_NORMAL</relief>
       <child>
 	<padding>0</padding>
 	<expand>False</expand>
 	<fill>False</fill>
       </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>fileinfo_ok</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<signal>
-	  <name>clicked</name>
-	  <handler>xs_fileinfo_ok</handler>
-	  <last_modification_time>Sun, 11 Jan 2004 17:04:28 GMT</last_modification_time>
-	</signal>
-	<label>Close</label>
-	<relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
     </widget>
   </widget>
 </widget>