From 19d4faaa83f8e29373947fb700bcd711fa14f903 Mon Sep 17 00:00:00 2001
From: John Stebbins <jstebbins.hb@gmail.com>
Date: Fri, 22 Dec 2017 14:19:03 -0800
Subject: LinGui: rename "Dimensions:" to "Size:" and move...

Move under Filters
---
 gtk/src/callbacks.c |  13 +++---
 gtk/src/ghb.m4      | 114 ++++++++++++++++++----------------------------------
 2 files changed, 43 insertions(+), 84 deletions(-)

(limited to 'gtk/src')

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index eac27e8b9..1ab846b63 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -2140,18 +2140,15 @@ ghb_update_summary_info(signal_user_data_t *ud)
     par_width      = ghb_dict_get_int(ud->settings, "PicturePARWidth");
     par_height     = ghb_dict_get_int(ud->settings, "PicturePARHeight");
 
-    text = g_strdup_printf("%dx%d storage, %dx%d display",
-                           width, height, display_width, display_height);
-    widget = GHB_WIDGET(ud->builder, "dimensions_summary");
-    gtk_label_set_text(GTK_LABEL(widget), text);
-    g_free(text);
-
     display_aspect = ghb_get_display_aspect_string(display_width,
                                                    display_height);
-    text = g_strdup_printf("%d:%d PAR, %s DAR",
+    text = g_strdup_printf("%dx%d storage, %dx%d display\n"
+                           "%d:%d PAR, %s DAR",
+                           width, height, display_width, display_height,
                            par_width, par_height, display_aspect);
-    widget = GHB_WIDGET(ud->builder, "aspect_summary");
+    widget = GHB_WIDGET(ud->builder, "dimensions_summary");
     gtk_label_set_text(GTK_LABEL(widget), text);
+
     g_free(text);
     g_free(display_aspect);
 }
diff --git a/gtk/src/ghb.m4 b/gtk/src/ghb.m4
index 7b8c3c74d..21fdf36dc 100644
--- a/gtk/src/ghb.m4
+++ b/gtk/src/ghb.m4
@@ -2024,6 +2024,44 @@ sync for broken players that do not honor MP4 edit lists.</property>
                                 <property name="height">4</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkLabel" id="dimensions_summary_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Size:&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="halign">start</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0</property>
+                                <property name="hexpand">False</property>
+                                <property name="margin-top">12</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">14</property>
+                                <property name="left_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="dimensions_summary">
+                                <property name="width_request">85</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0</property>
+                                <property name="hexpand">False</property>
+                                <property name="margin-top">12</property>
+                                <property name="label" translatable="yes">--</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">14</property>
+                                <property name="left_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2058,82 +2096,6 @@ sync for broken players that do not honor MP4 edit lists.</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkGrid" id="dimensions_summary_table">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">center</property>
-                                <property name="valign">start</property>
-                                <property name="column-spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="dimensions_summary_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Dimensions:</property>
-                                    <property name="halign">start</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="dimensions_summary">
-                                    <property name="width_request">85</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="valign">start</property>
-                                    <property name="label" translatable="yes">--</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="left_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="aspect_summary_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Aspect Ratio:</property>
-                                    <property name="halign">start</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="aspect_summary">
-                                    <property name="width_request">85</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="valign">start</property>
-                                    <property name="label" translatable="yes">--</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="left_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
-- 
cgit v1.2.3