# HG changeset patch # User nenolod # Date 1163343304 28800 # Node ID 55b05e25d4ef483d79d99702981f24e792f1b060 # Parent b5fe3edc3facf343e57792c7e9f1b10c238c5346 [svn] - some newui stuff (and also turn it off again, giacomo will need to look at a few things) diff -r b5fe3edc3fac -r 55b05e25d4ef ChangeLog --- a/ChangeLog Sun Nov 12 06:15:11 2006 -0800 +++ b/ChangeLog Sun Nov 12 06:55:04 2006 -0800 @@ -1,3 +1,12 @@ +2006-11-12 14:15:11 +0000 William Pitcock + revision [2911] + - some code for seekbar + + trunk/audacious/mainwin.c | 2 ++ + trunk/audacious/newui/newui_window.c | 12 ++++++++++++ + 2 files changed, 14 insertions(+) + + 2006-11-12 13:49:04 +0000 William Pitcock revision [2909] - add code for the shuffle checkbox diff -r b5fe3edc3fac -r 55b05e25d4ef audacious/glade/newui.glade --- a/audacious/glade/newui.glade Sun Nov 12 06:15:11 2006 -0800 +++ b/audacious/glade/newui.glade Sun Nov 12 06:55:04 2006 -0800 @@ -97,17 +97,216 @@ - + True + 7 + 2 False - 0 + 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 + 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 - True + False GTK_JUSTIFY_LEFT False False @@ -121,421 +320,173 @@ 0 - 0 - True - False + 1 + 2 + 6 + 7 + - + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 3 - True - True + 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 - 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 - - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 3 + 4 + + + - - - 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 - - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - True - True + 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 + @@ -563,91 +514,6 @@ 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 @@ -691,7 +557,93 @@ + + 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 + False + True + + + + + True True False diff -r b5fe3edc3fac -r 55b05e25d4ef audacious/main.c --- a/audacious/main.c Sun Nov 12 06:15:11 2006 -0800 +++ b/audacious/main.c Sun Nov 12 06:55:04 2006 -0800 @@ -1134,8 +1134,8 @@ create_fileinfo_window(); create_filepopup_window(); - create_newui_window(); - show_newui_window(); +// create_newui_window(); +// show_newui_window(); if (cfg.player_visible) mainwin_show(TRUE); diff -r b5fe3edc3fac -r 55b05e25d4ef audacious/mainwin.c --- a/audacious/mainwin.c Sun Nov 12 06:15:11 2006 -0800 +++ b/audacious/mainwin.c Sun Nov 12 06:55:04 2006 -0800 @@ -3770,7 +3770,7 @@ playlistwin_hide_timer(); input_update_vis(time); - newui_set_time(time, length); +// newui_set_time(time, length); if (cfg.timer_mode == TIMER_REMAINING) { if (length != -1) { diff -r b5fe3edc3fac -r 55b05e25d4ef audacious/newui/newui_window.c --- a/audacious/newui/newui_window.c Sun Nov 12 06:15:11 2006 -0800 +++ b/audacious/newui/newui_window.c Sun Nov 12 06:55:04 2006 -0800 @@ -136,14 +136,15 @@ static gchar *last_artwork = NULL; gchar *fullpath; - widget = glade_xml_get_widget(xml, "newui_titlestring"); - tmp = g_strdup_printf("%s", entry->title); + if (entry->tuple == NULL) + return; + + widget = glade_xml_get_widget(xml, "newui_playstatus"); + tmp = g_strdup_printf("%s from %s by %s", entry->tuple->track_name, + entry->tuple->album_name, entry->tuple->performer); gtk_label_set_markup(GTK_LABEL(widget), tmp); g_free(tmp); - if (entry->tuple == NULL) - return; - widget = glade_xml_get_widget(xml, "newui_label_title"); gtk_label_set_text(GTK_LABEL(widget), entry->tuple->track_name); diff -r b5fe3edc3fac -r 55b05e25d4ef audacious/playlist.c --- a/audacious/playlist.c Sun Nov 12 06:15:11 2006 -0800 +++ b/audacious/playlist.c Sun Nov 12 06:55:04 2006 -0800 @@ -849,7 +849,7 @@ playlist_recalc_total_time(); mainwin_set_song_info(rate, freq, nch); - newui_update_nowplaying_from_entry(playlist_position); +// newui_update_nowplaying_from_entry(playlist_position); } void