[gnome-screenshot] Fix the alignment of the labels on the save dialog

[Cosimo Cecchi <cosimoc src gnome org>]

commit 8d9d8bb7bfd193134faf50e4ffd44014c40f2f74
Author: Edwin Pujols <edwinpm5 gmail com>
Date:   Thu Jul 25 11:23:31 2019 +0200

    Fix the alignment of the labels on the save dialog
    
    The labels on the "Save Screenshot" dialog are misplaced with respect
    to the text entry and the file chooser widget. I added these four
    elements into a new GtkGrid to fix the alignment.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724384

 src/screenshot-dialog.ui | 129 +++++++++++++++++++++++++++--------------------
 1 file changed, 75 insertions(+), 54 deletions(-)
---
diff --git a/src/screenshot-dialog.ui b/src/screenshot-dialog.ui
index ed2d620..4d88296 100644
--- a/src/screenshot-dialog.ui
+++ b/src/screenshot-dialog.ui
@@ -102,67 +102,88 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
+            <property name="row_spacing">8</property>
+            <property name="column_spacing">8</property>
             <property name="valign">start</property>
-            <property name="label" translatable="yes">_Name:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">filename_entry</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <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">Save in _folder:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">save_widget</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="valign">center</property>
+                <property name="label" translatable="yes">_Name</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">filename_entry</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="valign">center</property>
+                <property name="label" translatable="yes">Save in _folder</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">save_widget</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="filename_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="valign">center</property>
+                <property name="activates_default">True</property>
+                <property name="width_chars">32</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserButton" id="save_widget">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="vexpand">True</property>
+                <property name="action">select-folder</property>
+                <property name="local_only">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="filename_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="valign">start</property>
-            <property name="activates_default">True</property>
-            <property name="width_chars">32</property>
-          </object>
-          <packing>
-            <property name="left_attach">2</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFileChooserButton" id="save_widget">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <property name="vexpand">True</property>
-            <property name="action">select-folder</property>
-            <property name="local_only">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
+            <property name="width">2</property>
             <property name="height">1</property>
           </packing>
         </child>