# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1171283401 0
# Node ID 93df5319a83a34a39ce161758d97e671c68bb586
# Parent  cfb085148c22b59c4e4654dfbadc469cdb7776fb
Improvements in the UI. The code has not yet been amended to handle these changes, though, so builds/running will fail.


diff -r cfb085148c22 -r 93df5319a83a xmms-sid.glade
--- a/xmms-sid.glade	Fri Feb 09 12:09:02 2007 +0000
+++ b/xmms-sid.glade	Mon Feb 12 12:30:01 2007 +0000
@@ -463,7 +463,7 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_emu_clock_pal</name>
-		<tooltip>PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Largest % of SID-tunes have been made for PAL computers.</tooltip>
+		<tooltip>PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Most of SID-tunes have been made for PAL computers.</tooltip>
 		<can_focus>True</can_focus>
 		<label>PAL (50 Hz)</label>
 		<active>False</active>
@@ -498,7 +498,7 @@
 	    <class>GtkFrame</class>
 	    <name>frame3</name>
 	    <border_width>4</border_width>
-	    <label>SID model: </label>
+	    <label>SID model:</label>
 	    <label_xalign>0</label_xalign>
 	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	    <child>
@@ -567,7 +567,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame26</name>
 	  <border_width>4</border_width>
-	  <label>Emulation library selection: </label>
+	  <label>Emulation library selection:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -733,7 +733,7 @@
 	  <class>GtkFrame</class>
 	  <name>cfg_sidplay2_grp</name>
 	  <border_width>4</border_width>
-	  <label>SIDPlay 2 options: </label>
+	  <label>SIDPlay 2 options:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -802,7 +802,7 @@
 	  <class>GtkFrame</class>
 	  <name>cfg_resid_grp</name>
 	  <border_width>4</border_width>
-	  <label>reSID sampling options: </label>
+	  <label>reSID sampling options:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1069,25 +1069,6 @@
 		  <fill>False</fill>
 		</child>
 	      </widget>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>cfg_filter_sync</name>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>clicked</name>
-		  <handler>xs_cfg_filter_sync_clicked</handler>
-		  <last_modification_time>Thu, 22 Sep 2005 02:23:59 GMT</last_modification_time>
-		</signal>
-		<label>Synchronize from
-SIDPlay2</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
 	    </widget>
 	  </widget>
 
@@ -1112,56 +1093,120 @@
 	    <spacing>0</spacing>
 
 	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox36</name>
+	      <class>GtkFrame</class>
+	      <name>frame33</name>
 	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>8</spacing>
+	      <label>Filter curve:</label>
+	      <label_xalign>0</label_xalign>
+	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	      <child>
 		<padding>0</padding>
-		<expand>False</expand>
+		<expand>True</expand>
 		<fill>True</fill>
 	      </child>
 
 	      <widget>
-		<class>GtkButton</class>
-		<name>cfg_filter2_reset</name>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>clicked</name>
-		  <handler>xs_cfg_filter2_reset</handler>
-		  <last_modification_time>Thu, 22 Sep 2005 02:24:15 GMT</last_modification_time>
-		</signal>
-		<label>Reset values</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
+		<class>Placeholder</class>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkVBox</class>
+	      <name>vbox38</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkFrame</class>
+		<name>frame32</name>
+		<border_width>4</border_width>
+		<label>Presets:</label>
+		<label_xalign>0</label_xalign>
+		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
-		  <fill>False</fill>
+		  <fill>True</fill>
 		</child>
-	      </widget>
+
+		<widget>
+		  <class>GtkVBox</class>
+		  <name>vbox38</name>
+		  <border_width>2</border_width>
+		  <homogeneous>False</homogeneous>
+		  <spacing>0</spacing>
+
+		  <widget>
+		    <class>GtkCombo</class>
+		    <name>combo1</name>
+		    <value_in_list>False</value_in_list>
+		    <ok_if_empty>True</ok_if_empty>
+		    <case_sensitive>False</case_sensitive>
+		    <use_arrows>True</use_arrows>
+		    <use_arrows_always>False</use_arrows_always>
+		    <items>6581 (reSID)
+8580 (reSID)
+6581R1 (alankila)
+6581R4 (alankila)
+</items>
+		    <child>
+		      <padding>0</padding>
+		      <expand>False</expand>
+		      <fill>False</fill>
+		    </child>
 
