# HG changeset patch # User nenolod # Date 1150433745 25200 # Node ID ccf616f86fb49bd2196107a2713d55d750946ac7 # Parent 186f774fa30b82265ebbe722be169588c097e280 [svn] some minor tweaks diff -r 186f774fa30b -r ccf616f86fb4 ChangeLog --- a/ChangeLog Thu Jun 15 21:54:44 2006 -0700 +++ b/ChangeLog Thu Jun 15 21:55:45 2006 -0700 @@ -1,3 +1,16 @@ +2006-06-16 04:54:44 +0000 William Pitcock + revision [1438] + - ui_fileinfo goodness (not hooked up yet) + + + Changes: Modified: + +1 -0 trunk/audacious/Makefile + +1 -0 trunk/audacious/glade/Makefile.in + +599 -0 trunk/audacious/glade/fileinfo.xml + +132 -0 trunk/audacious/ui_fileinfo.c + +24 -0 trunk/audacious/ui_fileinfo.h + + 2006-06-16 02:55:29 +0000 William Pitcock revision [1436] - complete tuple for AAC files (tuple->length) diff -r 186f774fa30b -r ccf616f86fb4 audacious/glade/Makefile.in --- a/audacious/glade/Makefile.in Thu Jun 15 21:54:44 2006 -0700 +++ b/audacious/glade/Makefile.in Thu Jun 15 21:55:45 2006 -0700 @@ -4,6 +4,6 @@ gladexmldir = $(pkgdatadir)/glade OBJECTIVE_DATA = \ - fileinfo.xml:$(gladexmldir) \ + fileinfo.glade:$(gladexmldir) \ prefswin.glade:$(gladexmldir) \ addfiles.glade:$(gladexmldir) diff -r 186f774fa30b -r ccf616f86fb4 audacious/glade/fileinfo.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/audacious/glade/fileinfo.glade Thu Jun 15 21:55:45 2006 -0700 @@ -0,0 +1,599 @@ + + + + + + + 6 + True + Track Information + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + True + 0.5 + 0 + 0 + 0 + + + 0 + False + False + + + + + + True + + + 12 + False + False + + + + + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + <span size="small">Title</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 6 + 0 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + False + False + + + + + + True + <span size="small">Artist</span> + 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 + 6 + 0 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + False + False + + + + + + True + <span size="small">Album</span> + 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 + 6 + 0 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + False + False + + + + + + True + <span size="small">Comment</span> + 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 + 6 + 0 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + False + False + + + + + + True + <span size="small">Genre</span> + 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 + 6 + 0 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 6 + 0 + 0 + + + + True + 2 + 2 + False + 0 + 6 + + + + True + <span size="small">Year</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + 1 + 1 + 2 + + + + + + + True + <span size="small">Track Number</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + + 0 + False + False + + + + + + True + <span size="small">Location</span> + 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 + 6 + 0 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + False + False + + + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_END + 0 + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + diff -r 186f774fa30b -r ccf616f86fb4 audacious/glade/fileinfo.xml --- a/audacious/glade/fileinfo.xml Thu Jun 15 21:54:44 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,599 +0,0 @@ - - - - - - - 6 - True - Track Information - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - - - 12 - False - False - - - - - - True - False - 0 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - <span size="small">Title</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 6 - 0 - 0 - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - False - False - - - - - - True - <span size="small">Artist</span> - 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 - 6 - 0 - 0 - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - False - False - - - - - - True - <span size="small">Album</span> - 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 - 6 - 0 - 0 - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - False - False - - - - - - True - <span size="small">Comment</span> - 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 - 6 - 0 - 0 - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - False - False - - - - - - True - <span size="small">Genre</span> - 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 - 6 - 0 - 0 - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 6 - 0 - 0 - - - - True - 2 - 2 - False - 0 - 6 - - - - True - <span size="small">Year</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - 1 - 1 - 2 - - - - - - - True - <span size="small">Track Number</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - - 0 - False - False - - - - - - True - <span size="small">Location</span> - 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 - 6 - 0 - 0 - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - False - False - - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 0 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - - diff -r 186f774fa30b -r ccf616f86fb4 audacious/ui_fileinfo.c --- a/audacious/ui_fileinfo.c Thu Jun 15 21:54:44 2006 -0700 +++ b/audacious/ui_fileinfo.c Thu Jun 15 21:55:45 2006 -0700 @@ -92,7 +92,7 @@ void create_fileinfo_window(void) { - const gchar *glade_file = DATA_DIR "/glade/fileinfo.xml"; + const gchar *glade_file = DATA_DIR "/glade/fileinfo.glade"; GladeXML *xml; GtkWidget *widget; diff -r 186f774fa30b -r ccf616f86fb4 audacious/ui_fileinfo.h --- a/audacious/ui_fileinfo.h Thu Jun 15 21:54:44 2006 -0700 +++ b/audacious/ui_fileinfo.h Thu Jun 15 21:55:45 2006 -0700 @@ -21,4 +21,6 @@ #ifndef _UI_FILEINFO_H_ #define _UI_FILEINFO_H_ +void create_fileinfo_window(void); + #endif