# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1216286410 18000
# Node ID 65d67970fab753c8d447a4bbfd7fe3abbdeecccf
# Parent  c435303705087bc52465202d0d094699c64bab30
Move the slider bar to the toolbar, but this is kinda ugly at the moment.

diff -r c43530370508 -r 65d67970fab7 src/audacious/ui_new.c
--- a/src/audacious/ui_new.c	Thu Jul 17 03:40:05 2008 -0500
+++ b/src/audacious/ui_new.c	Thu Jul 17 04:20:10 2008 -0500
@@ -290,6 +290,8 @@
 
     GtkWidget *scrollwin;   /* widget to hold playlist widget */
 
+    GtkWidget *paned;
+
     GtkToolItem *button_open, *button_add,
                 *button_play, *button_pause, *button_stop,
                 *button_previous, *button_next;
@@ -306,6 +308,9 @@
     gtk_container_add(GTK_CONTAINER(window), vbox);
 
 
+    paned = gtk_hpaned_new();
+    gtk_box_pack_start(GTK_BOX(vbox), paned, FALSE, TRUE, 0);
+
     toolbar = gtk_toolbar_new();
     gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
     button_open = gtk_toolbar_button_add(toolbar, button_open_pressed,
@@ -322,8 +327,20 @@
                                              GTK_STOCK_MEDIA_PREVIOUS);
     button_next = gtk_toolbar_button_add(toolbar, button_next_pressed,
                                          GTK_STOCK_MEDIA_NEXT);
-    gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, TRUE, 0);
+
+    gtk_paned_pack1(GTK_PANED(paned), toolbar, TRUE, TRUE);
+
+    shbox = gtk_hbox_new(FALSE, 0);
+    gtk_paned_add2(GTK_PANED(paned), shbox);
 
+    slider = gtk_hscale_new(NULL);
+    gtk_scale_set_draw_value(GTK_SCALE(slider), FALSE);
+    /* TODO: make this configureable */
+    gtk_range_set_update_policy(GTK_RANGE(slider), GTK_UPDATE_DISCONTINUOUS);
+    gtk_box_pack_start(GTK_BOX(shbox), slider, TRUE, TRUE, 0);
+
+    label_time = gtk_markup_label_new(NULL);
+    gtk_box_pack_start(GTK_BOX(shbox), label_time, FALSE, FALSE, 0);
 
     pcnbox = gtk_vbox_new(FALSE, 0);
 
@@ -344,18 +361,6 @@
 
     gtk_box_pack_start(GTK_BOX(vbox), pcnbox, FALSE, TRUE, 0);
 
-    shbox = gtk_hbox_new(FALSE, 0);
-    gtk_box_pack_end(GTK_BOX(cvbox), shbox, TRUE, TRUE, 0);
-
-    slider = gtk_hscale_new(NULL);
-    gtk_scale_set_draw_value(GTK_SCALE(slider), FALSE);
-    /* TODO: make this configureable */
-    gtk_range_set_update_policy(GTK_RANGE(slider), GTK_UPDATE_DISCONTINUOUS);
-    gtk_box_pack_start(GTK_BOX(shbox), slider, TRUE, TRUE, 0);
-
-    label_time = gtk_markup_label_new(NULL);
-    gtk_box_pack_start(GTK_BOX(shbox), label_time, FALSE, FALSE, 0);
-
     treeview = ui_playlist_widget_new();
     scrollwin = gtk_scrolled_window_new(NULL, NULL);
     gtk_container_add(GTK_CONTAINER(scrollwin), treeview);