summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/src/Makefile.am25
-rw-r--r--gtk/src/callbacks.c2
-rw-r--r--gtk/src/ghb.ui12
-rw-r--r--gtk/src/hb-activity.32.pngbin1277 -> 798 bytes
-rw-r--r--gtk/src/hb-activity.64.pngbin0 -> 3128 bytes
-rw-r--r--gtk/src/hb-add-queue.32.pngbin1860 -> 3963 bytes
-rw-r--r--gtk/src/hb-add-queue.64.pngbin0 -> 3998 bytes
-rw-r--r--gtk/src/hb-drawer.32.pngbin779 -> 0 bytes
-rw-r--r--gtk/src/hb-icon.1024.pngbin1201076 -> 1044345 bytes
-rw-r--r--gtk/src/hb-icon.128.pngbin31533 -> 29486 bytes
-rw-r--r--gtk/src/hb-icon.16.pngbin972 -> 948 bytes
-rw-r--r--gtk/src/hb-icon.22.pngbin0 -> 1671 bytes
-rw-r--r--gtk/src/hb-icon.24.pngbin0 -> 1910 bytes
-rw-r--r--gtk/src/hb-icon.256.pngbin103974 -> 92832 bytes
-rw-r--r--gtk/src/hb-icon.32.pngbin2873 -> 2806 bytes
-rw-r--r--gtk/src/hb-icon.48.pngbin0 -> 5987 bytes
-rw-r--r--gtk/src/hb-icon.512.pngbin349971 -> 298409 bytes
-rw-r--r--gtk/src/hb-icon.64.pngbin9383 -> 9208 bytes
-rw-r--r--gtk/src/hb-pause.32.pngbin1729 -> 849 bytes
-rw-r--r--gtk/src/hb-pause.64.pngbin0 -> 2012 bytes
-rw-r--r--gtk/src/hb-picture.32.pngbin665 -> 1401 bytes
-rw-r--r--gtk/src/hb-picture.64.pngbin0 -> 3929 bytes
-rw-r--r--gtk/src/hb-play.32.pngbin1815 -> 0 bytes
-rw-r--r--gtk/src/hb-queue-delete.16.pngbin288 -> 0 bytes
-rw-r--r--gtk/src/hb-remove.24.pngbin0 -> 1167 bytes
-rw-r--r--gtk/src/hb-remove.32.pngbin1907 -> 0 bytes
-rw-r--r--gtk/src/hb-remove.48.pngbin0 -> 3356 bytes
-rw-r--r--gtk/src/hb-showqueue.32.pngbin0 -> 1069 bytes
-rw-r--r--gtk/src/hb-showqueue.64.pngbin0 -> 3884 bytes
-rw-r--r--gtk/src/hb-source.32.pngbin1953 -> 714 bytes
-rw-r--r--gtk/src/hb-source.64.pngbin0 -> 3447 bytes
-rw-r--r--gtk/src/hb-start.32.pngbin0 -> 1432 bytes
-rw-r--r--gtk/src/hb-start.64.pngbin0 -> 4547 bytes
-rw-r--r--gtk/src/hb-stop.32.pngbin1268 -> 776 bytes
-rw-r--r--gtk/src/hb-stop.64.pngbin0 -> 2059 bytes
-rw-r--r--gtk/src/queuehandler.c16
-rw-r--r--gtk/src/resources.list32
37 files changed, 55 insertions, 32 deletions
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 06e5f09dd..8fffaa337 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -16,30 +16,43 @@ HB_LIBS= \
endif
icons = \
- hb-icon.128.png
+ hb-icon.256.png \
+ hb-icon.128.png \
+ hb-icon.64.png \
+ hb-icon.48.png \
+ hb-icon.32.png \
+ hb-icon.24.png \
+ hb-icon.22.png \
+ hb-icon.16.png
icons_dep = \
hb-activity.32.png \
+ hb-activity.64.png \
hb-add-queue.32.png \
+ hb-add-queue.64.png \
hb-canceled.16.png \
hb-complete.16.png \
- hb-drawer.32.png \
hb-status.32.png \
hb-status-empty.32.png \
hb-icon.128.png \
hb-icon.64.png \
hb-pause.32.png \
- hb-play.32.png \
+ hb-pause.64.png \
+ hb-start.32.png \
+ hb-start.64.png \
hb-pref.32.png \
- hb-queue.32.png \
- hb-queue-delete.16.png \
+ hb-showqueue.32.png \
+ hb-showqueue.64.png \
+ hb-remove.24.png \
+ hb-remove.48.png \
hb-queue-job.16.png \
hb-queue-pass1.16.png \
hb-queue-pass2.16.png \
hb-queue-subtitle.16.png \
- hb-remove.32.png \
hb-source.32.png \
+ hb-source.64.png \
hb-stop.32.png \
+ hb-stop.64.png \
hb-working0.16.png \
hb-working1.16.png \
hb-working2.16.png \
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index baaa9ffeb..0ff45d1c1 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -5082,7 +5082,7 @@ ghb_notify_done(signal_user_data_t *ud)
notify_notification_attach_to_status_icon(notification, si);
#endif
GtkIconTheme *theme = gtk_icon_theme_get_default();
- GdkPixbuf *pb = gtk_icon_theme_load_icon(theme, "hb-icon", 64,
+ GdkPixbuf *pb = gtk_icon_theme_load_icon(theme, "hb-icon", 32,
GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
notify_notification_set_icon_from_pixbuf(notification, pb);
g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index ccb5a6ccb..bf24d17d1 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -406,7 +406,7 @@
<child>
<object class="GtkAction" id="queue_start_menu">
<property name="sensitive">False</property>
- <property name="icon-name">hb-play</property>
+ <property name="icon-name">hb-start</property>
<property name="name">queue_start_menu</property>
<property name="label">_Start Queue</property>
<signal handler="queue_start_clicked_cb" name="activate"/>
@@ -646,7 +646,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Start Encoding</property>
<property name="label" translatable="yes">Start</property>
- <property name="icon_name">hb-play</property>
+ <property name="icon_name">hb-start</property>
<signal handler="queue_start_clicked_cb" name="clicked"/>
</object>
<packing>
@@ -675,7 +675,7 @@
<property name="sensitive">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Add to Queue</property>
- <property name="label" translatable="yes">Add to Queue</property>
+ <property name="label" translatable="yes">Enqueue</property>
<property name="icon_name">hb-add-queue</property>
<signal handler="queue_add_clicked_cb" name="clicked"/>
</object>
@@ -689,7 +689,7 @@
<property name="is_important">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Show Queue</property>
- <property name="label" translatable="yes">Show Queue</property>
+ <property name="label" translatable="yes">Queue</property>
<property name="icon_name">hb-queue</property>
<signal handler="show_queue_clicked_cb" name="toggled"/>
</object>
@@ -717,7 +717,7 @@
<property name="is_important">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Show Activity Window</property>
- <property name="label" translatable="yes">Activity Window</property>
+ <property name="label" translatable="yes">Activity</property>
<property name="icon_name">hb-activity</property>
<signal handler="show_activity_clicked_cb" name="toggled"/>
</object>
@@ -5869,7 +5869,7 @@ and which codec to use when passthru is not possible</property>
<property name="sensitive">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Start</property>
- <property name="icon_name">hb-play</property>
+ <property name="icon_name">hb-start</property>
<signal handler="queue_start_clicked_cb" name="clicked"/>
</object>
<packing>
diff --git a/gtk/src/hb-activity.32.png b/gtk/src/hb-activity.32.png
index 315e0fa17..a2de1eead 100644
--- a/gtk/src/hb-activity.32.png
+++ b/gtk/src/hb-activity.32.png
Binary files differ
diff --git a/gtk/src/hb-activity.64.png b/gtk/src/hb-activity.64.png
new file mode 100644
index 000000000..9a6157f82
--- /dev/null
+++ b/gtk/src/hb-activity.64.png
Binary files differ
diff --git a/gtk/src/hb-add-queue.32.png b/gtk/src/hb-add-queue.32.png
index bd9f6ec97..ca33264cc 100644
--- a/gtk/src/hb-add-queue.32.png
+++ b/gtk/src/hb-add-queue.32.png
Binary files differ
diff --git a/gtk/src/hb-add-queue.64.png b/gtk/src/hb-add-queue.64.png
new file mode 100644
index 000000000..af00717cd
--- /dev/null
+++ b/gtk/src/hb-add-queue.64.png
Binary files differ
diff --git a/gtk/src/hb-drawer.32.png b/gtk/src/hb-drawer.32.png
deleted file mode 100644
index 43bdf1210..000000000
--- a/gtk/src/hb-drawer.32.png
+++ /dev/null
Binary files differ
diff --git a/gtk/src/hb-icon.1024.png b/gtk/src/hb-icon.1024.png
index 25c4fc892..9f7e1b271 100644
--- a/gtk/src/hb-icon.1024.png
+++ b/gtk/src/hb-icon.1024.png
Binary files differ
diff --git a/gtk/src/hb-icon.128.png b/gtk/src/hb-icon.128.png
index bc608e0d6..5ed609a54 100644
--- a/gtk/src/hb-icon.128.png
+++ b/gtk/src/hb-icon.128.png
Binary files differ
diff --git a/gtk/src/hb-icon.16.png b/gtk/src/hb-icon.16.png
index 5aea34d21..adf93d055 100644
--- a/gtk/src/hb-icon.16.png
+++ b/gtk/src/hb-icon.16.png
Binary files differ
diff --git a/gtk/src/hb-icon.22.png b/gtk/src/hb-icon.22.png
new file mode 100644
index 000000000..ab546d728
--- /dev/null
+++ b/gtk/src/hb-icon.22.png
Binary files differ
diff --git a/gtk/src/hb-icon.24.png b/gtk/src/hb-icon.24.png
new file mode 100644
index 000000000..09000dbbd
--- /dev/null
+++ b/gtk/src/hb-icon.24.png
Binary files differ
diff --git a/gtk/src/hb-icon.256.png b/gtk/src/hb-icon.256.png
index 584fb6b8c..cab91538d 100644
--- a/gtk/src/hb-icon.256.png
+++ b/gtk/src/hb-icon.256.png
Binary files differ
diff --git a/gtk/src/hb-icon.32.png b/gtk/src/hb-icon.32.png
index 793f088f8..8d7db6740 100644
--- a/gtk/src/hb-icon.32.png
+++ b/gtk/src/hb-icon.32.png
Binary files differ
diff --git a/gtk/src/hb-icon.48.png b/gtk/src/hb-icon.48.png
new file mode 100644
index 000000000..31ec18cec
--- /dev/null
+++ b/gtk/src/hb-icon.48.png
Binary files differ
diff --git a/gtk/src/hb-icon.512.png b/gtk/src/hb-icon.512.png
index a876fee4a..b60963776 100644
--- a/gtk/src/hb-icon.512.png
+++ b/gtk/src/hb-icon.512.png
Binary files differ
diff --git a/gtk/src/hb-icon.64.png b/gtk/src/hb-icon.64.png
index 843504085..1f5ca640e 100644
--- a/gtk/src/hb-icon.64.png
+++ b/gtk/src/hb-icon.64.png
Binary files differ
diff --git a/gtk/src/hb-pause.32.png b/gtk/src/hb-pause.32.png
index dd8ab7d64..5b557f168 100644
--- a/gtk/src/hb-pause.32.png
+++ b/gtk/src/hb-pause.32.png
Binary files differ
diff --git a/gtk/src/hb-pause.64.png b/gtk/src/hb-pause.64.png
new file mode 100644
index 000000000..96a3c12ad
--- /dev/null
+++ b/gtk/src/hb-pause.64.png
Binary files differ
diff --git a/gtk/src/hb-picture.32.png b/gtk/src/hb-picture.32.png
index fb8263e45..46017e9a6 100644
--- a/gtk/src/hb-picture.32.png
+++ b/gtk/src/hb-picture.32.png
Binary files differ
diff --git a/gtk/src/hb-picture.64.png b/gtk/src/hb-picture.64.png
new file mode 100644
index 000000000..aa639d55a
--- /dev/null
+++ b/gtk/src/hb-picture.64.png
Binary files differ
diff --git a/gtk/src/hb-play.32.png b/gtk/src/hb-play.32.png
deleted file mode 100644
index 42719c0bb..000000000
--- a/gtk/src/hb-play.32.png
+++ /dev/null
Binary files differ
diff --git a/gtk/src/hb-queue-delete.16.png b/gtk/src/hb-queue-delete.16.png
deleted file mode 100644
index 1b5171091..000000000
--- a/gtk/src/hb-queue-delete.16.png
+++ /dev/null
Binary files differ
diff --git a/gtk/src/hb-remove.24.png b/gtk/src/hb-remove.24.png
new file mode 100644
index 000000000..9407e400b
--- /dev/null
+++ b/gtk/src/hb-remove.24.png
Binary files differ
diff --git a/gtk/src/hb-remove.32.png b/gtk/src/hb-remove.32.png
deleted file mode 100644
index 4195a5e96..000000000
--- a/gtk/src/hb-remove.32.png
+++ /dev/null
Binary files differ
diff --git a/gtk/src/hb-remove.48.png b/gtk/src/hb-remove.48.png
new file mode 100644
index 000000000..9e01d9c3f
--- /dev/null
+++ b/gtk/src/hb-remove.48.png
Binary files differ
diff --git a/gtk/src/hb-showqueue.32.png b/gtk/src/hb-showqueue.32.png
new file mode 100644
index 000000000..ffcb4d70a
--- /dev/null
+++ b/gtk/src/hb-showqueue.32.png
Binary files differ
diff --git a/gtk/src/hb-showqueue.64.png b/gtk/src/hb-showqueue.64.png
new file mode 100644
index 000000000..2cbe097e1
--- /dev/null
+++ b/gtk/src/hb-showqueue.64.png
Binary files differ
diff --git a/gtk/src/hb-source.32.png b/gtk/src/hb-source.32.png
index 8e321939a..abdb30afa 100644
--- a/gtk/src/hb-source.32.png
+++ b/gtk/src/hb-source.32.png
Binary files differ
diff --git a/gtk/src/hb-source.64.png b/gtk/src/hb-source.64.png
new file mode 100644
index 000000000..a212d4e58
--- /dev/null
+++ b/gtk/src/hb-source.64.png
Binary files differ
diff --git a/gtk/src/hb-start.32.png b/gtk/src/hb-start.32.png
new file mode 100644
index 000000000..3cb2933a7
--- /dev/null
+++ b/gtk/src/hb-start.32.png
Binary files differ
diff --git a/gtk/src/hb-start.64.png b/gtk/src/hb-start.64.png
new file mode 100644
index 000000000..eb63d2054
--- /dev/null
+++ b/gtk/src/hb-start.64.png
Binary files differ
diff --git a/gtk/src/hb-stop.32.png b/gtk/src/hb-stop.32.png
index 15b606081..e3b3cb293 100644
--- a/gtk/src/hb-stop.32.png
+++ b/gtk/src/hb-stop.32.png
Binary files differ
diff --git a/gtk/src/hb-stop.64.png b/gtk/src/hb-stop.64.png
new file mode 100644
index 000000000..a51511299
--- /dev/null
+++ b/gtk/src/hb-stop.64.png
Binary files differ
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 3dcd54297..297757d4b 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -1034,7 +1034,7 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
else
{
gtk_widget_set_sensitive (widget, show_start);
- gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play");
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start");
gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Start");
gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Start Encoding");
}
@@ -1049,7 +1049,7 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
else
{
gtk_widget_set_sensitive (widget, show_start);
- gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play");
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start");
gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Start");
gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Start Encoding");
}
@@ -1057,7 +1057,7 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
if (paused)
{
gtk_widget_set_sensitive (widget, show_stop);
- gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play");
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start");
gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Resume");
gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Resume Encoding");
}
@@ -1072,7 +1072,7 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
if (paused)
{
gtk_widget_set_sensitive (widget, show_stop);
- gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play");
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start");
gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Resume");
gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Resume Encoding");
}
@@ -1105,12 +1105,12 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
{
gtk_action_set_sensitive (action, show_start);
#if GTK_CHECK_VERSION(2, 16, 0)
- gtk_action_set_icon_name(action, "hb-play");
+ gtk_action_set_icon_name(action, "hb-start");
gtk_action_set_label(action, "_Start Queue");
gtk_action_set_tooltip(action, "Start Encoding");
#else
g_object_set_property(G_OBJECT(action), "icon-name",
- ghb_string_value("hb-play"));
+ ghb_string_value("hb-start"));
g_object_set_property(G_OBJECT(action), "label",
ghb_string_value("_Start Queue"));
g_object_set_property(G_OBJECT(action), "tooltip",
@@ -1122,12 +1122,12 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
{
gtk_action_set_sensitive (action, show_start);
#if GTK_CHECK_VERSION(2, 16, 0)
- gtk_action_set_icon_name(action, "hb-play");
+ gtk_action_set_icon_name(action, "hb-start");
gtk_action_set_label(action, "_Resume Queue");
gtk_action_set_tooltip(action, "Resume Encoding");
#else
g_object_set_property(G_OBJECT(action), "icon-name",
- ghb_string_value("hb-play"));
+ ghb_string_value("hb-start"));
g_object_set_property(G_OBJECT(action), "label",
ghb_string_value("_Resume Queue"));
g_object_set_property(G_OBJECT(action), "tooltip",
diff --git a/gtk/src/resources.list b/gtk/src/resources.list
index c833c7f0c..e0a0781b5 100644
--- a/gtk/src/resources.list
+++ b/gtk/src/resources.list
@@ -1,30 +1,40 @@
<resources>
<section name="icons">
- <icon name="hb-activity" file="hb-activity.32.png" />
- <icon name="hb-add-queue" file="hb-add-queue.32.png" />
+ <icon name="hb-activity.32" file="hb-activity.32.png" />
+ <icon name="hb-activity.64" file="hb-activity.64.png" />
+ <icon name="hb-add-queue.32" file="hb-add-queue.32.png" />
+ <icon name="hb-add-queue.64" file="hb-add-queue.64.png" />
<icon name="hb-canceled" file="hb-canceled.16.png" />
<icon name="hb-complete" file="hb-complete.16.png" />
- <icon name="hb-drawer" file="hb-drawer.32.png" />
<icon name="hb-icon.256" file="hb-icon.256.png" />
<icon name="hb-icon.128" file="hb-icon.128.png" />
<icon name="hb-icon.64" file="hb-icon.64.png" />
+ <icon name="hb-icon.48" file="hb-icon.48.png" />
<icon name="hb-icon.32" file="hb-icon.32.png" />
+ <icon name="hb-icon.24" file="hb-icon.24.png" />
+ <icon name="hb-icon.22" file="hb-icon.22.png" />
<icon name="hb-icon.16" file="hb-icon.16.png" />
<icon name="hb-status" file="hb-status.32.png" />
<icon name="hb-status-empty" file="hb-status-empty.32.png" />
- <icon name="hb-pause" file="hb-pause.32.png" />
- <icon name="hb-play" file="hb-play.32.png" />
+ <icon name="hb-pause.32" file="hb-pause.32.png" />
+ <icon name="hb-pause.64" file="hb-pause.64.png" />
+ <icon name="hb-start.32" file="hb-start.32.png" />
+ <icon name="hb-start.64" file="hb-start.64.png" />
<icon name="hb-pref" file="hb-pref.32.png" />
- <icon name="hb-picture" file="hb-picture.32.png" />
- <icon name="hb-queue" file="hb-queue.32.png" />
- <icon name="hb-queue-delete" file="hb-queue-delete.16.png" />
+ <icon name="hb-picture.32" file="hb-picture.32.png" />
+ <icon name="hb-picture.64" file="hb-picture.64.png" />
+ <icon name="hb-queue.32" file="hb-showqueue.32.png" />
+ <icon name="hb-queue.64" file="hb-showqueue.32.png" />
+ <icon name="hb-queue-delete" file="hb-remove.24.png" />
<icon name="hb-queue-job" file="hb-queue-job.16.png" />
<icon name="hb-queue-pass1" file="hb-queue-pass1.16.png" />
<icon name="hb-queue-pass2" file="hb-queue-pass2.16.png" />
<icon name="hb-queue-subtitle" file="hb-queue-subtitle.16.png" />
- <icon name="hb-remove" file="hb-remove.32.png" />
- <icon name="hb-source" file="hb-source.32.png" />
- <icon name="hb-stop" file="hb-stop.32.png" />
+ <icon name="hb-remove" file="hb-remove.48.png" />
+ <icon name="hb-source.32" file="hb-source.32.png" />
+ <icon name="hb-source.64" file="hb-source.64.png" />
+ <icon name="hb-stop.32" file="hb-stop.32.png" />
+ <icon name="hb-stop.64" file="hb-stop.64.png" />
<icon name="hb-edit" file="hb-edit.32.png" />
<icon name="hb-working0" file="hb-working0.16.png" />
<icon name="hb-working1" file="hb-working1.16.png" />
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 04:21:25 +0000