From 40206c7c93ad690b2b0dce0986492824547b3044 Mon Sep 17 00:00:00 2001
From: John Stebbins <jstebbins.hb@gmail.com>
Date: Fri, 22 Dec 2017 14:49:28 -0800
Subject: [PATCH] LinGui: make all the preset menus consistent

---
 gtk/src/callbacks.c |  2 --
 gtk/src/ghb.m4      | 50 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 1ab846b63..b31cca978 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1862,8 +1862,6 @@ ghb_update_summary_info(signal_user_data_t *ud)
         gtk_label_set_text(GTK_LABEL(widget), "");
         widget = GHB_WIDGET(ud->builder, "dimensions_summary");
         gtk_label_set_text(GTK_LABEL(widget), "--");
-        widget = GHB_WIDGET(ud->builder, "aspect_summary");
-        gtk_label_set_text(GTK_LABEL(widget), "--");
         widget = GHB_WIDGET(ud->builder, "preview_button_image");
         gtk_image_set_from_icon_name(GTK_IMAGE(widget), "hb-icon", 128);
         return;
diff --git a/gtk/src/ghb.m4 b/gtk/src/ghb.m4
index 21fdf36dc..54b17034e 100644
--- a/gtk/src/ghb.m4
+++ b/gtk/src/ghb.m4
@@ -161,6 +161,20 @@ conjunction with the "Forced" option.</property>
                   <object class="GtkMenu" id="presets_window_submenu">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="presets_window_default">
+                        <property name="label" translatable="yes">Set De_fault</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="action-name">app.preset-default</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="presets_window_sep1">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkMenuItem" id="presets_window_save">
                         <property name="label" translatable="yes">_Save</property>
@@ -198,12 +212,8 @@ conjunction with the "Forced" option.</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuItem" id="presets_window_default">
-                        <property name="label" translatable="yes">Set De_fault</property>
+                      <object class="GtkSeparatorMenuItem" id="presets_window_sep2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="action-name">app.preset-default</property>
                       </object>
                     </child>
                     <child>
@@ -224,6 +234,11 @@ conjunction with the "Forced" option.</property>
                         <property name="action-name">app.preset-export</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="presets_window_sep3">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkMenuItem" id="presets_window_restore">
                         <property name="label" translatable="yes">Reset _Built-in Presets</property>
@@ -982,6 +997,20 @@ libx264 authors:
                   <object class="GtkMenu" id="presets_submenu">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="presets_default">
+                        <property name="label" translatable="yes">Set De_fault</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="action-name">app.preset-default</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="presets_sep1">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkMenuItem" id="presets_save">
                         <property name="label" translatable="yes">_Save</property>
@@ -1019,12 +1048,8 @@ libx264 authors:
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuItem" id="presets_default">
-                        <property name="label" translatable="yes">Set De_fault</property>
+                      <object class="GtkSeparatorMenuItem" id="presets_sep2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="action-name">app.preset-default</property>
                       </object>
                     </child>
                     <child>
@@ -1045,6 +1070,11 @@ libx264 authors:
                         <property name="action-name">app.preset-export</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="presets_sep3">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkMenuItem" id="presets_restore">
                         <property name="label" translatable="yes">Reset _Built-in Presets</property>
-- 
2.40.0