Mercurial > audlegacy

changeset 1382:cface58ec50d trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - preferences window cleanups
author nenolod
date Mon, 10 Jul 2006 03:12:58 -0700
parents f85f9fe62532
children e1cac302fa23
files ChangeLog audacious/glade/prefswin.glade audacious/prefswin.c
diffstat 3 files changed, 30 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jul 10 02:44:30 2006 -0700
+++ b/ChangeLog	Mon Jul 10 03:12:58 2006 -0700
@@ -1,3 +1,12 @@
+2006-07-10 09:44:30 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1676]
+  - fix compilation
+  
+
+  Changes:        Modified:
+  +1 -0           trunk/Plugins/Output/jack/jack.c  
+
+
 2006-07-10 09:37:04 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1674]
   - provide some additional debugging hints with gdk_error_trap_push/pop.
--- a/audacious/glade/prefswin.glade	Mon Jul 10 02:44:30 2006 -0700
+++ b/audacious/glade/prefswin.glade	Mon Jul 10 03:12:58 2006 -0700
@@ -112,7 +112,7 @@
 			      <child>
 				<widget class="GtkLabel" id="input_plugin_list_label">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Media plugin list:</property>
+				  <property name="label" translatable="yes">_Decoder list:</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">True</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -216,7 +216,7 @@
 		      <child>
 			<widget class="GtkLabel" id="plugin_input_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;span size=&quot;medium&quot;&gt;&lt;b&gt;Media&lt;/b&gt;&lt;/span&gt;</property>
+			  <property name="label" translatable="yes">&lt;span size=&quot;medium&quot;&gt;&lt;b&gt;Decoders&lt;/b&gt;&lt;/span&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2362,8 +2362,6 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <accessibility>
-			      </accessibility>
 			      <signal name="realize" handler="on_show_filepopup_for_tuple_realize" after="yes" last_modification_time="Thu, 29 Jun 2006 08:45:52 GMT"/>
 			      <signal name="toggled" handler="on_show_filepopup_for_tuple_toggled" last_modification_time="Thu, 29 Jun 2006 08:46:11 GMT"/>
 			    </widget>
@@ -3806,9 +3804,9 @@
 		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkCheckButton" id="checkbutton8">
+			<widget class="GtkCheckButton" id="continue_playback_on_startup">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">When finished playing a song, don't automatically advance to the next.</property>
+			  <property name="tooltip" translatable="yes">When Audacious starts, automatically begin playing from the point where we stopped before.</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Continue playback on startup</property>
 			  <property name="use_underline">True</property>
@@ -3817,40 +3815,8 @@
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment81">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="gapless_playback">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">When finished playing a song, don't automatically advance to the next.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable gapless playback system (experimental)</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
+			  <signal name="realize" handler="on_continue_playback_on_startup_realize" last_modification_time="Mon, 10 Jul 2006 10:15:54 GMT"/>
+			  <signal name="toggled" handler="on_continue_playback_on_startup_toggled" last_modification_time="Mon, 10 Jul 2006 10:15:58 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -3874,7 +3840,7 @@
 		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkCheckButton" id="checkbutton5">
+			<widget class="GtkCheckButton" id="playlist_no_advance">
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">When finished playing a song, don't automatically advance to the next.</property>
 			  <property name="can_focus">True</property>
--- a/audacious/prefswin.c	Mon Jul 10 02:44:30 2006 -0700
+++ b/audacious/prefswin.c	Mon Jul 10 03:12:58 2006 -0700
@@ -1545,6 +1545,18 @@
 }
 
 static void
+on_continue_playback_on_startup_realize(GtkToggleButton * button, gpointer data)
+{
+    gtk_toggle_button_set_active(button, cfg.resume_playback_on_startup);
+}
+
+static void
+on_continue_playback_on_startup_toggled(GtkToggleButton * button, gpointer data)
+{
+    cfg.resume_playback_on_startup = gtk_toggle_button_get_active(button);
+}
+
+static void
 on_refresh_file_list_realize(GtkToggleButton * button, gpointer data)
 {
     gtk_toggle_button_set_active(button, cfg.refresh_file_list);
@@ -2080,6 +2092,8 @@
     FUNC_MAP_ENTRY(on_audio_format_det_cb_realize)
     FUNC_MAP_ENTRY(on_show_filepopup_for_tuple_realize)
     FUNC_MAP_ENTRY(on_show_filepopup_for_tuple_toggled)
+    FUNC_MAP_ENTRY(on_continue_playback_on_startup_realize)
+    FUNC_MAP_ENTRY(on_continue_playback_on_startup_toggled)
 FUNC_MAP_END
 
 void