From: John Stebbins Date: Wed, 11 Apr 2018 19:47:49 +0000 (-0700) Subject: LinGui: make main toolbar look like osx main toolbar X-Git-Tag: 1.1.1~30 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02f3d6803f450feadef0321f92106da2389be712;p=handbrake LinGui: make main toolbar look like osx main toolbar (cherry picked from commit 7d016e30de666db1003fc093422992ed173965f1) --- diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 784f0996f..d76eba422 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -4541,11 +4541,11 @@ update_activity_labels(signal_user_data_t *ud, gboolean active) if (!active) { - gtk_tool_button_set_label(button, "Show\nActivity"); + gtk_tool_button_set_label(button, "Activity"); } else { - gtk_tool_button_set_label(button, "Hide\nActivity"); + gtk_tool_button_set_label(button, "Activity"); } } @@ -4679,11 +4679,11 @@ update_queue_labels(signal_user_data_t *ud) if (!active) { - show_hide = _("Show\nQueue"); + show_hide = _("Queue"); } else { - show_hide = _("Hide\nQueue"); + show_hide = _("Queue"); } if (pending > 0) { diff --git a/gtk/src/ghb.m4 b/gtk/src/ghb.m4 index 854edad5b..586e732a6 100644 --- a/gtk/src/ghb.m4 +++ b/gtk/src/ghb.m4 @@ -915,7 +915,7 @@ libx264 authors: - + Presets _List True False @@ -1108,6 +1108,7 @@ libx264 authors: False False 5 + GTK_TOOLBAR_BOTH True @@ -1115,14 +1116,24 @@ libx264 authors: GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Choose Video Source True - Open -Source + Open Source hb-source app.source False - True + False + + + + + True + 60 + False + + + False + False @@ -1132,14 +1143,13 @@ Source GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Add to Queue True - Add To -Queue + Add To Queue hb-add-queue app.queue-add False - True + False @@ -1149,14 +1159,13 @@ Queue GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Start Encoding True - Start -Encoding + Start hb-start app.queue-start False - True + False @@ -1166,14 +1175,13 @@ Encoding GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Pause Encoding True - Pause -Encoding + Pause hb-pause app.queue-pause False - True + False @@ -1187,20 +1195,19 @@ Encoding - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Show Queue + Show Presets Window True - Show -Queue - hb-showqueue - app.show-queue + Presets + hb-presets + app.show-presets False - True + False @@ -1210,14 +1217,29 @@ Queue GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Show Preview Window True - Show -Preview + Preview hb-picture app.show-preview False - True + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Show Queue + True + Queue + hb-showqueue + app.show-queue + + + False + False @@ -1227,14 +1249,13 @@ Preview GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Show Activity Window True - Show -Activity + Activity hb-activity app.show-activity False - True + False diff --git a/gtk/src/icon_res.gresource.xml b/gtk/src/icon_res.gresource.xml index 8d6d1e16f..9318a7791 100644 --- a/gtk/src/icon_res.gresource.xml +++ b/gtk/src/icon_res.gresource.xml @@ -7,6 +7,7 @@ icons/32x32/apps/hb-add-queue.png icons/32x32/apps/hb-showqueue.png icons/32x32/apps/hb-activity.png + icons/32x32/apps/hb-presets.png icons/32x32/apps/hb-start.png icons/32x32/apps/hb-stop.png icons/32x32/apps/hb-pause.png @@ -16,6 +17,7 @@ icons/64x64/apps/hb-add-queue.png icons/64x64/apps/hb-showqueue.png icons/64x64/apps/hb-activity.png + icons/64x64/apps/hb-presets.png icons/64x64/apps/hb-start.png icons/64x64/apps/hb-stop.png icons/64x64/apps/hb-pause.png @@ -24,6 +26,7 @@ icons/scalable/apps/hb-add-queue.svg icons/scalable/apps/hb-showqueue.svg icons/scalable/apps/hb-activity.svg + icons/scalable/apps/hb-presets.svg icons/scalable/apps/hb-start.svg icons/scalable/apps/hb-stop.svg icons/scalable/apps/hb-pause.svg diff --git a/gtk/src/icons/32x32/apps/hb-picture.png b/gtk/src/icons/32x32/apps/hb-picture.png index bb57b35b4..8aa9c1c1a 100644 Binary files a/gtk/src/icons/32x32/apps/hb-picture.png and b/gtk/src/icons/32x32/apps/hb-picture.png differ diff --git a/gtk/src/icons/32x32/apps/hb-presets.png b/gtk/src/icons/32x32/apps/hb-presets.png new file mode 100644 index 000000000..f8ec66e13 Binary files /dev/null and b/gtk/src/icons/32x32/apps/hb-presets.png differ diff --git a/gtk/src/icons/32x32/apps/hb-source.png b/gtk/src/icons/32x32/apps/hb-source.png index 128edda8c..bacc053ce 100644 Binary files a/gtk/src/icons/32x32/apps/hb-source.png and b/gtk/src/icons/32x32/apps/hb-source.png differ diff --git a/gtk/src/icons/64x64/apps/hb-picture.png b/gtk/src/icons/64x64/apps/hb-picture.png index afb153b09..2b7fc866f 100644 Binary files a/gtk/src/icons/64x64/apps/hb-picture.png and b/gtk/src/icons/64x64/apps/hb-picture.png differ diff --git a/gtk/src/icons/64x64/apps/hb-presets.png b/gtk/src/icons/64x64/apps/hb-presets.png new file mode 100644 index 000000000..2f896e7e0 Binary files /dev/null and b/gtk/src/icons/64x64/apps/hb-presets.png differ diff --git a/gtk/src/icons/64x64/apps/hb-source.png b/gtk/src/icons/64x64/apps/hb-source.png index 9afc3cf67..767cd9e67 100644 Binary files a/gtk/src/icons/64x64/apps/hb-source.png and b/gtk/src/icons/64x64/apps/hb-source.png differ diff --git a/gtk/src/icons/scalable/apps/hb-picture.svg b/gtk/src/icons/scalable/apps/hb-picture.svg index eeddbfb7a..cc537e498 100644 --- a/gtk/src/icons/scalable/apps/hb-picture.svg +++ b/gtk/src/icons/scalable/apps/hb-picture.svg @@ -2,13 +2,15 @@ - + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> + - + diff --git a/gtk/src/icons/scalable/apps/hb-presets.svg b/gtk/src/icons/scalable/apps/hb-presets.svg new file mode 100644 index 000000000..b7b578033 --- /dev/null +++ b/gtk/src/icons/scalable/apps/hb-presets.svg @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/gtk/src/preview.c b/gtk/src/preview.c index e282c545c..35517fc1d 100644 --- a/gtk/src/preview.c +++ b/gtk/src/preview.c @@ -1101,11 +1101,11 @@ update_preview_labels(signal_user_data_t *ud, gboolean active) if (!active) { - gtk_tool_button_set_label(button, "Show\nPreview"); + gtk_tool_button_set_label(button, "Preview"); } else { - gtk_tool_button_set_label(button, "Hide\nPreview"); + gtk_tool_button_set_label(button, "Preview"); } } diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index 0bb216a41..90530228c 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -2331,26 +2331,26 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) if (show_stop) { gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop"); - gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop\nEncoding")); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop")); gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Stop Encoding")); } else { gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start"); - gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Start\nEncoding")); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Start")); gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Start Encoding")); } widget = GHB_WIDGET (ud->builder, "queue_pause"); if (paused) { gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start"); - gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Resume\nEncoding")); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Resume")); gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Resume Encoding")); } else { gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-pause"); - gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Pause\nEncoding")); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Pause")); gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Pause Encoding")); }