# HG changeset patch # User yaz # Date 1169787015 28800 # Node ID 15fc0d852633383c52f1366373889a5853a862fa # Parent 60f1bc20c19c56aed2aefb665de2f8c056d84942 [svn] enhancement to popup information settings - progress bar in filepopup can be toggled - delay for filepopup is now configurable diff -r 60f1bc20c19c -r 15fc0d852633 ChangeLog --- a/ChangeLog Thu Jan 25 20:23:16 2007 -0800 +++ b/ChangeLog Thu Jan 25 20:50:15 2007 -0800 @@ -1,3 +1,14 @@ +2007-01-26 04:23:16 +0000 William Pitcock + revision [3818] + - hooking implementation. + example: hook_register("playback begin"); hook_call("playback begin", ); + + trunk/src/audacious/Makefile | 2 + trunk/src/audacious/hook.c | 108 +++++++++++++++++++++++++++++++++++++++++++ + trunk/src/audacious/hook.h | 33 +++++++++++++ + 3 files changed, 143 insertions(+) + + 2007-01-25 16:19:54 +0000 Alexandr Orlov revision [3816] Update russian translation diff -r 60f1bc20c19c -r 15fc0d852633 src/audacious/glade/prefswin.glade --- a/src/audacious/glade/prefswin.glade Thu Jan 25 20:23:16 2007 -0800 +++ b/src/audacious/glade/prefswin.glade Thu Jan 25 20:50:15 2007 -0800 @@ -3382,10 +3382,56 @@ + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + True False @@ -4154,8 +4200,54 @@ + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + 0 @@ -4273,6 +4365,31 @@ 12 + + True + <b>Cover image retrieve</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + True While searching for the album's cover, Audacious looks for certain words in the filename. You can specify those words in the lists below, separated using commas. @@ -4283,7 +4400,7 @@ False 0 0 - 0 + 12 0 PANGO_ELLIPSIZE_NONE -1 @@ -4338,7 +4455,7 @@ False 0 0.5 - 0 + 12 0 PANGO_ELLIPSIZE_NONE -1 @@ -4366,7 +4483,7 @@ False 0 0.5 - 0 + 12 0 PANGO_ELLIPSIZE_NONE -1 @@ -4549,6 +4666,135 @@ + + True + <b>Miscellaneous</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + Show Progress bar for the current track + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + + True + 0 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + Delay until filepopup comes up: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 12 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + + 0 + True + True + + + + + + + 0 + True + True + + + + True GTK_BUTTONBOX_END diff -r 60f1bc20c19c -r 15fc0d852633 src/audacious/main.c --- a/src/audacious/main.c Thu Jan 25 20:23:16 2007 -0800 +++ b/src/audacious/main.c Thu Jan 25 20:50:15 2007 -0800 @@ -213,6 +213,7 @@ TRUE, /* use extension probing */ 255, 255, 255, /* colorize r, g, b */ FALSE, /* internal: whether or not to terminate */ + TRUE, /* whether show progress bar in filepopup or not */ }; typedef struct bmp_cfg_boolent_t { @@ -314,6 +315,7 @@ {"use_file_cover", &cfg.use_file_cover, TRUE}, {"use_xmms_style_fileselector", &cfg.use_xmms_style_fileselector, TRUE}, {"use_extension_probing", &cfg.use_extension_probing, TRUE}, + {"filepopup_showprogressbar", &cfg.filepopup_showprogressbar, TRUE}, }; static gint ncfgbent = G_N_ELEMENTS(bmp_boolents); diff -r 60f1bc20c19c -r 15fc0d852633 src/audacious/main.h --- a/src/audacious/main.h Thu Jan 25 20:23:16 2007 -0800 +++ b/src/audacious/main.h Thu Jan 25 20:50:15 2007 -0800 @@ -122,6 +122,7 @@ gboolean use_extension_probing; gint colorize_r; gint colorize_g; gint colorize_b; gboolean terminate; + gboolean filepopup_showprogressbar; }; typedef struct _BmpConfig BmpConfig; diff -r 60f1bc20c19c -r 15fc0d852633 src/audacious/ui_fileinfopopup.c --- a/src/audacious/ui_fileinfopopup.c Thu Jan 25 20:23:16 2007 -0800 +++ b/src/audacious/ui_fileinfopopup.c Thu Jan 25 20:50:15 2007 -0800 @@ -281,7 +281,8 @@ if ( ( time != -1 ) && ( length != -1 ) && - ( ( current_file != NULL ) && ( !strcmp(tooltip_file,current_file) ) ) ) + ( ( current_file != NULL ) && ( !strcmp(tooltip_file,current_file) ) && + ( cfg.filepopup_showprogressbar ) ) ) { gchar *progress_time = g_strdup_printf("%d:%02d", time / 60000, (time / 1000) % 60); gtk_progress_bar_set_fraction( GTK_PROGRESS_BAR(progressbar) , (gdouble)time / (gdouble)length ); diff -r 60f1bc20c19c -r 15fc0d852633 src/audacious/ui_preferences.c --- a/src/audacious/ui_preferences.c Thu Jan 25 20:23:16 2007 -0800 +++ b/src/audacious/ui_preferences.c Thu Jan 25 20:50:15 2007 -0800 @@ -2170,6 +2170,12 @@ widget = glade_xml_get_widget(xml, "filepopup_settings_use_file_cover"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), cfg.use_file_cover); + widget = glade_xml_get_widget(xml, "filepopup_settings_showprogressbar"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), cfg.filepopup_showprogressbar); + + widget = glade_xml_get_widget(xml, "filepopup_settings_delay"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), cfg.filepopup_delay); + gtk_widget_show(filepopup_settings); } @@ -2196,6 +2202,12 @@ widget = glade_xml_get_widget(xml, "filepopup_settings_use_file_cover"); cfg.use_file_cover = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = glade_xml_get_widget(xml, "filepopup_settings_showprogressbar"); + cfg.filepopup_showprogressbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = glade_xml_get_widget(xml, "filepopup_settings_delay"); + cfg.filepopup_delay = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + gtk_widget_hide(filepopup_settings); }