# HG changeset patch # User nenolod # Date 1163338684 28800 # Node ID b17f7a09fdd37464dc51e771107713b5e1b7b33f # Parent f027afc2ca2ef5d1888a9baeaf2108eeab3a547e [svn] - add some more controls (seekbar and such) diff -r f027afc2ca2e -r b17f7a09fdd3 ChangeLog --- a/ChangeLog Sun Nov 12 03:09:28 2006 -0800 +++ b/ChangeLog Sun Nov 12 05:38:04 2006 -0800 @@ -1,3 +1,16 @@ +2006-11-12 11:09:28 +0000 William Pitcock + revision [2903] + - avoid freeing a NULL pointer in ui_fileinfo.c + - add some hooks for newui + - implement album art support in newui + + trunk/audacious/glade/newui.glade | 14 ++-- + trunk/audacious/newui/newui_window.c | 100 +++++++++++++++++++++++++++++++++++ + trunk/audacious/playlist.c | 3 + + trunk/audacious/ui_fileinfo.c | 7 +- + 4 files changed, 115 insertions(+), 9 deletions(-) + + 2006-11-12 10:37:32 +0000 William Pitcock revision [2901] - show_newui_window() implementation diff -r f027afc2ca2e -r b17f7a09fdd3 audacious/glade/newui.glade --- a/audacious/glade/newui.glade Sun Nov 12 03:09:28 2006 -0800 +++ b/audacious/glade/newui.glade Sun Nov 12 05:38:04 2006 -0800 @@ -59,71 +59,24 @@ True - + True False 0 - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - - - 6 - False - True - - - - - + True False 0 - + True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0 + 0.5 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - False - - - - - - True 0 @@ -133,216 +86,28 @@ - + True - 7 - 2 - False - 3 - 3 - - - - True - Title - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - + + + 6 + False + True + + - - - True - Artist - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Album - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - + + + True + False + 0 - - True - Genre - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Year - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 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 - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - Track Length - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - + True False - False + True GTK_JUSTIFY_LEFT False False @@ -356,173 +121,421 @@ 0 - 1 - 2 - 6 - 7 - + 0 + True + False - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 1 - 2 - 5 - 6 - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 4 - 5 - + 3 + True + True - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 3 - 4 - - - + 7 + 2 + False + 3 + 3 + + + + True + Title + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Artist + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Album + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Genre + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + Year + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 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 + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 5 + 6 + fill + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + Track Length + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 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 + 6 + 7 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 5 + 6 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 4 + 5 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 3 + 4 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + + + - 1 - 2 - 2 - 3 - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - + 0 + True + True @@ -539,6 +552,102 @@ True + + + + True + + + 3 + True + True + + + + + + True + False + 0 + + + + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 0 0 0 0 0 0 + + + + 3 + True + True + + + + + + True + + + 6 + False + False + + + + + + 3 + True + True + Shuffle + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + + 3 + True + True + Repeat + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + True @@ -557,7 +666,6 @@ - True True True False @@ -584,7 +692,6 @@ - True True False