remove redundant a11y/l10n-confusing pages label and set mnemonic widgets

Change-Id: I1773eaa2db904e1f7cec65bb294ff38e3ce06251

1 files changed, 33 insertions, 26 deletions

diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 8164335f249b..92acb22566b5 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="DLG_TITLEPAGE">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -96,6 +103,8 @@
                             <property name="halign">start</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Number of title pages</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">NF_PAGE_COUNT</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -110,6 +119,10 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Place title pages at</property>
+                            <accessibility>
+                              <relation type="label-for" target="RB_DOCUMENT_START"/>
+                              <relation type="label-for" target="RB_PAGE_START"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -119,21 +132,6 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">pages</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">2</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkSpinButton" id="NF_PAGE_COUNT">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -163,11 +161,14 @@
                             <property name="adjustment">adjustment1</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="RB_PAGE_START"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">4</property>
-                            <property name="width">2</property>
+                            <property name="width">1</property>
                             <property name="height">1</property>
                           </packing>
                         </child>
@@ -186,7 +187,7 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">4</property>
+                            <property name="width">3</property>
                             <property name="height">1</property>
                           </packing>
                         </child>
@@ -205,7 +206,7 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">4</property>
+                            <property name="width">3</property>
                             <property name="height">1</property>
                           </packing>
                         </child>
@@ -219,11 +220,14 @@
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">RB_PAGE_START</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="label7"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
-                            <property name="width">3</property>
+                            <property name="width">2</property>
                             <property name="height">1</property>
                           </packing>
                         </child>
@@ -237,6 +241,9 @@
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">RB_DOCUMENT_START</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="label7"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -248,6 +255,9 @@
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -311,6 +321,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Page number</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">NF_RESTART_NUMBERING</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -366,6 +378,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Page number</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -493,11 +507,4 @@
       <action-widget response="0">PB_HELP</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">1</property>
-    <property name="upper">65535</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>