tdf#137925: UI:Preferred user interface rearranged

Change-Id: I9fe39064093a14917810aecaefdf8b75448f130f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112674
Tested-by: Jenkins
Reviewed-by: V, Stuart Foote <vstuart.foote@utsa.edu>
Reviewed-by: Eyal Rozenberg <eyalroz1@gmx.com>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

2 files changed, 16 insertions, 16 deletions

diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 5838d5244da3..b65851c2eb08 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -20,18 +20,18 @@
 const std::tuple<const char*, OUString, OUString> TOOLBARMODES_ARRAY[] =
 {
     { NC_("RID_CUI_TOOLBARMODES", "Standard user interface with menu, toolbar, and collapsed sidebar. Intended for users who are familiar with the classic interface."), "Default", "default.png" },
+    { NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most similar to the Ribbons used in Microsoft Office. It organizes functions in tabs and makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png" },
     { NC_("RID_CUI_TOOLBARMODES", "Standard user interface but with single-line toolbar. Intended for use on small screens."), "Single", "single.png" },
     { NC_("RID_CUI_TOOLBARMODES", "Standard user interface with expanded sidebar. Expert users who want to quickly change many different properties are advised to use this UI."), "Sidebar", "sidebar.png" },
-    { NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most similar to the Ribbons used in Microsoft Office. It organizes functions in tabs and makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png" },
     { NC_("RID_CUI_TOOLBARMODES", "The Tabbed Compact variant aims to be familiar with the Microsoft Office interface, yet occupying less space for smaller screens."), "notebookbar_compact.ui", "notebookbar_compact.png" },
-    { NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact interface provides access to functions in groups, with icons for most-frequently used features, and dropdown menus for others. This compact variant favors vertical space."), "notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
     { NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to functions in groups, with icons for most-frequently used features, and dropdown menus for others. This full variant favors functions and is slightly larger than others."), "notebookbar_groupedbar_full.ui", "notebookbar_groupedbar_full.png" },
+    { NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact interface provides access to functions in groups, with icons for most-frequently used features, and dropdown menus for others. This compact variant favors vertical space."), "notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
     { NC_("RID_CUI_TOOLBARMODES", "The Contextual Single interface shows functions in a single-line toolbar with context-dependent content."), "notebookbar_single.ui", "notebookbar_single.png" },
     { NC_("RID_CUI_TOOLBARMODES", "The Contextual Groups interface focuses on beginners. It exposes the most frequently used functions on groups with the core action as large icon and a couple of small additional features. All functions have a label. Depending on the context, an additional section provides access to those functions."), "notebookbar_groups.ui", "notebookbar_groups.png" },
 };
 
 //hide experimental UIs
-constexpr int nGroupedbarFull = 6;
+constexpr int nGroupedbarFull = 5;
 constexpr int nContextualGroups = 8;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui b/cui/uiconfig/ui/toolbarmodedialog.ui
index b7c6427ef7b3..37159b96cc2f 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -106,8 +106,8 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">3</property>
                     <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>
@@ -115,7 +115,6 @@
                         <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>
@@ -124,8 +123,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton1">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton1">Standard Toolbar</property>
+                      <object class="GtkRadioButton" id="rbButton2">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton2">Tabbed</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -133,6 +132,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>
@@ -152,8 +152,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton2">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton2">Single Toolbar</property>
+                      <object class="GtkRadioButton" id="rbButton3">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton3">Single Toolbar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -170,8 +170,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton3">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton3">Sidebar</property>
+                      <object class="GtkRadioButton" id="rbButton4">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton4">Sidebar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -206,8 +206,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton7">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton7">Groupedbar</property>
+                      <object class="GtkRadioButton" id="rbButton6">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton6">Groupedbar</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
@@ -224,8 +224,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="rbButton6">
-                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton6">Groupedbar Compact</property>
+                      <object class="GtkRadioButton" id="rbButton7">
+                        <property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton7">Groupedbar Compact</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>