move SetAccessibleRelationLabeledBy relations into .ui and out of code

Change-Id: Iaf1a4a5ed813f48f9241f9e3ae7a732c22b7b9e5

5 files changed, 47 insertions, 60 deletions

diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index 0925aac72449..e6fddb1a3d9a 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -230,6 +230,9 @@
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
+                        <accessibility>
+                          <relation type="label-for" target="category"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -318,6 +321,14 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
+                          <accessibility>
+                            <relation type="labelled-by" target="inserttip"/>
+                          </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="othered-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Category</property>
+                              </object>
+                            </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 1b3e6b151e8f..8426f7c4e62b 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -25,12 +25,10 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -42,11 +40,9 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -58,11 +54,9 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -114,6 +108,14 @@
                             <property name="width_chars">1</property>
                             <property name="text" translatable="yes">,</property>
                             <property name="invisible_char_set">True</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="other"/>
+                            </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="othered-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Symbol</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -125,15 +127,16 @@
                         <child>
                           <object class="GtkRadioButton" id="other">
                             <property name="label" translatable="yes">Other:</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="valign">end</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">tabs</property>
+                            <accessibility>
+                              <relation type="label-for" target="othered"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -145,12 +148,10 @@
                         <child>
                           <object class="GtkRadioButton" id="semicolons">
                             <property name="label" translatable="yes">Semicolons</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="valign">end</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">other</property>
@@ -165,12 +166,10 @@
                         <child>
                           <object class="GtkRadioButton" id="paragraph">
                             <property name="label" translatable="yes">Paragraph</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="valign">end</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">semicolons</property>
@@ -185,13 +184,11 @@
                         <child>
                           <object class="GtkRadioButton" id="tabs">
                             <property name="label" translatable="yes">Tabs</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="halign">start</property>
                             <property name="valign">end</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="relief">half</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
@@ -208,10 +205,8 @@
                         <child>
                           <object class="GtkCheckButton" id="keepcolumn">
                             <property name="label" translatable="yes">Equal width for all columns</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -264,11 +259,9 @@
                         <child>
                           <object class="GtkCheckButton" id="headingcb">
                             <property name="label" translatable="yes">Heading</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -282,12 +275,10 @@
                         <child>
                           <object class="GtkCheckButton" id="repeatheading">
                             <property name="label" translatable="yes">Repeat heading</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="margin_left">25</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -302,11 +293,9 @@
                         <child>
                           <object class="GtkCheckButton" id="dontsplitcb">
                             <property name="label" translatable="yes">Don't split table</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -320,11 +309,9 @@
                         <child>
                           <object class="GtkCheckButton" id="bordercb">
                             <property name="label" translatable="yes">Border</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -347,6 +334,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">The first </property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">repeatheadersb</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -397,10 +386,8 @@
                         <child>
                           <object class="GtkButton" id="autofmt">
                             <property name="label" translatable="yes">AutoFormat...</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index f69746870d2f..3cfdb2ced297 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -36,13 +36,11 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -54,11 +52,9 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -70,11 +66,9 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -110,11 +104,9 @@
                     <child>
                       <object class="GtkRadioButton" id="linerb">
                         <property name="label" translatable="yes">Line break</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
@@ -129,11 +121,9 @@
                     <child>
                       <object class="GtkRadioButton" id="columnrb">
                         <property name="label" translatable="yes">Column break</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
@@ -148,11 +138,9 @@
                     <child>
                       <object class="GtkRadioButton" id="pagerb">
                         <property name="label" translatable="yes">Page break</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
@@ -192,13 +180,14 @@
                     <child>
                       <object class="GtkCheckButton" id="pagenumcb">
                         <property name="label" translatable="yes">Change page number</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
+                        <accessibility>
+                          <relation type="label-for" target="pagenumsb"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -217,6 +206,9 @@
                             <property name="invisible_char">●</property>
                             <property name="invisible_char_set">True</property>
                             <property name="adjustment">adjustment1</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="pagenumcb"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index a4b2020c6f3d..64a787f3c4c3 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -18,13 +18,11 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -36,11 +34,9 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -52,11 +48,9 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -72,10 +66,8 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="prev">
-                    <property name="use_action_appearance">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image1</property>
                     <property name="image_position">right</property>
                   </object>
@@ -88,10 +80,8 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="next">
-                    <property name="use_action_appearance">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image2</property>
                   </object>
                   <packing>
@@ -142,11 +132,9 @@
                         <child>
                           <object class="GtkRadioButton" id="automatic">
                             <property name="label" translatable="yes">Automatic</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -162,14 +150,15 @@
                         <child>
                           <object class="GtkRadioButton" id="character">
                             <property name="label" translatable="yes">Character</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">automatic</property>
+                            <accessibility>
+                              <relation type="label-for" target="characterentry"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -187,6 +176,14 @@
                             <property name="width_chars">2</property>
                             <property name="progress_fraction">0.0099999997764825821</property>
                             <property name="progress_pulse_step">0.090000003576278687</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="character"/>
+                            </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="characterentry-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Character</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -198,12 +195,10 @@
                         <child>
                           <object class="GtkButton" id="choosecharacter">
                             <property name="label" translatable="yes">Choose ...</property>
-                            <property name="use_action_appearance">False</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_action_appearance">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -258,11 +253,9 @@
                         <child>
                           <object class="GtkRadioButton" id="footnote">
                             <property name="label" translatable="yes">Footnote</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -277,11 +270,9 @@
                         <child>
                           <object class="GtkRadioButton" id="endnote">
                             <property name="label" translatable="yes">Endnote</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">footnote</property>
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index 4527aa142418..b31c36a2e89c 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -204,6 +204,9 @@
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
+                        <accessibility>
+                          <relation type="label-for" target="pagestylelb"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -248,6 +251,9 @@
                         <property name="can_focus">False</property>
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="pagestyle"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>