summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deadbeef.glade19
-rw-r--r--images/next_24.pngbin685 -> 1511 bytes
-rw-r--r--images/pause_24.pngbin380 -> 942 bytes
-rw-r--r--images/play_24.pngbin639 -> 1133 bytes
-rw-r--r--images/prev_24.pngbin688 -> 1482 bytes
-rw-r--r--images/random_24.pngbin798 -> 928 bytes
-rw-r--r--images/stop_24.pngbin316 -> 1029 bytes
-rw-r--r--interface.c19
8 files changed, 20 insertions, 18 deletions
diff --git a/deadbeef.glade b/deadbeef.glade
index b748f806..54bc9481 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -14,6 +14,7 @@
<property name="default_height">300</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="icon">play_24.png</property>
<property name="icon_name">stock_media-play</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@@ -330,8 +331,7 @@
<child>
<widget class="GtkImage" id="image7">
<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>
@@ -356,8 +356,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>
@@ -382,8 +381,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>
@@ -408,8 +406,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>
@@ -434,8 +431,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>
@@ -460,8 +456,7 @@
<child>
<widget class="GtkImage" id="image6">
<property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
- <property name="icon_size">4</property>
+ <property name="pixbuf">random_24.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
diff --git a/images/next_24.png b/images/next_24.png
index 49cf69d8..35514e5b 100644
--- a/images/next_24.png
+++ b/images/next_24.png
Binary files differ
diff --git a/images/pause_24.png b/images/pause_24.png
index 061be624..6d4bf993 100644
--- a/images/pause_24.png
+++ b/images/pause_24.png
Binary files differ
diff --git a/images/play_24.png b/images/play_24.png
index 00d4d8fd..263347e4 100644
--- a/images/play_24.png
+++ b/images/play_24.png
Binary files differ
diff --git a/images/prev_24.png b/images/prev_24.png
index a0917d61..f2a02a4e 100644
--- a/images/prev_24.png
+++ b/images/prev_24.png
Binary files differ
diff --git a/images/random_24.png b/images/random_24.png
index 9d7e2293..b43d969a 100644
--- a/images/random_24.png
+++ b/images/random_24.png
Binary files differ
diff --git a/images/stop_24.png b/images/stop_24.png
index 3dc6b8fc..a9585c74 100644
--- a/images/stop_24.png
+++ b/images/stop_24.png
Binary files differ
diff --git a/interface.c b/interface.c
index 98aca9e5..3e7c9e12 100644
--- a/interface.c
+++ b/interface.c
@@ -30,6 +30,7 @@ GtkWidget*
create_mainwin (void)
{
GtkWidget *mainwin;
+ GdkPixbuf *mainwin_icon_pixbuf;
GtkWidget *vbox1;
GtkWidget *menubar1;
GtkWidget *menuitem1;
@@ -97,6 +98,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), 500, 300);
+ 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);
+ }
gtk_window_set_icon_name (GTK_WINDOW (mainwin), "stock_media-play");
vbox1 = gtk_vbox_new (FALSE, 0);
@@ -258,7 +265,7 @@ create_mainwin (void)
GTK_WIDGET_UNSET_FLAGS (stopbtn, GTK_CAN_FOCUS);
gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
- image7 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
+ image7 = create_pixmap (mainwin, "stop_24.png");
gtk_widget_show (image7);
gtk_container_add (GTK_CONTAINER (stopbtn), image7);
@@ -268,7 +275,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);
@@ -278,7 +285,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);
@@ -288,7 +295,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);
@@ -298,7 +305,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);
@@ -308,7 +315,7 @@ create_mainwin (void)
GTK_WIDGET_UNSET_FLAGS (playrand, GTK_CAN_FOCUS);
gtk_button_set_relief (GTK_BUTTON (playrand), GTK_RELIEF_NONE);
- image6 = gtk_image_new_from_stock ("gtk-missing-image", GTK_ICON_SIZE_BUTTON);
+ image6 = create_pixmap (mainwin, "random_24.png");
gtk_widget_show (image6);
gtk_container_add (GTK_CONTAINER (playrand), image6);