# HG changeset patch # User nenolod # Date 1150618315 25200 # Node ID e778f43a74fbf638249621656a5012dae8980740 # Parent f8c976466f6077895fb92b098e92f1e8ab8636a2 [svn] - make tuples more verbose (they might be a bit big though) diff -r f8c976466f60 -r e778f43a74fb ChangeLog --- a/ChangeLog Sun Jun 18 00:55:01 2006 -0700 +++ b/ChangeLog Sun Jun 18 01:11:55 2006 -0700 @@ -1,3 +1,14 @@ +2006-06-18 07:55:01 +0000 William Pitcock + revision [1484] + - proper X11 way of fixing this + + + Changes: Modified: + +1 -0 trunk/audacious/playlist_list.h + +3 -3 trunk/audacious/ui_fileinfo.c + +21 -1 trunk/audacious/ui_playlist.c + + 2006-06-18 07:40:44 +0000 William Pitcock revision [1482] - complete fix diff -r f8c976466f60 -r e778f43a74fb audacious/glade/fileinfo_popup.glade --- a/audacious/glade/fileinfo_popup.glade Sun Jun 18 00:55:01 2006 -0700 +++ b/audacious/glade/fileinfo_popup.glade Sun Jun 18 01:11:55 2006 -0700 @@ -20,179 +20,442 @@ False - + True - 3 - 2 False - 3 - 3 + 0 - + True - Title - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 + 0.5 + 0 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - Artist - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 1 - 2 - fill - + 6 + False + False - + True - Album - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - + 7 + 2 + False + 6 + 6 + + + + True + Title + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Artist + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Album + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + fill + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + Genre + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + Year + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + Track Number + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 5 + 6 + fill + + + + + + + True + Location + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 6 + 7 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 4 + 5 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 5 + 6 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 6 + 7 + fill + + + - 1 - 2 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - + 0 + True + True diff -r f8c976466f60 -r e778f43a74fb audacious/ui_fileinfo.c --- a/audacious/ui_fileinfo.c Sun Jun 18 00:55:01 2006 -0700 +++ b/audacious/ui_fileinfo.c Sun Jun 18 01:11:55 2006 -0700 @@ -105,7 +105,6 @@ gtk_label_set_text(GTK_LABEL(widget), text); } -#if 0 static void filepopup_entry_set_text_free(const char *entry, char *text) { @@ -119,7 +118,6 @@ g_free(text); } -#endif static gboolean filepopup_pointer_check_iter(gpointer unused) @@ -218,9 +216,8 @@ { const gchar *glade_file = DATA_DIR "/glade/fileinfo_popup.glade"; GladeXML *xml; -#if 0 GtkWidget *widget; -#endif + xml = glade_xml_new_or_die(_("Track Information Popup"), glade_file, NULL, NULL); glade_xml_signal_autoconnect(xml); @@ -229,10 +226,8 @@ g_object_set_data(G_OBJECT(filepopup_win), "glade-xml", xml); gtk_window_set_transient_for(GTK_WINDOW(filepopup_win), GTK_WINDOW(mainwin)); -#if 0 widget = glade_xml_get_widget(xml, "image_artwork"); gtk_image_set_from_file(GTK_IMAGE(widget), DATA_DIR "/images/audio.png"); -#endif g_timeout_add(50, filepopup_pointer_check_iter, NULL); } @@ -272,6 +267,14 @@ filepopup_entry_set_text("label_title", tuple->track_name); filepopup_entry_set_text("label_artist", tuple->performer); filepopup_entry_set_text("label_album", tuple->album_name); + filepopup_entry_set_text("label_genre", tuple->genre); + filepopup_entry_set_text_free("label_location", g_strdup_printf("%s/%s", tuple->file_path, tuple->file_name)); + + if (tuple->year != 0) + filepopup_entry_set_text_free("label_year", g_strdup_printf("%d", tuple->year)); + + if (tuple->track_number != 0) + filepopup_entry_set_text_free("label_track", g_strdup_printf("%d", tuple->track_number)); gtk_widget_show(filepopup_win); }