Direct cursor fillmode as combobox

UI only update of many radio buttons into one
combo box to comply with HIG

Change-Id: If96ee339159def4c3dfa5d3b2f9adb218d1faee3
Reviewed-on: https://gerrit.libreoffice.org/84864
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

1 files changed, 33 insertions, 99 deletions

diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui
index 209de810ac5b..d150bf5d68d4 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -324,115 +324,49 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="fillmode">
+                          <object class="GtkBox" id="bxFillMode">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="optformataidspage|fillmode">Insert</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">12</property>
+                            <property name="margin_left">18</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="fillmode">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="optformataidspage|fillmode">Insert:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">cxDirectCursorFillMode</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
                             <child>
-                              <object class="GtkGrid" id="grid4">
+                              <object class="GtkComboBoxText" id="cxDirectCursorFillMode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="fillmargin">
-                                    <property name="label" translatable="yes" context="optformataidspage|fillmargin">Para_graph alignment</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="fillindent">
-                                    <property name="label" translatable="yes" context="optformataidspage|fillindent">_Left paragraph margin</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">fillmargin</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="filltab">
-                                    <property name="label" translatable="yes" context="optformataidspage|filltab">_Tabs</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">fillmargin</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="filltabandspace">
-                                    <property name="label" translatable="yes" context="optformataidspage|filltabandspace">Tabs a_nd spaces</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">fillmargin</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="fillspace">
-                                    <property name="label" translatable="yes" context="optformataidspage|fillspace">_Spaces</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">fillmargin</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">4</property>
-                                  </packing>
-                                </child>
+                                <property name="active_id">2</property>
+                                <items>
+                                  <item id="0" translatable="yes" context="optformataidspage|filltab">Tabs</item>
+                                  <item id="1" translatable="yes" context="optformataidspage|filltabandspace">Tabs and spaces</item>
+                                  <item id="2" translatable="yes" context="optformataidspage|fillspace">Spaces</item>
+                                  <item id="3" translatable="yes" context="optformataidspage|fillindent">Left paragraph margin</item>
+                                  <item id="4" translatable="yes" context="optformataidspage|fillmargin">Paragraph alignment</item>
+                                </items>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                       </object>