Mercurial > hg > xmms-sid

diff xmms-sid.glade @ 25:82f79aad24c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated interface and information in NEWS
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Jun 2003 17:17:00 +0000
parents e5c49367b899
children c145ff12f2d0
line wrap: on
line diff
--- a/xmms-sid.glade	Sat Jun 07 12:42:05 2003 +0000
+++ b/xmms-sid.glade	Sat Jun 07 17:17:00 2003 +0000
@@ -68,7 +68,7 @@
 	  <spacing>0</spacing>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
@@ -102,7 +102,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>resolution</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -118,7 +118,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>resolution</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -156,7 +156,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>channels</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -172,7 +172,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>channels</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -188,7 +188,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>channels</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -206,13 +206,14 @@
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
 	  <widget>
 	    <class>GtkAlignment</class>
 	    <name>alignment4</name>
+	    <border_width>4</border_width>
 	    <xalign>0.04</xalign>
 	    <yalign>0</yalign>
 	    <xscale>0.12</xscale>
@@ -221,7 +222,6 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox4</name>
-	      <border_width>4</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 
@@ -277,20 +277,21 @@
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
 	  <widget>
 	    <class>GtkVBox</class>
 	    <name>vbox27</name>
+	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
 	    <spacing>0</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_oversample</name>
-	      <border_width>4</border_width>
+	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <label>Use oversampling</label>
 	      <active>False</active>
@@ -305,7 +306,7 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox16</name>
-	      <border_width>4</border_width>
+	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>4</spacing>
 	      <child>
@@ -317,7 +318,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label42</name>
-		<label>Oversampling factor:</label>
+		<label>Factor:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -357,8 +358,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label43</name>
-		<label>Larger values 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>
@@ -418,6 +418,7 @@
 	    <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>
 	      <label>SIDPlay 1 (frame-based)</label>
@@ -434,6 +435,7 @@
 	    <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>
 	      <label>SIDPlay 2 (cycle-based)</label>
@@ -450,8 +452,9 @@
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_emu_sidplay2_opt</name>
+	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
-	      <label>Use SIDPlay2 optimization mode (faster, not accurate)</label>
+	      <label>SIDPlay 2 optimization mode (faster, inaccurate)</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
@@ -470,7 +473,7 @@
 	  <spacing>0</spacing>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
@@ -497,13 +500,14 @@
 	      <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>
 		<draw_indicator>True</draw_indicator>
 		<group>speed</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -512,13 +516,14 @@
 	      <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>
 		<draw_indicator>True</draw_indicator>
 		<group>speed</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -532,7 +537,7 @@
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -569,7 +574,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>waveforms</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -584,7 +589,7 @@
 		<draw_indicator>True</draw_indicator>
 		<group>waveforms</group>
 		<child>
-		  <padding>2</padding>
+		  <padding>0</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -622,7 +627,7 @@
 	      <draw_indicator>True</draw_indicator>
 	      <group>memorymode</group>
 	      <child>
-		<padding>2</padding>
+		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -637,7 +642,7 @@
 	      <draw_indicator>True</draw_indicator>
 	      <group>memorymode</group>
 	      <child>
-		<padding>2</padding>
+		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -652,7 +657,7 @@
 	      <draw_indicator>True</draw_indicator>
 	      <group>memorymode</group>
 	      <child>
-		<padding>2</padding>
+		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -691,7 +696,7 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>cfg_emu_filters</name>
-	    <border_width>4</border_width>
+	    <border_width>2</border_width>
 	    <can_focus>True</can_focus>
 	    <label>Emulate filters</label>
 	    <active>False</active>
@@ -736,7 +741,7 @@
 		<can_focus>True</can_focus>
 		<draw_value>True</draw_value>
 		<value_pos>GTK_POS_TOP</value_pos>
-		<digits>1</digits>
+		<digits>2</digits>
 		<policy>GTK_UPDATE_CONTINUOUS</policy>
 		<value>0</value>
 		<lower>0</lower>
@@ -768,7 +773,7 @@
 		<can_focus>True</can_focus>
 		<draw_value>True</draw_value>
 		<value_pos>GTK_POS_TOP</value_pos>
-		<digits>1</digits>
+		<digits>2</digits>
 		<policy>GTK_UPDATE_CONTINUOUS</policy>
 		<value>0</value>
 		<lower>0</lower>
@@ -894,7 +899,7 @@
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
@@ -908,6 +913,7 @@
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_sld_usemaxtime</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>
@@ -995,12 +1001,12 @@
 	  <class>GtkFrame</class>
 	  <name>frame18</name>
 	  <border_width>4</border_width>
