From fd9b1fbcae5d90d7e542dae999cffda9a0f928f0 Mon Sep 17 00:00:00 2001
From: Ayhan Yalçınsoy <ayhanyalcinsoy@pisilinux.org>
Date: Tue, 16 Mar 2021 08:02:54 +0300
Subject: tdf#137925: UI: Preferred user interface rearranged

Change-Id: Ic943460fd45fbfb77774f1bff3f5cd152b57b7e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112553
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
---
 cui/uiconfig/ui/toolbarmodedialog.ui | 68 ++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 27 deletions(-)

(limited to 'cui')

diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui b/cui/uiconfig/ui/toolbarmodedialog.ui
index 9483f977e167..b7c6427ef7b3 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -15,6 +15,9 @@
     <property name="modal">True</property>
     <property name="window-position">center-on-parent</property>
     <property name="type-hint">dialog</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox">
         <property name="can-focus">False</property>
@@ -103,8 +106,8 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">3</property>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton1">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton1">Standard Toolbar</property>
+                      <object class="GtkRadioButton" id="rbButton4">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton4">Tabbed</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -112,6 +115,7 @@
                         <property name="valign">start</property>
                         <property name="active">True</property>
                         <property name="draw-indicator">True</property>
+                        <property name="group">rbButton1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -120,8 +124,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton4">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton4">Tabbed</property>
+                      <object class="GtkRadioButton" id="rbButton1">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton1">Standard Toolbar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -129,17 +133,27 @@
                         <property name="valign">start</property>
                         <property name="active">True</property>
                         <property name="draw-indicator">True</property>
-                        <property name="group">rbButton1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton5">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton5">Tabbed Compact</property>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="rbButton2">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton2">Single Toolbar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -152,12 +166,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton7">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton7">Groupedbar</property>
+                      <object class="GtkRadioButton" id="rbButton3">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton3">Sidebar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -170,12 +184,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton6">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton6">Groupedbar Compact</property>
+                      <object class="GtkRadioButton" id="rbButton5">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton5">Tabbed Compact</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -188,12 +202,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton8">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton8">Contextual Single</property>
+                      <object class="GtkRadioButton" id="rbButton7">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton7">Groupedbar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -206,12 +220,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton9">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton9">Contextual Groups</property>
+                      <object class="GtkRadioButton" id="rbButton6">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton6">Groupedbar Compact</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -224,12 +238,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">8</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton2">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton2">Single Toolbar</property>
+                      <object class="GtkRadioButton" id="rbButton8">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton8">Contextual Single</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -242,12 +256,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">9</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton3">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton3">Sidebar</property>
+                      <object class="GtkRadioButton" id="rbButton9">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton9">Contextual Groups</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -260,7 +274,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">10</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                   </object>
-- 
cgit