tdf#119931 Fix a11y warnings in compressgraphicdialog.ui

Rearrange objects in code to correspond to actual layout & conform to
rest of file.

Change-Id: I9c86000f335c2d5305286b42b9cd434e922f07c6
Reviewed-on: https://gerrit.libreoffice.org/70340
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

2 files changed, 85 insertions, 48 deletions

diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 9dc3ea0462af..ad14e76deb58 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -6,22 +6,9 @@ svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkLabel[@id='rubytextft'] orphan-
 svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkEntry[@id='Left1ED'] no-labelled-by
 svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkEntry[@id='Right1ED'] no-labelled-by
 svx/uiconfig/ui/colorwindow.ui://GtkButton[@id='auto_color_button'] button-no-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkScale[@id='scale-quality'] no-labelled-by
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkSpinButton[@id='spin-quality'] no-labelled-by
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkScale[@id='scale-compression'] no-labelled-by
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkSpinButton[@id='spin-compression'] no-labelled-by
 svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label13'] orphan-label
 svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label14'] orphan-label
 svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label16'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label7'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label-original-size'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label8'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label9'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label-view-size'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label-image-capacity'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label-new-capacity'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label15'] orphan-label
-svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label-graphic-type'] orphan-label
 svx/uiconfig/ui/crashreportdlg.ui://GtkLabel[@id='ed_pre'] orphan-label
 svx/uiconfig/ui/crashreportdlg.ui://GtkTextView[@id='ed_post'] no-labelled-by
 svx/uiconfig/ui/crashreportdlg.ui://GtkTextView[@id='ed_bugreport'] no-labelled-by
diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui
index a0441bc2a63d..2897e7b6ae07 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -138,6 +138,10 @@
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radio-lossless</property>
+                            <accessibility>
+                              <relation type="label-for" target="scale-quality"/>
+                              <relation type="label-for" target="spin-quality"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -155,6 +159,10 @@
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
+                            <accessibility>
+                              <relation type="label-for" target="scale-compression"/>
+                              <relation type="label-for" target="spin-compression"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -181,6 +189,9 @@
                                     <property name="digits">0</property>
                                     <property name="draw_value">False</property>
                                     <property name="value_pos">right</property>
+                                    <accessibility>
+                                      <relation type="labelled-by" target="radio-jpeg"/>
+                                    </accessibility>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -196,6 +207,9 @@
                                     <property name="adjustment">quality-adjustment</property>
                                     <property name="numeric">True</property>
                                     <property name="value">90</property>
+                                    <accessibility>
+                                      <relation type="labelled-by" target="radio-jpeg"/>
+                                    </accessibility>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -229,6 +243,9 @@
                                     <property name="digits">0</property>
                                     <property name="draw_value">False</property>
                                     <property name="value_pos">right</property>
+                                    <accessibility>
+                                      <relation type="labelled-by" target="radio-lossless"/>
+                                    </accessibility>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -244,6 +261,9 @@
                                     <property name="adjustment">compression-adjustment</property>
                                     <property name="numeric">True</property>
                                     <property name="value">9</property>
+                                    <accessibility>
+                                      <relation type="labelled-by" target="radio-lossless"/>
+                                    </accessibility>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -524,118 +544,129 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="label7">
+                          <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="compressgraphicdialog|label7">Actual dimensions:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label15">Type:</property>
                             <property name="single_line_mode">True</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                              <relation type="label-for" target="label-graphic-type"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label-original-size">
+                          <object class="GtkLabel" id="label-graphic-type">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="label">???</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="label15"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="compressgraphicdialog|label8">Apparent dimensions:</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label9">
+                          <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="compressgraphicdialog|label9">Image size:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label7">Actual dimensions:</property>
+                            <property name="single_line_mode">True</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                                <relation type="label-for" target="label-original-size"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label-view-size">
+                          <object class="GtkLabel" id="label-original-size">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="label">???</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                                <relation type="labelled-by" target="label7"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label-image-capacity">
+                          <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="label">???</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label8">Apparent dimensions:</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                                <relation type="label-for" target="label-view-size"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label-new-capacity">
+                          <object class="GtkLabel" id="label-view-size">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="label">???</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                                <relation type="labelled-by" target="label8"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">4</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label15">
+                          <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="compressgraphicdialog|label15">Type:</property>
-                            <property name="single_line_mode">True</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label9">Image size:</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                                <relation type="label-for" target="label-image-capacity"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="top_attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label-graphic-type">
+                          <object class="GtkLabel" id="label-image-capacity">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="label">???</property>
                             <property name="xalign">0</property>
+                            <accessibility>
+                                <relation type="labelled-by" target="label9"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="top_attach">3</property>
                           </packing>
                         </child>
                         <child>
@@ -645,12 +676,31 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="halign">start</property>
+                            <accessibility>
+                              <relation type="label-for" target="label-new-capacity"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="label-new-capacity">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label">???</property>
+                            <property name="xalign">0</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="calculate"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">4</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>