# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1056066600 0
# Node ID c145ff12f2d0246c0941d68f068063ce109f424c
# Parent  1788f4ce6a44a163bcc29b4e59bc323c8ea6da8a
Various improvements


diff -r 1788f4ce6a44 -r c145ff12f2d0 INSTALL
--- a/INSTALL	Thu Jun 19 22:38:01 2003 +0000
+++ b/INSTALL	Thu Jun 19 23:50:00 2003 +0000
@@ -51,11 +51,12 @@
 Building a CVS-version
 ======================
 To build a CVS-version of XMMS-SID, you need to have latest
-(STABLE) versions of GNU auto-tools installed, including:
+(STABLE) versions of following tools installed, including:
 
- - autoconf 2.56 or later
- - automake 1.7 or later
- - libtool 1.4.3 or later
+ - GNU autoconf 2.56 or later
+ - GNU automake 1.7 or later
+ - GNU libtool 1.4.3 or later
+ - Glade for Gtk+ 1.2 programs (I use Glade 0.6.4)
 
 If you have all required tools installed, just run the
 "bootstrap.sh"-script which generates all necessary
diff -r 1788f4ce6a44 -r c145ff12f2d0 bootstrap.sh
--- a/bootstrap.sh	Thu Jun 19 22:38:01 2003 +0000
+++ b/bootstrap.sh	Thu Jun 19 23:50:00 2003 +0000
@@ -19,4 +19,5 @@
 echo "- libtoolize  - 80%"
 libtoolize --automake --force
 
-echo "- ok.         - 100%"
+echo "- glade       - 100%"
+glade -w xmms-sid.glade
diff -r 1788f4ce6a44 -r c145ff12f2d0 xmms-sid.glade
--- a/xmms-sid.glade	Thu Jun 19 22:38:01 2003 +0000
+++ b/xmms-sid.glade	Thu Jun 19 23:50:00 2003 +0000
@@ -830,13 +830,13 @@
 
 	      <widget>
 		<class>GtkButton</class>
-		<name>cfg_filt_reset</name>
+		<name>cfg_filter_reset</name>
 		<width>120</width>
 		<height>32</height>
 		<can_focus>True</can_focus>
 		<signal>
 		  <name>clicked</name>
-		  <handler>cfg_filt_reset_clicked</handler>
+		  <handler>xs_cfg_filter_reset</handler>
 		  <last_modification_time>Mon, 18 Sep 2000 20:21:27 GMT</last_modification_time>
 		</signal>
 		<label>Reset values</label>
@@ -1085,7 +1085,7 @@
 		<can_focus>True</can_focus>
 		<signal>
 		  <name>clicked</name>
-		  <handler>cfg_sld_dbbrowse_clicked</handler>
+		  <handler>xs_cfg_sld_dbbrowse</handler>
 		  <last_modification_time>Sat, 18 Aug 2001 23:38:10 GMT</last_modification_time>
 		</signal>
 		<label>Browse</label>
@@ -1203,7 +1203,7 @@
 		  <editable>True</editable>
 		  <text_visible>True</text_visible>
 		  <text_max_length>0</text_max_length>
-		  <text>/home/C64Music/DOCUMENTS/STIL.txt</text>
+		  <text></text>
 		</widget>
 	      </widget>
 
@@ -1228,7 +1228,7 @@
 		  <can_focus>True</can_focus>
 		  <signal>
 		    <name>clicked</name>
-		    <handler>cfg_stil_browse_clicked</handler>
+		    <handler>xs_cfg_stil_browse</handler>
 		    <last_modification_time>Mon, 18 Sep 2000 17:51:32 GMT</last_modification_time>
 		  </signal>
 		  <label>Browse</label>
@@ -1423,6 +1423,7 @@
     <widget>
       <class>GtkHButtonBox</class>
       <name>hbuttonbox1</name>
+      <border_width>4</border_width>
       <layout_style>GTK_BUTTONBOX_END</layout_style>
       <spacing>30</spacing>
       <child_min_width>85</child_min_width>
