sw/uiconfig/swriter/ui/pagenumberdlg.ui |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 08aefd5522e54059788d53ecf863d2deac78c029
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Mon May 1 16:14:56 2023 -0400
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Thu May 4 01:19:50 2023 +0200

    tdf#86630 sw page number wizard: fix divergence from HIG
    
    Thanks to Seth for pointing this out in
    gerrit.libreoffice.org/c/core/+/151152
    
    Possible misses still?
    -24pt column (start of rightVBox)
    
    Also taking the opportunity to fix copy/paste error
    with the translation context.
    
    Change-Id: Ic542875331104c376d53b3fb195f2aa2a3e485df
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151242
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 5fff5178898a..27f9bbed1543 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -108,8 +108,8 @@
                     <property name="can-focus">False</property>
                     <property name="active">1</property>
                     <items>
-                      <item translatable="yes" 
context="pagenumberdlg|liststore2">Top of page (Header)</item>
-                      <item translatable="yes" 
context="pagenumberdlg|liststore2">Bottom of page (Footer)</item>
+                      <item translatable="yes" 
context="pagenumberdlg|positionCombo">Top of page (Header)</item>
+                      <item translatable="yes" 
context="pagenumberdlg|positionCombo">Bottom of page (Footer)</item>
                     </items>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="positionCombo-atkobject">
@@ -128,7 +128,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin-top">6</property>
+                    <property name="margin-top">3</property>
                     <property name="label" translatable="yes" 
context="pagenumberdlg|alignmentLabel">Alignment:</property>
                     <property name="use-underline">True</property>
                     <property name="mnemonic-widget">alignmentCombo</property>
@@ -150,9 +150,9 @@
                     <property name="can-focus">False</property>
                     <property name="active">0</property>
                     <items>
-                      <item translatable="yes" 
context="pagenumberdlg|liststore1">Left</item>
-                      <item translatable="yes" 
context="pagenumberdlg|liststore1">Center</item>
-                      <item translatable="yes" 
context="pagenumberdlg|liststore1">Right</item>
+                      <item translatable="yes" 
context="pagenumberdlg|alignmentCombo">Left</item>
+                      <item translatable="yes" 
context="pagenumberdlg|alignmentCombo">Center</item>
+                      <item translatable="yes" 
context="pagenumberdlg|alignmentCombo">Right</item>
                     </items>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="alignmentCombo-atkobject">
@@ -168,15 +168,16 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="mirrorCheckbox">
-                    <property name="label" translatable="yes" 
context="numberingoptionspage|mirrorCheckbox">Mirror on even pages</property>
+                    <property name="label" translatable="yes" 
context="pagenumberdlg|mirrorCheckbox">Mirror on even pages</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
+                    <property name="margin-start">18</property>
                     <property name="use-underline">True</property>
                     <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="mirrorCheckbox-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="numberingoptionspage|extended_tip|mirrorCheckbox">Creates separate 
left/right pages with mirrored page number placements</property>
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="pagenumberdlg|extended_tip|mirrorCheckbox">Creates 
separate left/right pages with mirrored page number placements</property>
                       </object>
                     </child>
                   </object>
@@ -213,7 +214,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin-top">6</property>
+                    <property name="margin-top">3</property>
                     <property name="label" translatable="yes" 
context="pagenumberdlg|numfmtLabel">Page numbers:</property>
                     <property name="use-underline">True</property>
                     <property name="mnemonic-widget">numfmtlb</property>
@@ -241,7 +242,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="numfmtlb-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="numberingoptionspage|extended_tip|numfmtlb">Select 
a numbering scheme for the page numbering.</property>
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="pagenumberdlg|extended_tip|numfmtlb">Select a 
numbering scheme for the page numbering.</property>
                       </object>
                     </child>
                   </object>

Reply via email to