LinGui: make main toolbar look like osx main toolbar

(cherry picked from commit 7d016e30de666db1003fc093422992ed173965f1)

13 files changed, 98 insertions, 42 deletions

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:
                       </object>
                     </child>
                     <child>
-                      <object class="GtkCheckMenuItem" id="show_presets">
+                      <object class="GtkCheckMenuItem" id="show_presets_menu">
                         <property name="label" translatable="yes">Presets _List</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1108,6 +1108,7 @@ libx264 authors:
                 <property name="can_focus">False</property>
                 <property name="show-arrow">False</property>
                 <property name="icon_size">5</property>
+                <property name="toolbar-style">GTK_TOOLBAR_BOTH</property>
                 <child>
                   <object class="GtkToolButton" id="sourcetoolbutton">
                     <property name="visible">True</property>
@@ -1115,14 +1116,24 @@ libx264 authors:
                     <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">Choose Video Source</property>
                     <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Open
-Source</property>
+                    <property name="label" translatable="yes">Open Source</property>
                     <property name="icon_name">hb-source</property>
                     <property name="action-name">app.source</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparatorToolItem" id="main_tool_sep2">
+                    <property name="visible">True</property>
+                    <property name="width-request">60</property>
+                    <property name="draw">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1132,14 +1143,13 @@ Source</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="is_important">True</property>
-                    <property name="label" translatable="yes">Add To
-Queue</property>
+                    <property name="label" translatable="yes">Add To Queue</property>
                     <property name="icon_name">hb-add-queue</property>
                     <property name="action-name">app.queue-add</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1149,14 +1159,13 @@ Queue</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">Start Encoding</property>
                     <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Start
-Encoding</property>
+                    <property name="label" translatable="yes">Start</property>
                     <property name="icon_name">hb-start</property>
                     <property name="action-name">app.queue-start</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1166,14 +1175,13 @@ Encoding</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">Pause Encoding</property>
                     <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Pause
-Encoding</property>
+                    <property name="label" translatable="yes">Pause</property>
                     <property name="icon_name">hb-pause</property>
                     <property name="action-name">app.queue-pause</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1187,20 +1195,19 @@ Encoding</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToggleToolButton" id="show_queue">
+                  <object class="GtkToggleToolButton" id="show_presets">
                     <property name="visible">True</property>
                     <property name="can_focus">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="tooltip_text" translatable="yes">Show Presets Window</property>
                     <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Show
-Queue</property>
-                    <property name="icon_name">hb-showqueue</property>
-                    <property name="action-name">app.show-queue</property>
+                    <property name="label" translatable="yes">Presets</property>
+                    <property name="icon_name">hb-presets</property>
+                    <property name="action-name">app.show-presets</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1210,14 +1217,29 @@ Queue</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 Preview Window</property>
                     <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Show
-Preview</property>
+                    <property name="label" translatable="yes">Preview</property>
                     <property name="icon_name">hb-picture</property>
                     <property name="action-name">app.show-preview</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="show_queue">
+                    <property name="visible">True</property>
+                    <property name="can_focus">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="is_important">True</property>
+                    <property name="label" translatable="yes">Queue</property>
+                    <property name="icon_name">hb-showqueue</property>
+                    <property name="action-name">app.show-queue</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1227,14 +1249,13 @@ Preview</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="is_important">True</property>
-                    <property name="label" translatable="yes">Show
-Activity</property>
+                    <property name="label" translatable="yes">Activity</property>
                     <property name="icon_name">hb-activity</property>
                     <property name="action-name">app.show-activity</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
               </object>
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 @@
     <file>icons/32x32/apps/hb-add-queue.png</file>
     <file>icons/32x32/apps/hb-showqueue.png</file>
     <file>icons/32x32/apps/hb-activity.png</file>
+    <file>icons/32x32/apps/hb-presets.png</file>
     <file>icons/32x32/apps/hb-start.png</file>
     <file>icons/32x32/apps/hb-stop.png</file>
     <file>icons/32x32/apps/hb-pause.png</file>
@@ -16,6 +17,7 @@
     <file>icons/64x64/apps/hb-add-queue.png</file>
     <file>icons/64x64/apps/hb-showqueue.png</file>
     <file>icons/64x64/apps/hb-activity.png</file>
+    <file>icons/64x64/apps/hb-presets.png</file>
     <file>icons/64x64/apps/hb-start.png</file>
     <file>icons/64x64/apps/hb-stop.png</file>
     <file>icons/64x64/apps/hb-pause.png</file>