@@ -1444,7 +1445,7 @@
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>cfg_ok_clicked</handler>
+	  <handler>xs_cfg_ok</handler>
 	  <last_modification_time>Mon, 18 Sep 2000 17:49:51 GMT</last_modification_time>
 	</signal>
 	<label>OK</label>
@@ -1459,7 +1460,7 @@
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>cfg_cancel_clicked</handler>
+	  <handler>xs_cfg_cancel</handler>
 	  <last_modification_time>Mon, 18 Sep 2000 17:49:57 GMT</last_modification_time>
 	</signal>
 	<label>Cancel</label>
@@ -1583,8 +1584,8 @@
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>about_ok_clicked</handler>
-	  <last_modification_time>Tue, 19 Sep 2000 19:57:12 GMT</last_modification_time>
+	  <handler>xs_about_ok</handler>
+	  <last_modification_time>Thu, 19 Jun 2003 21:58:58 GMT</last_modification_time>
 	</signal>
 	<label>Close</label>
 	<relief>GTK_RELIEF_NORMAL</relief>
@@ -2134,7 +2135,7 @@
 
 <widget>
   <class>GtkWindow</class>
-  <name>xs_songcontrolwin</name>
+  <name>xs_ctrlwin</name>
   <title>XMMS-SID</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
@@ -2174,7 +2175,7 @@
 	  <can_focus>True</can_focus>
 	  <signal>
 	    <name>clicked</name>
-	    <handler>ctrl_song_prev</handler>
+	    <handler>xs_ctrl_song_prev</handler>
 	    <last_modification_time>Tue, 23 Apr 2002 21:25:08 GMT</last_modification_time>
 	  </signal>
 	  <label> &lt; </label>
@@ -2213,7 +2214,7 @@
 	  <can_focus>True</can_focus>
 	  <signal>
 	    <name>clicked</name>
-	    <handler>ctrl_song_next</handler>
+	    <handler>xs_ctrl_song_next</handler>
 	    <last_modification_time>Tue, 23 Apr 2002 21:25:28 GMT</last_modification_time>
 	  </signal>
 	  <label> &gt; </label>
@@ -2246,7 +2247,7 @@
 
 <widget>
   <class>GtkFileSelection</class>
-  <name>xs_dbfileselector</name>
+  <name>xs_sldbfileselector</name>
   <border_width>10</border_width>
   <title>Select HVSC song-length database</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
@@ -2265,7 +2266,7 @@
     <can_focus>True</can_focus>
     <signal>
       <name>clicked</name>
-      <handler>songlensel_ok_button_clicked</handler>
+      <handler>xs_cfg_sldb_fs_ok</handler>
       <last_modification_time>Sat, 19 Oct 2002 22:50:48 GMT</last_modification_time>
     </signal>
     <label>OK</label>
@@ -2280,7 +2281,7 @@
     <can_focus>True</can_focus>
     <signal>
       <name>clicked</name>
-      <handler>songlensel_cancel_button_clicked</handler>
+      <handler>xs_cfg_sldb_fs_cancel</handler>
       <last_modification_time>Sat, 19 Oct 2002 22:50:54 GMT</last_modification_time>
     </signal>
     <label>Cancel</label>
@@ -2309,7 +2310,7 @@
     <can_focus>True</can_focus>
     <signal>
       <name>clicked</name>
-      <handler>stilsel_ok_button_clicked</handler>
+      <handler>xs_cfg_stil_fs_ok</handler>
       <last_modification_time>Sat, 19 Oct 2002 22:50:38 GMT</last_modification_time>
     </signal>
     <label>OK</label>
@@ -2324,7 +2325,7 @@
     <can_focus>True</can_focus>
     <signal>
       <name>clicked</name>
-      <handler>stilsel_cancel_button_clicked</handler>
+      <handler>xs_cfg_stil_fs_cancel</handler>
       <last_modification_time>Sat, 19 Oct 2002 22:51:00 GMT</last_modification_time>
     </signal>
     <label>Cancel</label>