changed buttons to use stock icons

moved seekbar to occupy all free space in toolbar

2 files changed, 59 insertions, 100 deletions

diff --git a/deadbeef.glade b/deadbeef.glade
index 54659fa4..b48af591 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -503,9 +503,10 @@
 		  <accelerator key="v" modifiers="0" signal="activate"/>
 
 		  <child>
-		    <widget class="GtkImage" id="image7">
+		    <widget class="GtkImage" id="image128">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">stop_24.png</property>
+		      <property name="stock">gtk-media-stop</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -532,7 +533,8 @@
 		  <child>
 		    <widget class="GtkImage" id="image2">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">play_24.png</property>
+		      <property name="stock">gtk-media-play</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -559,7 +561,8 @@
 		  <child>
 		    <widget class="GtkImage" id="image3">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">pause_24.png</property>
+		      <property name="stock">gtk-media-pause</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -585,7 +588,8 @@
 		  <child>
 		    <widget class="GtkImage" id="image4">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">prev_24.png</property>
+		      <property name="stock">gtk-media-previous</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -611,33 +615,8 @@
 		  <child>
 		    <widget class="GtkImage" id="image5">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">next_24.png</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="playrand">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_playrand_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:16 GMT"/>
-		  <accelerator key="n" modifiers="0" signal="activate"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image6">
-		      <property name="visible">True</property>
-		      <property name="pixbuf">random_24.png</property>
+		      <property name="stock">gtk-media-next</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -654,40 +633,40 @@
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
+	      <property name="expand">False</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkDrawingArea" id="volumebar">
-	      <property name="width_request">70</property>
+	    <widget class="GtkDrawingArea" id="seekbar">
+	      <property name="width_request">200</property>
 	      <property name="visible">True</property>
 	      <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-	      <signal name="button_press_event" handler="on_volumebar_button_press_event" last_modification_time="Tue, 11 Aug 2009 18:57:49 GMT"/>
-	      <signal name="button_release_event" handler="on_volumebar_button_release_event" last_modification_time="Tue, 11 Aug 2009 18:57:51 GMT"/>
-	      <signal name="configure_event" handler="on_volumebar_configure_event" last_modification_time="Tue, 11 Aug 2009 18:57:55 GMT"/>
-	      <signal name="expose_event" handler="on_volumebar_expose_event" last_modification_time="Tue, 11 Aug 2009 18:58:00 GMT"/>
-	      <signal name="motion_notify_event" handler="on_volumebar_motion_notify_event" last_modification_time="Tue, 11 Aug 2009 18:58:05 GMT"/>
-	      <signal name="scroll_event" handler="on_volumebar_scroll_event" last_modification_time="Tue, 18 Aug 2009 18:44:31 GMT"/>
+	      <signal name="button_press_event" handler="on_seekbar_button_press_event" last_modification_time="Tue, 11 Aug 2009 17:47:59 GMT"/>
+	      <signal name="button_release_event" handler="on_seekbar_button_release_event" last_modification_time="Tue, 11 Aug 2009 17:48:02 GMT"/>
+	      <signal name="configure_event" handler="on_seekbar_configure_event" last_modification_time="Tue, 11 Aug 2009 17:48:06 GMT"/>
+	      <signal name="expose_event" handler="on_seekbar_expose_event" last_modification_time="Tue, 11 Aug 2009 17:48:11 GMT"/>
+	      <signal name="motion_notify_event" handler="on_seekbar_motion_notify_event" last_modification_time="Tue, 11 Aug 2009 17:48:18 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="padding">2</property>
-	      <property name="expand">False</property>
+	      <property name="expand">True</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkDrawingArea" id="seekbar">
-	      <property name="width_request">200</property>
+	    <widget class="GtkDrawingArea" id="volumebar">
+	      <property name="width_request">70</property>
 	      <property name="visible">True</property>
 	      <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-	      <signal name="button_press_event" handler="on_seekbar_button_press_event" last_modification_time="Tue, 11 Aug 2009 17:47:59 GMT"/>
