From 545728b808debf5288f80dcd9473aaf062c43e2a Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Tue, 19 Nov 2019 23:19:52 +0100
Subject: Page Dialog update

Change-Id: I7789ad1d4facb966ddc9ed4ed7201052809ce375
Reviewed-on: https://gerrit.libreoffice.org/83246
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
---
 cui/uiconfig/ui/pageformatpage.ui | 133 +++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 82 deletions(-)

diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui
index 0135d61e7457..a8060cce4b55 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -28,15 +28,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="row_spacing">3</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="labelFormat">
                         <property name="visible">True</property>
@@ -206,7 +205,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="left_padding">12</property>
                     <child>
                       <object class="GtkGrid" id="grid4">
                         <property name="visible">True</property>
@@ -232,7 +230,6 @@
                           <object class="GtkLabel" id="labelPaperTray">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
                             <property name="label" translatable="yes" context="pageformatpage|labelPaperTray">Paper _tray:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">comboPaperTray</property>
@@ -286,7 +283,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="row_spacing">12</property>
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame3">
@@ -307,8 +303,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="row_spacing">3</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
@@ -499,13 +495,12 @@
                   <object class="GtkGrid" id="grid7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="row_spacing">3</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="labelPageLayout">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="pageformatpage|labelPageLayout">_Page layout:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboPageLayout</property>
@@ -520,7 +515,6 @@
                       <object class="GtkLabel" id="labelPageNumbers">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="pageformatpage|labelPageNumbers">Page numbers:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboLayoutFormat</property>
@@ -542,55 +536,8 @@
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkBox" id="box1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="labelRegisterStyle">
-                                <property name="can_focus">False</property>
-                                <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes" context="pageformatpage|labelRegisterStyle">Reference _Style:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">comboRegisterStyle</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="comboRegisterStyle">
-                                <property name="can_focus">False</property>
-                                <property name="no_show_all">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
-                        <property name="width">2</property>
                       </packing>
                     </child>
                     <child>
@@ -623,7 +570,6 @@
                       <object class="GtkLabel" id="labelTblAlign">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="pageformatpage|labelTblAlign">Table alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">checkbuttonHorz</property>
@@ -670,7 +616,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="hexpand">True</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
@@ -682,6 +627,33 @@
                         <property name="width">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="labelRegisterStyle">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelRegisterStyle">Reference _Style:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">comboRegisterStyle</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="comboRegisterStyle">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                     <child>
                       <placeholder/>
                     </child>
@@ -738,37 +710,34 @@ Do you still want to apply these settings?</property>
       <widget name="grid7"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup4">
-    <property name="ignore_hidden">True</property>
+  <object class="GtkSizeGroup" id="sizegroupLabel1">
     <widgets>
-      <widget name="comboPaperTray"/>
-      <widget name="comboPageLayout"/>
-      <widget name="comboLayoutFormat"/>
-      <widget name="checkbuttonHorz"/>
-      <widget name="checkbuttonVert"/>
+      <widget name="labelFormat"/>
+      <widget name="labelWidth"/>
+      <widget name="labelHeight"/>
+      <widget name="labelOrientation"/>
+      <widget name="labelTextFlow"/>
+      <widget name="box3"/>
+      <widget name="box2"/>
+      <widget name="labelTopMargin"/>
+      <widget name="labelBottomMargin"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup5">
-    <property name="ignore_hidden">True</property>
+  <object class="GtkSizeGroup" id="sizegroupLabel2">
     <widgets>
       <widget name="labelPaperTray"/>
       <widget name="labelPageLayout"/>
       <widget name="labelPageNumbers"/>
+      <widget name="labelRegisterStyle"/>
       <widget name="labelTblAlign"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup6">
-    <property name="ignore_hidden">True</property>
+  <object class="GtkSizeGroup" id="sizegroupWidget2">
     <widgets>
-      <widget name="labelFormat"/>
-      <widget name="labelWidth"/>
-      <widget name="labelHeight"/>
-      <widget name="labelOrientation"/>
-      <widget name="labelTextFlow"/>
-      <widget name="labelTopMargin"/>
-      <widget name="labelBottomMargin"/>
-      <widget name="box2"/>
-      <widget name="box3"/>
+      <widget name="comboPaperTray"/>
+      <widget name="comboPageLayout"/>
+      <widget name="comboLayoutFormat"/>
+      <widget name="comboRegisterStyle"/>
     </widgets>
   </object>
 </interface>
-- 
cgit