-	  <label>Song-length detection: </label>
+	  <label>Song-length Database: </label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
@@ -1012,257 +1018,16 @@
 	    <spacing>0</spacing>
 
 	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_sld_none</name>
-	      <border_width>2</border_width>
-	      <tooltip>No automatic song-length detection. (See also Maximum playtime check)</tooltip>
-	      <can_focus>True</can_focus>
-	      <label>No song-length detection</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>songlength</group>
-	      <child>
-		<padding>2</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator1</name>
-	      <child>
-		<padding>2</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_sld_maxsilence</name>
-	      <border_width>2</border_width>
-	      <tooltip>Detect possible end of song with silence timing.</tooltip>
-	      <can_focus>True</can_focus>
-	      <label>Maximum silence time</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>songlength</group>
-	      <child>
-		<padding>2</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkTable</class>
-	      <name>table3</name>
-	      <border_width>2</border_width>
-	      <rows>2</rows>
-	      <columns>3</columns>
-	      <homogeneous>False</homogeneous>
-	      <row_spacing>4</row_spacing>
-	      <column_spacing>4</column_spacing>
-	      <child>
-		<padding>2</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label29</name>
-		<label>Silence:</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>0</top_attach>
-		  <bottom_attach>1</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>GtkLabel</class>
-		<name>label30</name>
-		<label>Amplitude: </label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<focus_target>cfg_sld_percentage</focus_target>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</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>GtkLabel</class>
-		<name>label31</name>
-		<label>seconds</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>2</left_attach>
-		  <right_attach>3</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</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>GtkLabel</class>
-		<name>label32</name>
-		<label>%</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<focus_target>cfg_sld_percentage</focus_target>
-		<child>
-		  <left_attach>2</left_attach>
-		  <right_attach>3</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</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>GtkSpinButton</class>
-		<name>cfg_sld_silencetime</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>30</value>
-		<lower>0</lower>
-		<upper>180</upper>
-		<step>1</step>
-		<page>15</page>
-		<page_size>15</page_size>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</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>GtkSpinButton</class>
-		<name>cfg_sld_percentage</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>1</value>
-		<lower>0</lower>
-		<upper>100</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</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>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator3</name>
-	      <child>
-		<padding>2</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_sld_database</name>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_sld</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>
-	      <label>Song-length database (XSIDPLAY-compatible)</label>
+	      <label>Use XSIDPLAY-compatible database</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
-	      <group>songlength</group>
 	      <child>
-		<padding>2</padding>
+		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -1276,14 +1041,14 @@
 	      <spacing>4</spacing>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
+		<expand>False</expand>
 		<fill>True</fill>
 	      </child>
 
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label33</name>
-		<label>DB-filename: </label>
+		<label>DB-file: </label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -1384,7 +1149,7 @@
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
-		<padding>2</padding>
+		<padding>0</padding>
 		<expand>True</expand>
 		<fill>False</fill>
 	      </child>
@@ -1483,7 +1248,7 @@
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>False</expand>
+	    <expand>True</expand>
 	    <fill>True</fill>
 	  </child>
 
@@ -1495,21 +1260,6 @@
 
 	    <widget>
 	      <class>GtkCheckButton</class>
-	      <name>cfg_finfo_usecolor</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Use text coloring in fileinformation dialog</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>cfg_detectmagic</name>
 	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
@@ -1562,7 +1312,7 @@
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <child>
-	      <padding>2</padding>
+	      <padding>0</padding>
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
@@ -1780,13 +1530,15 @@
 	<name>about_text</name>
 	<height>100</height>
 	<can_focus>True</can_focus>
-	<editable>True</editable>
+	<editable>False</editable>
 	<text>Programming and design
 	Matti 'ccr/TNSP' Hämäläinen
 
 libSIDPlay created by
 	Michael Schwendt
 
+libSIDPlay2 created by
+	
 Original programming and design
 	Willem Monsuwe
 
@@ -1796,18 +1548,16 @@
 	http://www.dekadence64.org/
 
 Thanks and greetings ...
-	JaMZ, MdX, fgcl, Sindrom,
-	Ssadistik, Delfine, Viznut, at,
-	Feenix, juhas, Loop, Nrg, ytti ...
+	Everyone at #Linux.Fi, #Fireball,
+	#TNSP and #c-64 of IRCNet...
 
 	PwP, iSO, Byterapers, Fairlight,
 	mfx, Unique, Static, Dekadence,
-	Mass, PHn, tAAt ...
+	PHn, Creators, Cosine, tAAt ...
 
 Special thanks
 	- All the betatesters.
 	- All the users! Hey it's you!
-	- And others ...
 </text>
       </widget>
     </widget>