Mercurial > hg > xmms-sid

changeset 716:5f215b88d507

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some work on the GUI.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 09 Feb 2009 15:42:32 +0200
parents 6b7fa8232d87
children c8648efaebba
files src/xs_genui.c src/xs_genui.h xmms-sid.glade
diffstat 3 files changed, 276 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xs_genui.c	Mon Feb 09 15:02:34 2009 +0200
+++ b/src/xs_genui.c	Mon Feb 09 15:42:32 2009 +0200
@@ -8,3 +8,22 @@
 #include "xs_interface.h"
 #include "xs_glade.h"
 
+
+void
+xs_cfg_sp2_filter_new                  (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+gboolean
+xs_filter_newwin_delete                (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data)
+{
+
+  return FALSE;
+}
+
+
--- a/src/xs_genui.h	Mon Feb 09 15:02:34 2009 +0200
+++ b/src/xs_genui.h	Mon Feb 09 15:42:32 2009 +0200
@@ -188,3 +188,13 @@
 xs_confirmwin_delete                   (GtkWidget       *widget,
                                         GdkEvent        *event,
                                         gpointer         user_data);
+
+void
+xs_cfg_sp2_filter_new                  (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+xs_filter_newwin_delete                (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
--- a/xmms-sid.glade	Mon Feb 09 15:02:34 2009 +0200
+++ b/xmms-sid.glade	Mon Feb 09 15:42:32 2009 +0200
@@ -1145,6 +1145,7 @@
 		<widget>
 		  <class>GtkButton</class>
 		  <name>cfg_sp2_filter_export</name>
+		  <tooltip>Export all filters into a INI-format file.</tooltip>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
 		  <signal>
@@ -1173,6 +1174,7 @@
 		<widget>
 		  <class>GtkButton</class>
 		  <name>cfg_sp2_filter_load</name>
+		  <tooltip>Load and use the selected filter.</tooltip>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
 		  <signal>
@@ -1180,7 +1182,7 @@
 		    <handler>xs_cfg_sp2_filter_load</handler>
 		    <last_modification_time>Mon, 26 Feb 2007 13:44:12 GMT</last_modification_time>
 		  </signal>
-		  <label>Use</label>
+		  <label>&lt;- Use</label>
 		  <relief>GTK_RELIEF_NORMAL</relief>
 		  <child>
 		    <left_attach>0</left_attach>
@@ -1201,6 +1203,7 @@
 		<widget>
 		  <class>GtkButton</class>
 		  <name>cfg_sp2_filter_save</name>
+		  <tooltip>Save the currently edited filter.</tooltip>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
 		  <signal>
@@ -1229,6 +1232,7 @@
 		<widget>
 		  <class>GtkButton</class>
 		  <name>cfg_sp2_filter_import</name>
+		  <tooltip>Import a INI-format filter definition file.</tooltip>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
 		  <signal>
@@ -1257,6 +1261,7 @@
 		<widget>
 		  <class>GtkButton</class>
 		  <name>cfg_sp2_filter_delete</name>
+		  <tooltip>Delete the selected filter.</tooltip>
 		  <can_default>True</can_default>
 		  <can_focus>True</can_focus>
 		  <signal>
@@ -1281,6 +1286,35 @@
 		    <yfill>False</yfill>
 		  </child>
 		</widget>
+
+		<widget>
+		  <class>GtkButton</class>
+		  <name>cfg_sp2_filter_new</name>
+		  <tooltip>Create a new filter.</tooltip>
+		  <can_default>True</can_default>
+		  <can_focus>True</can_focus>
+		  <signal>
+		    <name>clicked</name>
+		    <handler>xs_cfg_sp2_filter_new</handler>
+		    <last_modification_time>Sat, 24 May 2008 02:36:37 GMT</last_modification_time>
+		  </signal>
+		  <label>New</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>
 	    </widget>
 
@@ -1289,7 +1323,7 @@
 	      <name>cfg_sp2_filter_frame</name>
 	      <border_width>2</border_width>
 	      <height>250</height>
-	      <label>Filter curve:</label>
+	      <label>Filter:</label>
 	      <label_xalign>0</label_xalign>
 	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	      <child>
@@ -3304,4 +3338,215 @@
   </widget>
 </widget>
 
+<widget>
+  <class>GtkDialog</class>
+  <name>xs_filter_newwin</name>
+  <signal>
+    <name>delete_event</name>
+    <handler>xs_filter_newwin_delete</handler>
+    <last_modification_time>Mon, 09 Feb 2009 11:44:21 GMT</last_modification_time>
+  </signal>
+  <title>Create new filter</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>True</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>False</auto_shrink>
+
+  <widget>
+    <class>GtkVBox</class>
+    <child_name>Dialog:vbox</child_name>
+    <name>dialog-vbox2</name>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+
+    <widget>
+      <class>GtkHBox</class>
+      <child_name>Dialog:action_area</child_name>
+      <name>dialog-action_area2</name>
+      <border_width>10</border_width>
+      <homogeneous>True</homogeneous>
+      <spacing>5</spacing>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>True</fill>
+	<pack>GTK_PACK_END</pack>
+      </child>
+
+      <widget>
+	<class>GtkHButtonBox</class>
+	<name>hbuttonbox3</name>
+	<layout_style>GTK_BUTTONBOX_END</layout_style>
+	<spacing>8</spacing>
+	<child_min_width>85</child_min_width>
+	<child_min_height>27</child_min_height>
+	<child_ipad_x>0</child_ipad_x>
+	<child_ipad_y>0</child_ipad_y>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>xs_filter_new_create</name>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>Create</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>xs_filter_new_cancel</name>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>Cancel</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
+	</widget>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkFrame</class>
+      <name>frame1</name>
+      <border_width>6</border_width>
+      <label>Filter parameters</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>GtkTable</class>
+	<name>table4</name>
+	<border_width>4</border_width>
+	<rows>2</rows>
+	<columns>2</columns>
+	<homogeneous>False</homogeneous>
+	<row_spacing>4</row_spacing>
+	<column_spacing>4</column_spacing>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>xs_filter_new_name</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</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>0</top_attach>
+	    <bottom_attach>1</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>
+	  <class>GtkCombo</class>
+	  <name>xs_filter_new_type_combo</name>
+	  <value_in_list>False</value_in_list>
+	  <ok_if_empty>False</ok_if_empty>
+	  <case_sensitive>False</case_sensitive>
+	  <use_arrows>True</use_arrows>
+	  <use_arrows_always>False</use_arrows_always>
+	  <items></items>
+	  <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>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+
+	  <widget>
+	    <class>GtkEntry</class>
+	    <child_name>GtkCombo:entry</child_name>
+	    <name>xs_filter_new_type</name>
+	    <can_focus>True</can_focus>
+	    <editable>False</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label1</name>
+	  <label>Name:</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>label2</name>
+	  <label>Type:</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>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>
+  </widget>
+</widget>
+
 </GTK-Interface>