-	      <signal name="button_release_event" handler="on_seekbar_button_release_event" last_modification_time="Tue, 11 Aug 2009 17:48:02 GMT"/>
-	      <signal name="configure_event" handler="on_seekbar_configure_event" last_modification_time="Tue, 11 Aug 2009 17:48:06 GMT"/>
-	      <signal name="expose_event" handler="on_seekbar_expose_event" last_modification_time="Tue, 11 Aug 2009 17:48:11 GMT"/>
-	      <signal name="motion_notify_event" handler="on_seekbar_motion_notify_event" last_modification_time="Tue, 11 Aug 2009 17:48:18 GMT"/>
+	      <signal name="button_press_event" handler="on_volumebar_button_press_event" last_modification_time="Tue, 11 Aug 2009 18:57:49 GMT"/>
+	      <signal name="button_release_event" handler="on_volumebar_button_release_event" last_modification_time="Tue, 11 Aug 2009 18:57:51 GMT"/>
+	      <signal name="configure_event" handler="on_volumebar_configure_event" last_modification_time="Tue, 11 Aug 2009 18:57:55 GMT"/>
+	      <signal name="expose_event" handler="on_volumebar_expose_event" last_modification_time="Tue, 11 Aug 2009 18:58:00 GMT"/>
+	      <signal name="motion_notify_event" handler="on_volumebar_motion_notify_event" last_modification_time="Tue, 11 Aug 2009 18:58:05 GMT"/>
+	      <signal name="scroll_event" handler="on_volumebar_scroll_event" last_modification_time="Tue, 18 Aug 2009 18:44:31 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="padding">2</property>
diff --git a/interface.c b/interface.c
index fdf498ed..5c674a58 100644
--- a/interface.c
+++ b/interface.c
@@ -86,7 +86,7 @@ create_mainwin (void)
   GtkWidget *hbox2;
   GtkWidget *hbox3;
   GtkWidget *stopbtn;
-  GtkWidget *image7;
+  GtkWidget *image128;
   GtkWidget *playbtn;
   GtkWidget *image2;
   GtkWidget *pausebtn;
@@ -95,10 +95,8 @@ create_mainwin (void)
   GtkWidget *image4;
   GtkWidget *nextbtn;
   GtkWidget *image5;
-  GtkWidget *playrand;
-  GtkWidget *image6;
-  GtkWidget *volumebar;
   GtkWidget *seekbar;
+  GtkWidget *volumebar;
   GtkWidget *frame1;
   GtkWidget *table1;
   GtkWidget *_;
@@ -351,7 +349,7 @@ create_mainwin (void)
 
   hbox3 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox3, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, TRUE, 0);
 
   stopbtn = gtk_button_new ();
   gtk_widget_show (stopbtn);
@@ -362,9 +360,9 @@ create_mainwin (void)
                               GTK_ACCEL_VISIBLE);
   gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
 
-  image7 = create_pixmap (mainwin, "stop_24.png");
-  gtk_widget_show (image7);
-  gtk_container_add (GTK_CONTAINER (stopbtn), image7);
+  image128 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_show (image128);
+  gtk_container_add (GTK_CONTAINER (stopbtn), image128);
 
   playbtn = gtk_button_new ();
   gtk_widget_show (playbtn);
@@ -378,7 +376,7 @@ create_mainwin (void)
                               GTK_ACCEL_VISIBLE);
   gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE);
 
-  image2 = create_pixmap (mainwin, "play_24.png");
+  image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
   gtk_widget_show (image2);
   gtk_container_add (GTK_CONTAINER (playbtn), image2);
 
@@ -394,7 +392,7 @@ create_mainwin (void)
                               GTK_ACCEL_VISIBLE);
   gtk_button_set_relief (GTK_BUTTON (pausebtn), GTK_RELIEF_NONE);
 
-  image3 = create_pixmap (mainwin, "pause_24.png");
+  image3 = gtk_image_new_from_stock ("gtk-media-pause", GTK_ICON_SIZE_BUTTON);
   gtk_widget_show (image3);
   gtk_container_add (GTK_CONTAINER (pausebtn), image3);
 
@@ -407,7 +405,7 @@ create_mainwin (void)
                               GTK_ACCEL_VISIBLE);
   gtk_button_set_relief (GTK_BUTTON (prevbtn), GTK_RELIEF_NONE);
 
-  image4 = create_pixmap (mainwin, "prev_24.png");
+  image4 = gtk_image_new_from_stock ("gtk-media-previous", GTK_ICON_SIZE_BUTTON);
   gtk_widget_show (image4);
   gtk_container_add (GTK_CONTAINER (prevbtn), image4);
 
@@ -420,22 +418,15 @@ create_mainwin (void)
                               GTK_ACCEL_VISIBLE);
   gtk_button_set_relief (GTK_BUTTON (nextbtn), GTK_RELIEF_NONE);
 
-  image5 = create_pixmap (mainwin, "next_24.png");
+  image5 = gtk_image_new_from_stock ("gtk-media-next", GTK_ICON_SIZE_BUTTON);
   gtk_widget_show (image5);
   gtk_container_add (GTK_CONTAINER (nextbtn), image5);
 
