# HG changeset patch # User yaz # Date 1151575047 25200 # Node ID 0c41255487ee870e43641b1320366f31a47f492c # Parent 0675e21d50ea72f766cfa2e732dde077cde13da7 [svn] - add toggle option for filepopup window diff -r 0675e21d50ea -r 0c41255487ee ChangeLog --- a/ChangeLog Thu Jun 29 00:38:22 2006 -0700 +++ b/ChangeLog Thu Jun 29 02:57:27 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-29 07:38:22 +0000 Yoshiki Yazawa + revision [1626] + - m3u file should be written in locale encoding. + + + Changes: Modified: + +9 -1 trunk/audacious/playlist.c + + 2006-06-29 02:24:02 +0000 William Pitcock revision [1624] - hookup tuple->formatter diff -r 0675e21d50ea -r 0c41255487ee audacious/glade/prefswin.glade --- a/audacious/glade/prefswin.glade Thu Jun 29 00:38:22 2006 -0700 +++ b/audacious/glade/prefswin.glade Thu Jun 29 02:57:27 2006 -0700 @@ -2298,6 +2298,83 @@ False + + + + True + 0.5 + 0.5 + 1 + 1 + 12 + 12 + 0 + 0 + + + + True + <b>Popup Information</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + Toggles popup information window for the pointed song in the playlist. The window shows title of song, name of album, genre, year of publish, track number, track length, and artwork. + True + Show popup information for song + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + + + + + 0 + False + False + + 0 diff -r 0675e21d50ea -r 0c41255487ee audacious/main.c --- a/audacious/main.c Thu Jun 29 00:38:22 2006 -0700 +++ b/audacious/main.c Thu Jun 29 02:57:27 2006 -0700 @@ -202,6 +202,7 @@ NULL, 3000, /* audio buffer size */ FALSE, /* whether or not to postpone format detection on initial add */ + TRUE, /* show filepopup for tuple */ }; typedef struct bmp_cfg_boolent_t { @@ -293,6 +294,7 @@ {"close_dialog_add", &cfg.close_dialog_add, TRUE}, {"resume_playback_on_startup", &cfg.resume_playback_on_startup, TRUE}, {"playlist_detect", &cfg.playlist_detect, TRUE}, + {"show_filepopup_for_tuple", &cfg.show_filepopup_for_tuple, TRUE}, }; static gint ncfgbent = G_N_ELEMENTS(bmp_boolents); diff -r 0675e21d50ea -r 0c41255487ee audacious/main.h --- a/audacious/main.h Thu Jun 29 00:38:22 2006 -0700 +++ b/audacious/main.h Thu Jun 29 02:57:27 2006 -0700 @@ -111,6 +111,7 @@ gchar *chardet_fallback; gint output_buffer_size; gboolean playlist_detect; + gboolean show_filepopup_for_tuple; }; typedef struct _BmpConfig BmpConfig; diff -r 0675e21d50ea -r 0c41255487ee audacious/prefswin.c --- a/audacious/prefswin.c Thu Jun 29 00:38:22 2006 -0700 +++ b/audacious/prefswin.c Thu Jun 29 02:57:27 2006 -0700 @@ -1996,6 +1996,18 @@ bmp_cfg_db_close(db); } +static void +on_show_filepopup_for_tuple_realize(GtkToggleButton * button, gpointer data) +{ + gtk_toggle_button_set_active(button, cfg.show_filepopup_for_tuple); +} + +static void +on_show_filepopup_for_tuple_toggled(GtkToggleButton * button, gpointer data) +{ + cfg.show_filepopup_for_tuple = gtk_toggle_button_get_active(button); +} + /* FIXME: complete the map */ FUNC_MAP_BEGIN(prefswin_func_map) FUNC_MAP_ENTRY(on_input_plugin_view_realize) @@ -2066,6 +2078,8 @@ FUNC_MAP_ENTRY(on_output_plugin_bufsize_value_changed) FUNC_MAP_ENTRY(on_audio_format_det_cb_toggled) 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_END void diff -r 0675e21d50ea -r 0c41255487ee audacious/ui_fileinfo.c --- a/audacious/ui_fileinfo.c Thu Jun 29 00:38:22 2006 -0700 +++ b/audacious/ui_fileinfo.c Thu Jun 29 02:57:27 2006 -0700 @@ -215,7 +215,9 @@ } tuple = playlist_get_tuple(pos); - filepopup_show_for_tuple(tuple); + if(cfg.show_filepopup_for_tuple){ + filepopup_show_for_tuple(tuple); + } } return TRUE;