restore a11y relations within ui format

and hack things a little to get the previews to take full width and half height

Change-Id: I1cea2ad71ea8cafc3e417ec254515764c0f053f9

2 files changed, 193 insertions, 114 deletions

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 60ee3187bf7e..b5557b0bf794 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -256,12 +256,6 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet
     get(m_pCtlBitmapPreview,"CTL_BITMAP_PREVIEW");
     get(m_pCtlXRectPreview,"CTL_TRANS_PREVIEW");
 
-
-//     String accName = String(CUI_RES(STR_EXAMPLE));
-//     aCtlBitmapPreview.SetAccessibleName(accName);
-//     aCtlXRectPreview.SetAccessibleName(accName);
-//     aMtrTransparent.SetAccessibleRelationLabeledBy( &aRbtTransLinear );
-
     // main selection
     m_pRbtTransOff->SetClickHdl(LINK(this, SvxTransparenceTabPage, ClickTransOffHdl_Impl));
     m_pRbtTransLinear->SetClickHdl(LINK(this, SvxTransparenceTabPage, ClickTransLinearHdl_Impl));
diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui
index 4c8e780a2f3f..6f38a67767e3 100644
--- a/cui/uiconfig/ui/transparencytabpage.ui
+++ b/cui/uiconfig/ui/transparencytabpage.ui
@@ -2,27 +2,42 @@
 <interface>
   <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustmentPercent">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentDegrees">
+    <property name="upper">359</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkFrame" id="TransparencyTabPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_left">6</property>
     <property name="margin_top">6</property>
+    <property name="hexpand">True</property>
     <property name="label_xalign">0</property>
     <property name="shadow_type">none</property>
     <child>
       <object class="GtkAlignment" id="alignment1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="border_width">6</property>
         <child>
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="spacing">12</property>
+            <property name="homogeneous">True</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">start</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -30,7 +45,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="RBT_TRANS_OFF">
                         <property name="label" translatable="yes">_No transparency</property>
@@ -63,6 +78,9 @@
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">RBT_TRANS_GRADIENT</property>
+                        <accessibility>
+                          <relation type="label-for" target="MTR_TRANSPARENT:0%"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -96,6 +114,9 @@
                         <property name="can_focus">False</property>
                         <property name="invisible_char">•</property>
                         <property name="adjustment">adjustmentPercent</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="RBT_TRANS_LINEAR"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -124,24 +145,22 @@
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_END_VALUE">
+                      <object class="GtkSpinButton" id="MTR_TRGR_END_VALUE:0%">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_End value</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MTR_TRGR_END_VALUE:0%</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <property name="adjustment">adjustmentPercent</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">6</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MTR_TRGR_END_VALUE:0%">
+                      <object class="GtkSpinButton" id="MTR_TRGR_START_VALUE:0%">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="invisible_char">•</property>
@@ -150,62 +169,58 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">5</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_START_VALUE">
+                      <object class="GtkSpinButton" id="MTR_TRGR_BORDER:0%">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Start value</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MTR_TRGR_START_VALUE:0%</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <property name="adjustment">adjustmentPercent</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">4</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MTR_TRGR_START_VALUE:0%">
+                      <object class="GtkSpinButton" id="MTR_TRGR_ANGLE:0degree">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="invisible_char">•</property>
                         <property name="invisible_char_set">True</property>