-  playrand = gtk_button_new ();
-  gtk_widget_show (playrand);
-  gtk_box_pack_start (GTK_BOX (hbox3), playrand, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (playrand, GTK_CAN_FOCUS);
-  gtk_widget_add_accelerator (playrand, "activate", accel_group,
-                              GDK_n, (GdkModifierType) 0,
-                              GTK_ACCEL_VISIBLE);
-  gtk_button_set_relief (GTK_BUTTON (playrand), GTK_RELIEF_NONE);
-
-  image6 = create_pixmap (mainwin, "random_24.png");
-  gtk_widget_show (image6);
-  gtk_container_add (GTK_CONTAINER (playrand), image6);
+  seekbar = gtk_drawing_area_new ();
+  gtk_widget_show (seekbar);
+  gtk_box_pack_start (GTK_BOX (hbox2), seekbar, TRUE, TRUE, 2);
+  gtk_widget_set_size_request (seekbar, 200, -1);
+  gtk_widget_set_events (seekbar, GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 
   volumebar = gtk_drawing_area_new ();
   gtk_widget_show (volumebar);
@@ -443,12 +434,6 @@ create_mainwin (void)
   gtk_widget_set_size_request (volumebar, 70, -1);
   gtk_widget_set_events (volumebar, GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 
-  seekbar = gtk_drawing_area_new ();
-  gtk_widget_show (seekbar);
-  gtk_box_pack_start (GTK_BOX (hbox2), seekbar, FALSE, TRUE, 2);
-  gtk_widget_set_size_request (seekbar, 200, -1);
-  gtk_widget_set_events (seekbar, GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-
   frame1 = gtk_frame_new (NULL);
   gtk_widget_show (frame1);
   gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
@@ -591,8 +576,20 @@ create_mainwin (void)
   g_signal_connect ((gpointer) nextbtn, "clicked",
                     G_CALLBACK (on_nextbtn_clicked),
                     NULL);
-  g_signal_connect ((gpointer) playrand, "clicked",
-                    G_CALLBACK (on_playrand_clicked),
+  g_signal_connect ((gpointer) seekbar, "button_press_event",
+                    G_CALLBACK (on_seekbar_button_press_event),
+                    NULL);
+  g_signal_connect ((gpointer) seekbar, "button_release_event",
+                    G_CALLBACK (on_seekbar_button_release_event),
+                    NULL);
+  g_signal_connect ((gpointer) seekbar, "configure_event",
+                    G_CALLBACK (on_seekbar_configure_event),
+                    NULL);
+  g_signal_connect ((gpointer) seekbar, "expose_event",
+                    G_CALLBACK (on_seekbar_expose_event),
+                    NULL);
+  g_signal_connect ((gpointer) seekbar, "motion_notify_event",
+                    G_CALLBACK (on_seekbar_motion_notify_event),
                     NULL);
   g_signal_connect ((gpointer) volumebar, "button_press_event",
                     G_CALLBACK (on_volumebar_button_press_event),
@@ -612,21 +609,6 @@ create_mainwin (void)
   g_signal_connect ((gpointer) volumebar, "scroll_event",
                     G_CALLBACK (on_volumebar_scroll_event),
                     NULL);
-  g_signal_connect ((gpointer) seekbar, "button_press_event",
-                    G_CALLBACK (on_seekbar_button_press_event),
-                    NULL);
-  g_signal_connect ((gpointer) seekbar, "button_release_event",
-                    G_CALLBACK (on_seekbar_button_release_event),
-                    NULL);
-  g_signal_connect ((gpointer) seekbar, "configure_event",
-                    G_CALLBACK (on_seekbar_configure_event),
-                    NULL);
-  g_signal_connect ((gpointer) seekbar, "expose_event",
-                    G_CALLBACK (on_seekbar_expose_event),
-                    NULL);
-  g_signal_connect ((gpointer) seekbar, "motion_notify_event",
-                    G_CALLBACK (on_seekbar_motion_notify_event),
-                    NULL);
   g_signal_connect ((gpointer) header, "expose_event",
                     G_CALLBACK (on_header_expose_event),
                     NULL);
@@ -756,7 +738,7 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2");
   GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3");
   GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image7, "image7");
+  GLADE_HOOKUP_OBJECT (mainwin, image128, "image128");
   GLADE_HOOKUP_OBJECT (mainwin, playbtn, "playbtn");
   GLADE_HOOKUP_OBJECT (mainwin, image2, "image2");
   GLADE_HOOKUP_OBJECT (mainwin, pausebtn, "pausebtn");
@@ -765,10 +747,8 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, image4, "image4");
   GLADE_HOOKUP_OBJECT (mainwin, nextbtn, "nextbtn");
   GLADE_HOOKUP_OBJECT (mainwin, image5, "image5");
-  GLADE_HOOKUP_OBJECT (mainwin, playrand, "playrand");
-  GLADE_HOOKUP_OBJECT (mainwin, image6, "image6");
-  GLADE_HOOKUP_OBJECT (mainwin, volumebar, "volumebar");
   GLADE_HOOKUP_OBJECT (mainwin, seekbar, "seekbar");
+  GLADE_HOOKUP_OBJECT (mainwin, volumebar, "volumebar");
   GLADE_HOOKUP_OBJECT (mainwin, frame1, "frame1");
   GLADE_HOOKUP_OBJECT (mainwin, table1, "table1");
   GLADE_HOOKUP_OBJECT (mainwin, _, "_");