move wrap icons outside radiobuttons

not possible in gtk4 to put an image in here anymore AFAICS,
this was always an odd case anyway

Change-Id: Ic9415cd0c91a7f006231d786f2a3a22b8f97af6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115907
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 229 insertions, 91 deletions

diff --git a/sw/uiconfig/swriter/ui/wrappage.ui b/sw/uiconfig/swriter/ui/wrappage.ui
index ed0f31b07279..ede6800d1837 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -50,154 +50,292 @@
             <property name="row-homogeneous">True</property>
             <property name="column-homogeneous">True</property>
             <child>
-              <object class="GtkRadioButton" id="none">
-                <property name="label" translatable="yes" context="wrappage|none">_Wrap Off</property>
+              <!-- n-columns=1 n-rows=2 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="image-position">top</property>
-                <property name="always-show-image">True</property>
-                <property name="active">True</property>
-                <property name="draw-indicator">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="none-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|none">Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object.</property>
+                <child>
+                  <object class="GtkImage" id="beforeimg">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="before">
+                    <property name="label" translatable="yes" context="wrappage|before">Be_fore</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">none</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="before-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|before">Wraps text on the left side of the object if there is enough space.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left-attach">0</property>
+                <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="before">
-                <property name="label" translatable="yes" context="wrappage|before">Be_fore</property>
+              <!-- n-columns=1 n-rows=2 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="image-position">top</property>
-                <property name="always-show-image">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="group">none</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="before-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|before">Wraps text on the left side of the object if there is enough space.</property>
+                <child>
+                  <object class="GtkImage" id="afterimg">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="after">
+                    <property name="label" translatable="yes" context="wrappage|after">Aft_er</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">none</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="after-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|after">Wraps text on the right side of the object if there is enough space.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left-attach">1</property>
+                <property name="left-attach">2</property>
                 <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="after">
-                <property name="label" translatable="yes" context="wrappage|after">Aft_er</property>
+              <!-- n-columns=1 n-rows=2 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="image-position">top</property>
-                <property name="always-show-image">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="group">none</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="after-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|after">Wraps text on the right side of the object if there is enough space.</property>
+                <child>
+                  <object class="GtkImage" id="parallelimg">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="parallel">
+                    <property name="label" translatable="yes" context="wrappage|parallel">_Parallel</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">none</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="parallel-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|parallel">Wraps text on all four sides of the border frame of the object.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="parallel">
-                <property name="label" translatable="yes" context="wrappage|parallel">_Parallel</property>
+              <!-- n-columns=1 n-rows=2 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="image-position">top</property>
-                <property name="always-show-image">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="group">none</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="parallel-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|parallel">Wraps text on all four sides of the border frame of the object.</property>
+                <child>
+                  <object class="GtkImage" id="throughimg">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="through">
+                    <property name="label" translatable="yes" context="wrappage|through">Thro_ugh</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">none</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="through-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|through">Places the object in front of the text.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left-attach">0</property>
+                <property name="left-attach">1</property>
                 <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="through">
-                <property name="label" translatable="yes" context="wrappage|through">Thro_ugh</property>
+              <!-- n-columns=1 n-rows=2 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="image-position">top</property>
-                <property name="always-show-image">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="group">none</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="through-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|through">Places the object in front of the text.</property>
+                <child>
+                  <object class="GtkImage" id="noneimg">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="none">
+                    <property name="label" translatable="yes" context="wrappage|none">_Wrap Off</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw-indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="none-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|none">Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </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">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="optimal">
-                <property name="label" translatable="yes" context="wrappage|optimal">_Optimal</property>
+              <!-- n-columns=1 n-rows=2 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="image-position">top</property>
-                <property name="always-show-image">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="group">none</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="optimal-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|optimal">Automatically wraps text to the left, to the right, or on all four sides of the border frame of the object. If the distance between the object and the page margin is less than 2 cm, the text is not wrapped.</property>
+                <child>
+                  <object class="GtkImage" id="optimalimg">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="optimal">
+                    <property name="label" translatable="yes" context="wrappage|optimal">_Optimal</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">none</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="optimal-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|optimal">Automatically wraps text to the left, to the right, or on all four sides of the border frame of the object. If the distance between the object and the page margin is less than 2 cm, the text is not wrapped.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>