-                        <property name="adjustment">adjustmentPercent</property>
+                        <property name="adjustment">adjustmentDegrees</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">3</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_BORDER">
+                      <object class="GtkSpinButton" id="MTR_TRGR_CENTER_Y:0%">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Border</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MTR_TRGR_BORDER:0%</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <property name="adjustment">adjustmentPercent</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MTR_TRGR_BORDER:0%">
+                      <object class="GtkSpinButton" id="MTR_TRGR_CENTER_X:0%">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="invisible_char">•</property>
@@ -214,133 +229,181 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">1</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_ANGLE">
+                      <object class="GtkComboBox" id="LB_TRGR_GRADIENT_TYPES">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Angle</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MTR_TRGR_ANGLE:0degree</property>
+                        <property name="model">liststoreTYPE</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MTR_TRGR_ANGLE:0degree">
+                      <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
-                        <property name="adjustment">adjustmentDegrees</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_TYPE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Ty_pe</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">LB_TRGR_GRADIENT_TYPES</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_CENTER_Y">
+                      <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Center _Y</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MTR_TRGR_CENTER_Y:0%</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_CENTER_X">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Center _X</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">MTR_TRGR_CENTER_X:0%</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MTR_TRGR_CENTER_Y:0%">
+                      <object class="GtkAlignment" id="alignment4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
-                        <property name="adjustment">adjustmentPercent</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_CENTER_Y">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Center _Y</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">MTR_TRGR_CENTER_Y:0%</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_CENTER_X">
+                      <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Center _X</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MTR_TRGR_CENTER_X:0%</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_ANGLE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Angle</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">MTR_TRGR_ANGLE:0degree</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">3</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MTR_TRGR_CENTER_X:0%">
+                      <object class="GtkAlignment" id="alignment6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
-                        <property name="adjustment">adjustmentPercent</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_BORDER">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Border</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">MTR_TRGR_BORDER:0%</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="FT_TRGR_TYPE">
+                      <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">25</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Ty_pe</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">LB_TRGR_GRADIENT_TYPES</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_START_VALUE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Start value</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">MTR_TRGR_START_VALUE:0%</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="top_attach">5</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="LB_TRGR_GRADIENT_TYPES">
+                      <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="model">liststoreTYPE</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_TRGR_END_VALUE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_End value</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">MTR_TRGR_END_VALUE:0%</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">6</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -363,19 +426,23 @@
               <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
                 <property name="valign">start</property>
+                <property name="margin_right">12</property>
                 <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
+                <property name="homogeneous">True</property>
                 <child>
                   <object class="svxlo-SvxXRectPreview" id="CTL_BITMAP_PREVIEW">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="valign">start</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -389,6 +456,11 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="CTL_TRANS_PREVIEW-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -396,6 +468,21 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox" id="box4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -419,16 +506,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustmentDegrees">
-    <property name="upper">359</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustmentPercent">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkListStore" id="liststoreTYPE">
     <columns>
       <!-- column-name gchararray1 -->
@@ -463,20 +540,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <widgets>
-      <widget name="RBT_TRANS_OFF"/>
-      <widget name="RBT_TRANS_LINEAR"/>
-      <widget name="RBT_TRANS_GRADIENT"/>
-      <widget name="FT_TRGR_END_VALUE"/>
-      <widget name="FT_TRGR_START_VALUE"/>
-      <widget name="FT_TRGR_BORDER"/>
-      <widget name="FT_TRGR_ANGLE"/>
-      <widget name="FT_TRGR_CENTER_Y"/>
-      <widget name="FT_TRGR_CENTER_X"/>
-      <widget name="FT_TRGR_TYPE"/>
-    </widgets>
-  </object>
   <object class="GtkSizeGroup" id="sizegroup2">
     <property name="mode">both</property>
     <property name="ignore_hidden">True</property>
@@ -491,4 +554,26 @@
       <widget name="LB_TRGR_GRADIENT_TYPES"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup3">
+    <property name="mode">both</property>
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="box1"/>
+      <widget name="box3"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup4">
+    <widgets>
+      <widget name="RBT_TRANS_OFF"/>
+      <widget name="RBT_TRANS_LINEAR"/>
+      <widget name="RBT_TRANS_GRADIENT"/>
+      <widget name="alignment2"/>
+      <widget name="alignment3"/>
+      <widget name="alignment4"/>
+      <widget name="alignment5"/>
+      <widget name="alignment6"/>
+      <widget name="alignment7"/>
+      <widget name="alignment8"/>
+    </widgets>
+  </object>
 </interface>