@@ -24,6 +26,7 @@
     <file>icons/scalable/apps/hb-add-queue.svg</file>
     <file>icons/scalable/apps/hb-showqueue.svg</file>
     <file>icons/scalable/apps/hb-activity.svg</file>
+    <file>icons/scalable/apps/hb-presets.svg</file>
     <file>icons/scalable/apps/hb-start.svg</file>
     <file>icons/scalable/apps/hb-stop.svg</file>
     <file>icons/scalable/apps/hb-pause.svg</file>
diff --git a/gtk/src/icons/32x32/apps/hb-picture.png b/gtk/src/icons/32x32/apps/hb-picture.png
index bb57b35b4..8aa9c1c1a 100644
--- a/gtk/src/icons/32x32/apps/hb-picture.png
+++ b/gtk/src/icons/32x32/apps/hb-picture.png
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
--- /dev/null
+++ b/gtk/src/icons/32x32/apps/hb-presets.png
diff --git a/gtk/src/icons/32x32/apps/hb-source.png b/gtk/src/icons/32x32/apps/hb-source.png
index 128edda8c..bacc053ce 100644
--- a/gtk/src/icons/32x32/apps/hb-source.png
+++ b/gtk/src/icons/32x32/apps/hb-source.png
diff --git a/gtk/src/icons/64x64/apps/hb-picture.png b/gtk/src/icons/64x64/apps/hb-picture.png
index afb153b09..2b7fc866f 100644
--- a/gtk/src/icons/64x64/apps/hb-picture.png
+++ b/gtk/src/icons/64x64/apps/hb-picture.png
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
--- /dev/null
+++ b/gtk/src/icons/64x64/apps/hb-presets.png
diff --git a/gtk/src/icons/64x64/apps/hb-source.png b/gtk/src/icons/64x64/apps/hb-source.png
index 9afc3cf67..767cd9e67 100644
--- a/gtk/src/icons/64x64/apps/hb-source.png
+++ b/gtk/src/icons/64x64/apps/hb-source.png
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 @@
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">

-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="16" y1="5" x2="16" y2="28">

+	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">

+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32" y1="10" x2="32" y2="58">

 	<stop  offset="0" style="stop-color:#595959"/>

 	<stop  offset="1" style="stop-color:#333333"/>

 </linearGradient>

-<path fill="url(#SVGID_1_)" d="M20,16.5L13,20v-7L20,16.5z M29,7c0,1,0,18,0,19s-1,2-2,2c-2.236,0-19.764,0-22,0c-1,0-2-1-2-2

-	S3,8,3,7s0.5-2,2-2s21,0,22,0S29,6,29,7z M21,9h2V7h-2V9z M17,9h2V7h-2V9z M13,9h2V7h-2V9z M9,9h2V7H9V9z M5,9h2V7H5V9z M7,24H5v2h2

-	V24z M11,24H9v2h2V24z M15,24h-2v2h2V24z M19,24h-2v2h2V24z M23,24h-2v2h2V24z M27,24h-2v2h2V24z M27,11H5v11h22V11z M27,7h-2v2h2V7

-	z"/>

+<path fill="url(#SVGID_1_)" d="M52,54l2,4H10l2-4H52z M26,22v14l14-7L26,22z M60,14c0,2,0,28,0,30s-2,4-4,4c-0.569,0-4.553,0-10,0

+	l1,2l1,1v1H16v-1l1-1l1-2c-5.447,0-9.43,0-10,0c-2,0-4-2-4-4s0-28,0-30s1-4,4-4s46,0,48,0S60,12,60,14z M10,40H8v2h2V40z M10,36H8v2

+	h2V36z M10,32H8v2h2V32z M10,28H8v2h2V28z M10,24H8v2h2V24z M10,20H8v2h2V20z M10,16H8v2h2V16z M32,47.774

+	c0.704,0,1.274-0.57,1.274-1.274s-0.57-1.274-1.274-1.274s-1.275,0.57-1.275,1.274S31.296,47.774,32,47.774z M52,16H12v26h40V16z

+	 M56,40h-2v2h2V40z M56,36h-2v2h2V36z M56,32h-2v2h2V32z M56,28h-2v2h2V28z M56,24h-2v2h2V24z M56,20h-2v2h2V20z M56,16h-2v2h2V16z"

