move the explanatory image outside the RadioButton

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

2 files changed, 39 insertions, 18 deletions

diff --git a/cui/uiconfig/ui/splitcellsdialog.ui b/cui/uiconfig/ui/splitcellsdialog.ui
index 305c03a70be4..a95e0613d977 100644
--- a/cui/uiconfig/ui/splitcellsdialog.ui
+++ b/cui/uiconfig/ui/splitcellsdialog.ui
@@ -9,16 +9,6 @@
     <property name="step-increment">1</property>
     <property name="page-increment">5</property>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">svx/res/zetlhor2.png</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">svx/res/zetlver2.png</property>
-  </object>
   <object class="GtkDialog" id="SplitCellsDialog">
     <property name="can-focus">False</property>
     <property name="border-width">6</property>
@@ -162,27 +152,26 @@
                 <property name="label-xalign">0</property>
                 <property name="shadow-type">none</property>
                 <child>
-                  <!-- n-columns=1 n-rows=3 -->
+                  <!-- n-columns=2 n-rows=3 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">12</property>
                     <property name="margin-top">6</property>
                     <property name="row-spacing">6</property>
+                    <property name="column-spacing">3</property>
                     <child>
                       <object class="GtkRadioButton" id="hori">
                         <property name="label" translatable="yes" context="splitcellsdialog|hori">H_orizontally</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
-                        <property name="image">image1</property>
                         <property name="use-underline">True</property>
-                        <property name="always-show-image">True</property>
                         <property name="active">True</property>
                         <property name="draw-indicator">True</property>
                       </object>
                       <packing>
-                        <property name="left-attach">0</property>
+                        <property name="left-attach">1</property>
                         <property name="top-attach">0</property>
                       </packing>
                     </child>
@@ -192,14 +181,12 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
-                        <property name="image">image2</property>
                         <property name="use-underline">True</property>
-                        <property name="always-show-image">True</property>
                         <property name="draw-indicator">True</property>
                         <property name="group">hori</property>
                       </object>
                       <packing>
-                        <property name="left-attach">0</property>
+                        <property name="left-attach">1</property>
                         <property name="top-attach">2</property>
                       </packing>
                     </child>
@@ -214,10 +201,35 @@
                         <property name="draw-indicator">True</property>
                       </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="GtkImage" id="image1">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">svx/res/zetlhor2.png</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="image2">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">svx/res/zetlver2.png</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 34cf8788804e..dd55c73707db 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22309,6 +22309,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "cui/ui/specialcharacters.ui" &&
         rUIFile != "cui/ui/spelloptionsdialog.ui" &&
         rUIFile != "cui/ui/spinbox.ui" &&
+        rUIFile != "cui/ui/splitcellsdialog.ui" &&
         rUIFile != "cui/ui/textflowpage.ui" &&
         rUIFile != "cui/ui/thesaurus.ui" &&
         rUIFile != "cui/ui/tipofthedaydialog.ui" &&
@@ -22430,6 +22431,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "modules/smath/ui/smathsettings.ui" &&
         rUIFile != "modules/smath/ui/spacingdialog.ui" &&
         rUIFile != "modules/smath/ui/symdefinedialog.ui" &&
+        rUIFile != "modules/swriter/ui/autoformattable.ui" &&
         rUIFile != "modules/swriter/ui/autotext.ui" &&
         rUIFile != "modules/swriter/ui/bibliographyentry.ui" &&
         rUIFile != "modules/swriter/ui/bulletsandnumbering.ui" &&
@@ -22440,6 +22442,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "modules/swriter/ui/columndialog.ui" &&
         rUIFile != "modules/swriter/ui/columnpage.ui" &&
         rUIFile != "modules/swriter/ui/columnwidth.ui" &&
+        rUIFile != "modules/swriter/ui/converttexttable.ui" &&
         rUIFile != "modules/swriter/ui/dropcapspage.ui" &&
         rUIFile != "modules/swriter/ui/editcategories.ui" &&
         rUIFile != "modules/swriter/ui/endnotepage.ui" &&
@@ -22448,6 +22451,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "modules/swriter/ui/footnoteareapage.ui" &&
         rUIFile != "modules/swriter/ui/footnotepage.ui" &&
         rUIFile != "modules/swriter/ui/footnotesendnotestabpage.ui" &&
+        rUIFile != "modules/swriter/ui/formattablepage.ui" &&
         rUIFile != "modules/swriter/ui/framedialog.ui" &&
         rUIFile != "modules/swriter/ui/frmaddpage.ui" &&
         rUIFile != "modules/swriter/ui/frmtypepage.ui" &&
@@ -22479,7 +22483,12 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "modules/swriter/ui/rowheight.ui" &&
         rUIFile != "modules/swriter/ui/savelabeldialog.ui" &&
         rUIFile != "modules/swriter/ui/sectionpage.ui" &&
+        rUIFile != "modules/swriter/ui/sortdialog.ui" &&
+        rUIFile != "modules/swriter/ui/splittable.ui" &&
         rUIFile != "modules/swriter/ui/statisticsinfopage.ui" &&
+        rUIFile != "modules/swriter/ui/tablecolumnpage.ui" &&
+        rUIFile != "modules/swriter/ui/tableproperties.ui" &&
+        rUIFile != "modules/swriter/ui/tabletextflowpage.ui" &&
         rUIFile != "modules/swriter/ui/templatedialog8.ui" &&
         rUIFile != "modules/swriter/ui/textgridpage.ui" &&
         rUIFile != "modules/swriter/ui/titlepage.ui" &&