-	      <widget>
-		<class>GtkButton</class>
-		<name>cfg_filter2_sync</name>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>clicked</name>
-		  <handler>xs_cfg_filter2_sync_clicked</handler>
-		  <last_modification_time>Thu, 22 Sep 2005 02:31:27 GMT</last_modification_time>
-		</signal>
-		<label>Synchronize from
-SIDPlay1</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
+		    <widget>
+		      <class>GtkEntry</class>
+		      <child_name>GtkCombo:entry</child_name>
+		      <name>combo-entry1</name>
+		      <can_focus>True</can_focus>
+		      <editable>True</editable>
+		      <text_visible>True</text_visible>
+		      <text_max_length>0</text_max_length>
+		      <text>6581R1 (alankila)</text>
+		    </widget>
+		  </widget>
+
+		  <widget>
+		    <class>GtkHButtonBox</class>
+		    <name>hbuttonbox2</name>
+		    <border_width>2</border_width>
+		    <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
+		    <spacing>0</spacing>
+		    <child_min_width>85</child_min_width>
+		    <child_min_height>27</child_min_height>
+		    <child_ipad_x>7</child_ipad_x>
+		    <child_ipad_y>0</child_ipad_y>
+		    <child>
+		      <padding>0</padding>
+		      <expand>False</expand>
+		      <fill>False</fill>
+		    </child>
+
+		    <widget>
+		      <class>GtkButton</class>
+		      <name>button3</name>
+		      <can_default>True</can_default>
+		      <can_focus>True</can_focus>
+		      <label>Load</label>
+		      <relief>GTK_RELIEF_NORMAL</relief>
+		    </widget>
+
+		    <widget>
+		      <class>GtkButton</class>
+		      <name>button4</name>
+		      <can_default>True</can_default>
+		      <can_focus>True</can_focus>
+		      <label>Save</label>
+		      <relief>GTK_RELIEF_NORMAL</relief>
+		    </widget>
+		  </widget>
+		</widget>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -1204,7 +1249,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame29</name>
 	  <border_width>4</border_width>
-	  <label>Minimum playtime: </label>
+	  <label>Minimum playtime:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1254,7 +1299,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>cfg_mintime_label1</name>
-		<label>Playtime: </label>
+		<label>Playtime:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1320,7 +1365,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame21</name>
 	  <border_width>4</border_width>
-	  <label>Maximum playtime: </label>
+	  <label>Maximum playtime:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1385,7 +1430,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>cfg_maxtime_label1</name>
-		<label>Playtime: </label>
+		<label>Playtime:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1451,7 +1496,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>
@@ -1501,7 +1546,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>cfg_sld_label1</name>
-		<label>DB-file: </label>
+		<label>DB-file:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -1577,7 +1622,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame7</name>
 	  <border_width>4</border_width>
-	  <label>SID Tune Information List (STIL) database: </label>
+	  <label>SID Tune Information List (STIL) database:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1787,7 +1832,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame16</name>
 	  <border_width>4</border_width>
-	  <label>Song name/title format: </label>
+	  <label>Song name/title format:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -1920,7 +1965,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame28</name>
 	  <border_width>4</border_width>
-	  <label>Sub-tune control: </label>
+	  <label>Sub-tune control:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -2006,7 +2051,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame31</name>
 	  <border_width>4</border_width>
-	  <label>Automatic sub-tune changes: </label>
+	  <label>Automatic sub-tune changes:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -2074,7 +2119,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label52</name>
-		<label>Playtime: </label>
+		<label>Playtime:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -2135,7 +2180,7 @@
 	  <class>GtkFrame</class>
 	  <name>frame22</name>
 	  <border_width>4</border_width>
-	  <label>Miscellaneous options: </label>
+	  <label>Miscellaneous options:</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -2259,6 +2304,7 @@
     <widget>
       <class>GtkAlignment</class>
       <name>alignment8</name>
+      <border_width>2</border_width>
       <xalign>0.5</xalign>
       <yalign>0.5</yalign>
       <xscale>0.1</xscale>
@@ -2592,7 +2638,8 @@
 	  <name>fileinfo_sub_tune</name>
 	  <border_width>2</border_width>
 	  <can_focus>True</can_focus>
-	  <items></items>
+	  <items> 
+</items>
 	  <initial_choice>0</initial_choice>
 	  <child>
 	    <padding>0</padding>