Mercurial > hg > xmms-sid

changeset 553:cf32867a71ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GUI updates.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 26 Feb 2007 13:51:01 +0000
parents 9494fee305fa
children b37c7f430c3f
files src/xs_config.c src/xs_genui.c src/xs_genui.h xmms-sid.glade
diffstat 4 files changed, 154 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/xs_config.c	Mon Feb 26 13:35:04 2007 +0000
+++ b/src/xs_config.c	Mon Feb 26 13:51:01 2007 +0000
@@ -645,7 +645,7 @@
 
 /* Reset filter settings to defaults
  */
-void xs_cfg_filter_reset(GtkButton * button, gpointer user_data)
+void xs_cfg_sp1_filter_reset(GtkButton * button, gpointer user_data)
 {
 	(void) button;
 	(void) user_data;
--- a/src/xs_genui.c	Mon Feb 26 13:35:04 2007 +0000
+++ b/src/xs_genui.c	Mon Feb 26 13:51:01 2007 +0000
@@ -8,3 +8,34 @@
 #include "xs_interface.h"
 #include "xs_glade.h"
 
+
+void
+xs_cfg_sp2_filter_load                 (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+xs_cfg_sp2_filter_save                 (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+xs_cfg_sp2_filter_import               (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+xs_cfg_sp2_filter_export               (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
--- a/src/xs_genui.h	Mon Feb 26 13:35:04 2007 +0000
+++ b/src/xs_genui.h	Mon Feb 26 13:51:01 2007 +0000
@@ -18,7 +18,23 @@
                                         gpointer         user_data);
 
 void
-xs_cfg_filter_reset                    (GtkButton       *button,
+xs_cfg_sp1_filter_reset                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+xs_cfg_sp2_filter_load                 (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+xs_cfg_sp2_filter_save                 (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+xs_cfg_sp2_filter_import               (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+xs_cfg_sp2_filter_export               (GtkButton       *button,
                                         gpointer         user_data);
 
 void
--- a/xmms-sid.glade	Mon Feb 26 13:35:04 2007 +0000
+++ b/xmms-sid.glade	Mon Feb 26 13:51:01 2007 +0000
@@ -1058,8 +1058,8 @@
 		<can_focus>True</can_focus>
 		<signal>
 		  <name>clicked</name>
-		  <handler>xs_cfg_filter_reset</handler>
-		  <last_modification_time>Mon, 18 Sep 2000 20:21:27 GMT</last_modification_time>
+		  <handler>xs_cfg_sp1_filter_reset</handler>
+		  <last_modification_time>Mon, 26 Feb 2007 13:43:48 GMT</last_modification_time>
 		</signal>
 		<label>Reset values</label>
 		<relief>GTK_RELIEF_NORMAL</relief>
@@ -1135,17 +1135,16 @@
 	      </widget>
 
 	      <widget>
-		<class>GtkHButtonBox</class>
-		<name>hbuttonbox2</name>
-		<layout_style>GTK_BUTTONBOX_END</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>
+		<class>GtkTable</class>
+		<name>table3</name>
+		<rows>2</rows>
+		<columns>2</columns>
+		<homogeneous>True</homogeneous>
+		<row_spacing>0</row_spacing>
+		<column_spacing>0</column_spacing>
 		<child>
 		  <padding>0</padding>
-		  <expand>True</expand>
+		  <expand>False</expand>
 		  <fill>True</fill>
 		</child>
 
@@ -1154,8 +1153,27 @@
 		  <name>cfg_sp2_filter_load</name>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
+		  <signal>
+		    <name>clicked</name>
+		    <handler>xs_cfg_sp2_filter_load</handler>
+		    <last_modification_time>Mon, 26 Feb 2007 13:44:12 GMT</last_modification_time>
+		  </signal>
 		  <label>Load</label>
 		  <relief>GTK_RELIEF_NORMAL</relief>
+		  <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>
@@ -1163,8 +1181,83 @@
 		  <name>cfg_sp2_filter_save</name>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
+		  <signal>
+		    <name>clicked</name>
+		    <handler>xs_cfg_sp2_filter_save</handler>
+		    <last_modification_time>Mon, 26 Feb 2007 13:44:12 GMT</last_modification_time>
+		  </signal>
 		  <label>Save</label>
 		  <relief>GTK_RELIEF_NORMAL</relief>
+		  <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>GtkButton</class>
+		  <name>cfg_sp2_filter_import</name>
+		  <can_default>True</can_default>
+		  <can_focus>True</can_focus>
+		  <signal>
+		    <name>clicked</name>
+		    <handler>xs_cfg_sp2_filter_import</handler>
+		    <last_modification_time>Mon, 26 Feb 2007 13:44:12 GMT</last_modification_time>
+		  </signal>
+		  <label>Import</label>
+		  <relief>GTK_RELIEF_NORMAL</relief>
+		  <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>GtkButton</class>
+		  <name>cfg_sp2_filter_export</name>
+		  <can_default>True</can_default>
+		  <can_focus>True</can_focus>
+		  <signal>
+		    <name>clicked</name>
+		    <handler>xs_cfg_sp2_filter_export</handler>
+		    <last_modification_time>Mon, 26 Feb 2007 13:44:12 GMT</last_modification_time>
+		  </signal>
+		  <label>Export</label>
+		  <relief>GTK_RELIEF_NORMAL</relief>
+		  <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>
@@ -1173,6 +1266,7 @@
 	      <class>GtkFrame</class>
 	      <name>cfg_sp2_filter_frame</name>
 	      <border_width>2</border_width>
+	      <height>250</height>
 	      <label>Filter curve:</label>
 	      <label_xalign>0</label_xalign>
 	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>