added placeholders button images

10 files changed, 25 insertions, 92 deletions

diff --git a/deadbeef.glade b/deadbeef.glade
index f0e12741..d307a394 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -14,6 +14,7 @@
   <property name="default_height">650</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">play_24.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -355,8 +356,7 @@
 		  <child>
 		    <widget class="GtkImage" id="image1">
 		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-stop</property>
-		      <property name="icon_size">4</property>
+		      <property name="pixbuf">stop_24.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -381,8 +381,7 @@
 		  <child>
 		    <widget class="GtkImage" id="image2">
 		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-play</property>
-		      <property name="icon_size">4</property>
+		      <property name="pixbuf">play_24.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -407,8 +406,7 @@
 		  <child>
 		    <widget class="GtkImage" id="image3">
 		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-pause</property>
-		      <property name="icon_size">4</property>
+		      <property name="pixbuf">pause_24.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -433,8 +431,7 @@
 		  <child>
 		    <widget class="GtkImage" id="image4">
 		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-previous</property>
-		      <property name="icon_size">4</property>
+		      <property name="pixbuf">prev_24.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -459,8 +456,7 @@
 		  <child>
 		    <widget class="GtkImage" id="image5">
 		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-next</property>
-		      <property name="icon_size">4</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>
@@ -483,66 +479,13 @@
 		  <signal name="clicked" handler="on_playrand_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:16 GMT"/>
 
 		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
+		    <widget class="GtkImage" id="image6">
 		      <property name="visible">True</property>
+		      <property name="pixbuf">random_24.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox4">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image6">
-			      <property name="visible">True</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>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">?</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
 		    </widget>
 		  </child>
 		</widget>
diff --git a/images/icons_24.png b/images/icons_24.png
new file mode 100644
index 00000000..0b50c06f
--- /dev/null
+++ b/images/icons_24.png
diff --git a/images/next_24.png b/images/next_24.png
new file mode 100644
index 00000000..49cf69d8
--- /dev/null
+++ b/images/next_24.png
diff --git a/images/pause_24.png b/images/pause_24.png
new file mode 100644
index 00000000..061be624
--- /dev/null
+++ b/images/pause_24.png
diff --git a/images/play_24.png b/images/play_24.png
new file mode 100644
index 00000000..00d4d8fd
--- /dev/null
+++ b/images/play_24.png
diff --git a/images/prev_24.png b/images/prev_24.png
new file mode 100644
index 00000000..a0917d61
--- /dev/null
+++ b/images/prev_24.png
diff --git a/images/random_24.png b/images/random_24.png
new file mode 100644
index 00000000..9d7e2293
--- /dev/null
+++ b/images/random_24.png
diff --git a/images/stop_24.png b/images/stop_24.png
new file mode 100644
index 00000000..3dc6b8fc
--- /dev/null
+++ b/images/stop_24.png
diff --git a/interface.c b/interface.c
index b3dad19d..fbd52830 100644
--- a/interface.c
+++ b/interface.c
@@ -30,6 +30,7 @@ GtkWidget*
 create_mainwin (void)
 {
   GtkWidget *mainwin;
+  GdkPixbuf *mainwin_icon_pixbuf;
   GtkWidget *vbox1;
   GtkWidget *hbox2;
   GtkWidget *menubar1;
@@ -83,10 +84,7 @@ create_mainwin (void)
   GtkWidget *nextbtn;
   GtkWidget *image5;
   GtkWidget *playrand;
-  GtkWidget *alignment1;
-  GtkWidget *hbox4;
   GtkWidget *image6;
-  GtkWidget *label3;
   GtkWidget *vbox2;
   GtkWidget *volume;
   GtkWidget *hbox5;
@@ -110,6 +108,12 @@ create_mainwin (void)
   gtk_widget_set_events (mainwin, GDK_KEY_PRESS_MASK);
   gtk_window_set_title (GTK_WINDOW (mainwin), "DeaDBeeF");
   gtk_window_set_default_size (GTK_WINDOW (mainwin), 750, 650);
+  mainwin_icon_pixbuf = create_pixbuf ("play_24.png");
+  if (mainwin_icon_pixbuf)
+    {
+      gtk_window_set_icon (GTK_WINDOW (mainwin), mainwin_icon_pixbuf);
+      gdk_pixbuf_unref (mainwin_icon_pixbuf);
+    }
 
   vbox1 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox1);
