sw/uiconfig/swriter/ui/pagenumberdlg.ui | 42 ++++++++++++--------------------
1 file changed, 16 insertions(+), 26 deletions(-)
New commits:
commit 8db390be9b2280c05f2c8943fc80be07aa8df811
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 2 09:56:53 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 2 12:15:05 2023 +0000
use mnemonic-widget instead of label-for+labelled-by
then the a11y relation is implied without the need for explicit
extra annotation
use more standard spacing values and spacing pattern too
Change-Id: Ifeea7fbe89bc093aac1b9f16e49b80bfa6a9af9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146493
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index e9147063f700..27c72323b832 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -11,56 +11,55 @@
<property name="default-height">0</property>
<property name="type-hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkBox" id="mainVBox">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="buttonBox">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
- <object class="GtkButton" id="help">
- <property name="label" translatable="yes"
context="stock">_Help</property>
+ <object class="GtkButton" id="ok">
+ <property name="label" translatable="yes"
context="stock">_OK</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
- <property name="halign">start</property>
<property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="ok">
- <property name="label" translatable="yes"
context="stock">_OK</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label" translatable="yes"
context="stock">_Cancel</property>
+ <object class="GtkButton" id="help">
+ <property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -75,13 +74,11 @@
<object class="GtkBox" id="HBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="spacing">29</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="leftVBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="margin-end">12</property>
- <property name="margin-bottom">12</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
@@ -180,19 +177,15 @@
<object class="GtkBox" id="rightVBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="margin-bottom">12</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="previewLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="xpad">7</property>
- <property name="ypad">7</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="pagenumberdlg|previewLabel">Preview</property>
- <property name="justify">center</property>
- <accessibility>
- <relation type="label-for" target="previewImage"/>
- </accessibility>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">previewImage</property>
</object>
<packing>
<property name="expand">False</property>
@@ -204,9 +197,6 @@
<object class="GtkImage" id="previewImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <accessibility>
- <relation type="labelled-by" target="previewLabel"/>
- </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -231,9 +221,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">help</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
+ <action-widget response="-11">help</action-widget>
</action-widgets>
</object>
</interface>
