[Libreoffice-commits] core.git: fpicker/uiconfig

[Caolán McNamara (via logerrit)]

 fpicker/uiconfig/ui/foldernamedialog.ui |   59 ++++++++++++++------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

New commits:
commit 49891758278fff055e9ef631078bf08cbf8ba7d6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 22 13:52:58 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Dec 23 15:02:43 2020 +0100

    drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
    
    for fpicker
    
    Change-Id: I47ac66f7b823aa6cf8faa184f561cffb259eb2f3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108204
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/fpicker/uiconfig/ui/foldernamedialog.ui b/fpicker/uiconfig/ui/foldernamedialog.ui
index 68918b5cbdc0..d8a033f09d42 100644
--- a/fpicker/uiconfig/ui/foldernamedialog.ui
+++ b/fpicker/uiconfig/ui/foldernamedialog.ui
@@ -71,47 +71,40 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">start</property>
                 <property name="hexpand">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="spacing">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
                 <child>
-                  <object class="GtkBox" id="box1">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="valign">start</property>
+                    <property name="label" translatable="yes" context="foldernamedialog|label2">Na_me:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">entry</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="foldernamedialog|label2">Na_me:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">entry</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="activates_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="activates_default">True</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
             </child>