@@ -285,7 +289,7 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (stopbtn, GTK_CAN_FOCUS);
   gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
 
-  image1 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
+  image1 = create_pixmap (mainwin, "stop_24.png");
   gtk_widget_show (image1);
   gtk_container_add (GTK_CONTAINER (stopbtn), image1);
 
@@ -295,7 +299,7 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (playbtn, GTK_CAN_FOCUS);
   gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE);
 
-  image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
+  image2 = create_pixmap (mainwin, "play_24.png");
   gtk_widget_show (image2);
   gtk_container_add (GTK_CONTAINER (playbtn), image2);
 
@@ -305,7 +309,7 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (pausebtn, GTK_CAN_FOCUS);
   gtk_button_set_relief (GTK_BUTTON (pausebtn), GTK_RELIEF_NONE);
 
-  image3 = gtk_image_new_from_stock ("gtk-media-pause", GTK_ICON_SIZE_BUTTON);
+  image3 = create_pixmap (mainwin, "pause_24.png");
   gtk_widget_show (image3);
   gtk_container_add (GTK_CONTAINER (pausebtn), image3);
 
@@ -315,7 +319,7 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (prevbtn, GTK_CAN_FOCUS);
   gtk_button_set_relief (GTK_BUTTON (prevbtn), GTK_RELIEF_NONE);
 
-  image4 = gtk_image_new_from_stock ("gtk-media-previous", GTK_ICON_SIZE_BUTTON);
+  image4 = create_pixmap (mainwin, "prev_24.png");
   gtk_widget_show (image4);
   gtk_container_add (GTK_CONTAINER (prevbtn), image4);
 
@@ -325,7 +329,7 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (nextbtn, GTK_CAN_FOCUS);
   gtk_button_set_relief (GTK_BUTTON (nextbtn), GTK_RELIEF_NONE);
 
-  image5 = gtk_image_new_from_stock ("gtk-media-next", GTK_ICON_SIZE_BUTTON);
+  image5 = create_pixmap (mainwin, "next_24.png");
   gtk_widget_show (image5);
   gtk_container_add (GTK_CONTAINER (nextbtn), image5);
 
@@ -335,21 +339,9 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (playrand, GTK_CAN_FOCUS);
   gtk_button_set_relief (GTK_BUTTON (playrand), GTK_RELIEF_NONE);
 
-  alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment1);
-  gtk_container_add (GTK_CONTAINER (playrand), alignment1);
-
-  hbox4 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox4);
-  gtk_container_add (GTK_CONTAINER (alignment1), hbox4);
-
-  image6 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
+  image6 = create_pixmap (mainwin, "random_24.png");
   gtk_widget_show (image6);
-  gtk_box_pack_start (GTK_BOX (hbox4), image6, FALSE, FALSE, 0);
-
-  label3 = gtk_label_new_with_mnemonic ("?");
-  gtk_widget_show (label3);
-  gtk_box_pack_start (GTK_BOX (hbox4), label3, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (playrand), image6);
 
   vbox2 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox2);
@@ -657,10 +649,7 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, nextbtn, "nextbtn");
   GLADE_HOOKUP_OBJECT (mainwin, image5, "image5");
   GLADE_HOOKUP_OBJECT (mainwin, playrand, "playrand");
-  GLADE_HOOKUP_OBJECT (mainwin, alignment1, "alignment1");
-  GLADE_HOOKUP_OBJECT (mainwin, hbox4, "hbox4");
   GLADE_HOOKUP_OBJECT (mainwin, image6, "image6");
-  GLADE_HOOKUP_OBJECT (mainwin, label3, "label3");
   GLADE_HOOKUP_OBJECT (mainwin, vbox2, "vbox2");
   GLADE_HOOKUP_OBJECT (mainwin, volume, "volume");
   GLADE_HOOKUP_OBJECT (mainwin, hbox5, "hbox5");
diff --git a/main.c b/main.c
index 45a5ab03..c762fc7b 100644
--- a/main.c
+++ b/main.c
@@ -227,6 +227,7 @@ main (int argc, char *argv[]) {
     thread_start (psdl_thread, 0);
 
     g_thread_init (NULL);
+    add_pixmap_directory ("/usr/share/deadbeef/images");
     gdk_threads_init ();
     gdk_threads_enter ();
     gtk_set_locale ();