# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1127476265 0
# Node ID 08e4408405aaf13ce1aab65842ebce85d0a0696d
# Parent  5fe452765b8bd7849534b12590dbe9034be26ebc
GUI updates


diff -r 5fe452765b8b -r 08e4408405aa xmms-sid.glade
--- a/xmms-sid.glade	Fri Sep 23 10:34:01 2005 +0000
+++ b/xmms-sid.glade	Fri Sep 23 11:51:05 2005 +0000
@@ -207,60 +207,102 @@
 	  </child>
 
 	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment4</name>
-	    <border_width>2</border_width>
-	    <xalign>0</xalign>
-	    <yalign>0</yalign>
-	    <xscale>0.12</xscale>
-	    <yscale>0.5</yscale>
+	    <class>GtkHBox</class>
+	    <name>hbox4</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>cfg_samplerate_menu</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>clicked</name>
+		<handler>xs_cfg_samplerate_menu_clicked</handler>
+		<last_modification_time>Wed, 12 Jan 2005 01:52:36 GMT</last_modification_time>
+	      </signal>
+	      <items>8000
+11025
+22050
+44100
+48000
+64000
+96000
+</items>
+	      <initial_choice>3</initial_choice>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
 
 	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox4</name>
-	      <border_width>2</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <class>GtkLabel</class>
+	      <name>label8</name>
+	      <label>Hz</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>4</padding>
+		<expand>False</expand>
+		<fill>True</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkVSeparator</class>
+	      <name>vseparator1</name>
+	      <child>
+		<padding>0</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+	    </widget>
 
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>cfg_samplerate</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>44100</value>
-		<lower>4000</lower>
-		<upper>128000</upper>
-		<step>100</step>
-		<page>1000</page>
-		<page_size>0</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
+	    <widget>
+	      <class>GtkSpinButton</class>
+	      <name>cfg_samplerate</name>
+	      <can_focus>True</can_focus>
+	      <climb_rate>8000</climb_rate>
+	      <digits>0</digits>
+	      <numeric>True</numeric>
+	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	      <snap>False</snap>
+	      <wrap>False</wrap>
+	      <value>44100</value>
+	      <lower>8000</lower>
+	      <upper>128000</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>label8</name>
-		<label>Hz</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>4</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label54</name>
+	      <label>Hz</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>True</fill>
+	      </child>
 	    </widget>
 	  </widget>
 	</widget>
@@ -773,50 +815,54 @@
       </widget>
 
       <widget>
-	<class>GtkFrame</class>
-	<name>frame17</name>
+	<class>GtkVBox</class>
+	<name>vbox25</name>
 	<border_width>4</border_width>
-	<label>SID emulation filter settings: </label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	<homogeneous>False</homogeneous>
+	<spacing>2</spacing>
 
 	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox25</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
+	  <class>GtkCheckButton</class>
+	  <name>cfg_emu_filters</name>
+	  <can_focus>True</can_focus>
+	  <signal>
+	    <name>toggled</name>
+	    <handler>xs_cfg_emu_filters_toggled</handler>
+	    <last_modification_time>Mon, 15 Sep 2003 12:30:11 GMT</last_modification_time>
+	  </signal>
+	  <label>Emulate filters</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_emu_filters</name>
-	    <border_width>2</border_width>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>xs_cfg_emu_filters_toggled</handler>
-	      <last_modification_time>Mon, 15 Sep 2003 12:30:11 GMT</last_modification_time>
-	    </signal>
-	    <label>Emulate filters</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
+	<widget>
+	  <class>GtkNotebook</class>
+	  <name>cfg_filters_notebook</name>
+	  <can_focus>True</can_focus>
+	  <show_tabs>True</show_tabs>
+	  <show_border>True</show_border>
+	  <tab_pos>GTK_POS_TOP</tab_pos>
+	  <scrollable>False</scrollable>
+	  <tab_hborder>2</tab_hborder>
+	  <tab_vborder>2</tab_vborder>
+	  <popup_enable>False</popup_enable>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
 
 	  <widget>
 	    <class>GtkHBox</class>
-	    <name>hbox8</name>
+	    <name>cfg_box_sidplay1</name>
 	    <border_width>4</border_width>
 	    <homogeneous>False</homogeneous>
 	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
 
 	    <widget>
 	      <class>GtkFrame</class>
@@ -829,7 +875,7 @@
 	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
+		<expand>False</expand>
 		<fill>True</fill>
 	      </child>
 
@@ -861,7 +907,7 @@
 	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
+		<expand>False</expand>
 		<fill>True</fill>
 	      </child>
 
@@ -893,7 +939,7 @@
 	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
+		<expand>False</expand>
 		<fill>True</fill>
 	      </child>
 
@@ -919,7 +965,7 @@
 	      <name>vbox17</name>
 	      <border_width>4</border_width>
 	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <spacing>8</spacing>
 	      <child>
 		<padding>0</padding>
 		<expand>True</expand>
@@ -929,8 +975,6 @@
 	      <widget>
 		<class>GtkButton</class>
 		<name>cfg_filter_reset</name>
-		<width>120</width>
-		<height>32</height>
 		<can_focus>True</can_focus>
 		<signal>
 		  <name>clicked</name>
@@ -947,17 +991,17 @@
 	      </widget>
 
 	      <widget>
-		<class>GtkLabel</class>
-		<name>label9</name>
-		<width>136</width>
-		<height>104</height>
-		<label>These sliders affect the emulated SID's filter values. (Defaults are what the libsidplay sets them on init.)</label>
-		<justify>GTK_JUSTIFY_LEFT</justify>
-		<wrap>True</wrap>
-		<xalign>0.5</xalign>
-		<yalign>7.45058e-09</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
+		<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>
@@ -966,6 +1010,94 @@
 	      </widget>
 	    </widget>
 	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
+	    <name>label55</name>
+	    <label>SIDPlay1</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	  </widget>
+
+	  <widget>
+	    <class>GtkHBox</class>
+	    <name>cfg_box_sidplay2</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>Placeholder</class>
+	    </widget>
+
+	    <widget>
+	      <class>GtkVBox</class>
+	      <name>vbox36</name>
+	      <border_width>4</border_width>
+	      <homogeneous>False</homogeneous>
+	      <spacing>8</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</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>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <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>
+	    </widget>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
+	    <name>label56</name>
+	    <label>SIDPlay2</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	  </widget>
 	</widget>
       </widget>