+	/>

 </svg>

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 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

+	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">

+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="34" y1="10" x2="34" y2="60">

+	<stop  offset="0" style="stop-color:#595959"/>

+	<stop  offset="1" style="stop-color:#333333"/>

+</linearGradient>

+<path fill="url(#SVGID_1_)" d="M41,30H21v-2h20V30z M41,24H21v2h20V24z M41,20H21v2h20V20z M41,16H21v2h20V16z M16,51V15

+	c0-1,1-2,2-2h26c1,0,2,1,2,2v18.631c0.054,0.008,0.1,0.01,0.155,0.018c1.044,0.153,1.88,0.946,2.088,1.981l0.219,1.092

+	c0.112,0.044,0.224,0.09,0.335,0.138l0.944-0.626c0.081-0.054,0.173-0.078,0.258-0.121V14c0-2-2-4-4-4H16c-2,0-4,1.954-4,3.977

+	C12,14,12,52,12,52c0,2,2,4,4,4h16.062c-0.338-0.771-0.277-1.675,0.206-2.396L32.673,53H18C17,53,16,52,16,51z M39.203,36.86

+	c0.111-0.047,0.223-0.093,0.335-0.138L39.683,36H37.76c0.171,0.065,0.342,0.13,0.5,0.234L39.203,36.86z M21,48v2h8.655

+	c-0.107-0.738-0.159-1.38-0.163-2H21z M30.846,44H21v2h8.635c0.011-0.08,0.015-0.149,0.027-0.231

+	C29.774,45.017,30.22,44.378,30.846,44z M41,33.941V32H21v2h19.9C40.933,33.979,40.966,33.96,41,33.941z M33.744,37.701

+	c0.472-0.47,0.996-0.913,1.648-1.395c0.177-0.13,0.37-0.228,0.567-0.306H21v2h12.467C33.56,37.902,33.65,37.795,33.744,37.701z

+	 M31.989,40H21v2h11.138C31.809,41.376,31.758,40.651,31.989,40z M53.213,50.273c-0.227,0.926-0.594,1.813-1.09,2.634l0.002,0.107

+	l1.399,2.098c-0.386,0.516-0.739,0.931-1.11,1.301c-0.37,0.371-0.785,0.725-1.301,1.11l-2.097-1.399l-0.107-0.002

+	c-0.819,0.496-1.706,0.863-2.635,1.091l-0.074,0.078l-0.495,2.472C45.065,59.856,44.522,59.9,44,59.9s-1.065-0.043-1.705-0.137

+	l-0.495-2.472l-0.074-0.078c-0.926-0.227-1.813-0.594-2.634-1.09l-0.107,0.002l-2.098,1.399c-0.516-0.386-0.931-0.739-1.301-1.11

+	c-0.371-0.37-0.725-0.785-1.11-1.301l1.399-2.098l0.002-0.107c-0.497-0.821-0.863-1.708-1.09-2.634l-0.078-0.074l-2.473-0.494

+	C32.143,49.062,32.1,48.519,32.1,48c0-0.518,0.043-1.062,0.136-1.705l2.473-0.494l0.078-0.074c0.228-0.93,0.595-1.816,1.091-2.634

+	l-0.002-0.107l-1.399-2.098c0.386-0.517,0.74-0.932,1.11-1.301c0.37-0.37,0.784-0.724,1.301-1.11l2.098,1.399l0.107,0.002

+	c0.821-0.497,1.708-0.863,2.634-1.09l0.074-0.078l0.494-2.473C42.938,36.143,43.481,36.1,44,36.1s1.062,0.043,1.705,0.136

+	l0.494,2.473l0.074,0.078c0.93,0.228,1.816,0.595,2.634,1.091l0.107-0.002l2.098-1.399c0.517,0.386,0.932,0.74,1.301,1.11

+	c0.37,0.37,0.724,0.784,1.11,1.301l-1.399,2.098l-0.002,0.107c0.496,0.818,0.863,1.705,1.091,2.634l0.078,0.074l2.472,0.495

+	C55.856,46.935,55.9,47.478,55.9,48c0,0.522-0.043,1.065-0.137,1.705l-2.472,0.495L53.213,50.273z M48.1,48

+	c0-2.26-1.839-4.1-4.1-4.1s-4.1,1.839-4.1,4.1c0,2.261,1.839,4.101,4.1,4.101S48.1,50.261,48.1,48z"/>

+</svg>

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"));
     }