cui/source/customize/cfg.cxx          |   20 -
 cui/source/dialogs/sdrcelldlg.cxx     |   49 +--
 cui/source/dialogs/srchxtra.cxx       |   37 +-
 cui/uiconfig/ui/customizedialog.ui    |  364 +----------------------
 cui/uiconfig/ui/formatcellsdialog.ui  |  535 ----------------------------------
 cui/uiconfig/ui/searchformatdialog.ui |  518 +-------------------------------
 include/vcl/tabs.hrc                  |    7 
 7 files changed, 111 insertions(+), 1419 deletions(-)

New commits:
commit ca6511135864a6d195c31f517e87be9baa16052b
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Wed Aug 6 11:47:12 2025 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Aug 6 13:18:50 2025 +0200

    Related tdf#167446 - UI-less tab style (cui)
    
    Change-Id: I09a69bc3b36342251c71cf1e2456f2c239bb0811
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188998
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
    Tested-by: Jenkins

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6921bf796b95..a06c2504fa88 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -94,6 +94,8 @@
 #include <comphelper/processfactory.hxx>
 #include <config_features.h>
 
+#include <vcl/tabs.hrc>
+
 namespace uno = css::uno;
 namespace frame = css::frame;
 namespace lang = css::lang;
@@ -210,12 +212,18 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, 
const SfxItemSet* pInSe
 {
     SvxConfigPageHelper::InitImageType();
 
-    AddTabPage(u"menus"_ustr, CreateSvxMenuConfigPage, nullptr);
-    AddTabPage(u"toolbars"_ustr, CreateSvxToolbarConfigPage, nullptr);
-    AddTabPage(u"notebookbar"_ustr, CreateSvxNotebookbarConfigPage, nullptr);
-    AddTabPage(u"contextmenus"_ustr, CreateSvxContextMenuConfigPage, nullptr);
-    AddTabPage(u"keyboard"_ustr, CreateKeyboardConfigPage, nullptr);
-    AddTabPage(u"events"_ustr, CreateSvxEventConfigPage, nullptr);
+    AddTabPage(u"menus"_ustr, TabResId(RID_TAB_MENUS.aLabel), 
CreateSvxMenuConfigPage,
+               RID_L + RID_TAB_MENUS.sIconName);
+    AddTabPage(u"toolbars"_ustr, TabResId(RID_TAB_TOOLBARS.aLabel), 
CreateSvxToolbarConfigPage,
+               RID_L + RID_TAB_TOOLBARS.sIconName);
+    AddTabPage(u"notebookbar"_ustr, TabResId(RID_TAB_NOTEBOOKBARS.aLabel),
+               CreateSvxNotebookbarConfigPage, RID_L + 
RID_TAB_NOTEBOOKBARS.sIconName);
+    AddTabPage(u"contextmenus"_ustr, TabResId(RID_TAB_CONTEXTMENUS.aLabel),
+               CreateSvxContextMenuConfigPage, RID_L + 
RID_TAB_CONTEXTMENUS.sIconName);
+    AddTabPage(u"keyboard"_ustr, TabResId(RID_TAB_KEYBOARD.aLabel), 
CreateKeyboardConfigPage,
+               RID_L + RID_TAB_KEYBOARD.sIconName);
+    AddTabPage(u"events"_ustr, TabResId(RID_TAB_EVENTS.aLabel), 
CreateSvxEventConfigPage,
+               RID_L + RID_TAB_EVENTS.sIconName);
 
     if (const SfxPoolItem* pItem = pInSet->GetItem(SID_CONFIG))
     {
diff --git a/cui/source/dialogs/sdrcelldlg.cxx 
b/cui/source/dialogs/sdrcelldlg.cxx
index be4e1fd15433..8de1cfa0dc3f 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -28,6 +28,8 @@
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 
+#include <vcl/tabs.hrc>
+
 SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const 
SfxItemSet& rAttr, const SdrModel& rModel, bool bStyle)
     : SfxTabDialogController(pParent, u"cui/ui/formatcellsdialog.ui"_ustr, 
u"FormatCellsDialog"_ustr, &rAttr, bStyle)
     , mrOutAttrs(rAttr)
@@ -38,33 +40,32 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* 
pParent, const SfxItemS
     , mpBitmapList(rModel.GetBitmapList())
     , mpPatternList(rModel.GetPatternList())
 {
-    AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME);
-    AddTabPage(u"fonteffects"_ustr, RID_SVXPAGE_CHAR_EFFECTS);
-    AddTabPage(u"border"_ustr, RID_SVXPAGE_BORDER );
-    AddTabPage(u"area"_ustr, RID_SVXPAGE_AREA);
-
+    AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel), 
RID_SVXPAGE_CHAR_NAME,
+               RID_M + RID_TAB_FONT.sIconName);
+    AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel), 
RID_SVXPAGE_CHAR_EFFECTS,
+               RID_M + RID_TAB_FONTEFFECTS.sIconName);
     if (bStyle)
     {
-        AddTabPage(u"position"_ustr, RID_SVXPAGE_CHAR_POSITION);
-        AddTabPage(u"highlight"_ustr, RID_SVXPAGE_BKG);
-        AddTabPage(u"indentspacing"_ustr, RID_SVXPAGE_STD_PARAGRAPH);
-        AddTabPage(u"alignment"_ustr, SvxParaAlignTabPage::Create, 
SvxParaAlignTabPage::GetSdrRanges);
-        RemoveTabPage(u"shadow"_ustr);
+        AddTabPage(u"position"_ustr, TabResId(RID_TAB_POSITION.aLabel), 
RID_SVXPAGE_CHAR_POSITION,
+                   RID_M + RID_TAB_POSITION.sIconName);
+        AddTabPage(u"highlight"_ustr, TabResId(RID_TAB_HIGHLIGHTING.aLabel), 
RID_SVXPAGE_BKG,
+                   RID_M + RID_TAB_HIGHLIGHTING.sIconName);
+        AddTabPage(u"indentspacing"_ustr, TabResId(RID_TAB_INDENTS.aLabel),
+                   RID_SVXPAGE_STD_PARAGRAPH, RID_M + 
RID_TAB_INDENTS.sIconName);
+        if (SvtCJKOptions::IsAsianTypographyEnabled())
+            AddTabPage(u"asian"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel), 
RID_SVXPAGE_PARA_ASIAN,
+                       RID_M + RID_TAB_ASIANTYPO.sIconName);
+        AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel),
+                   SvxParaAlignTabPage::Create, 
SvxParaAlignTabPage::GetSdrRanges,
+                   RID_M + RID_TAB_ALIGNMENT.sIconName);
     }
-    else
-    {
-        RemoveTabPage(u"position"_ustr);
-        RemoveTabPage(u"highlight"_ustr);
-        RemoveTabPage(u"indentspacing"_ustr);
-        RemoveTabPage(u"alignment"_ustr);
-        AddTabPage(u"shadow"_ustr, SvxShadowTabPage::Create, nullptr);
-        RemoveStandardButton();
-    }
-
-    if (bStyle && SvtCJKOptions::IsAsianTypographyEnabled())
-        AddTabPage(u"asian"_ustr, RID_SVXPAGE_PARA_ASIAN);
-    else
-        RemoveTabPage(u"asian"_ustr);
+    AddTabPage(u"border"_ustr, TabResId(RID_TAB_BORDER.aLabel), 
RID_SVXPAGE_BORDER,
+               RID_M + RID_TAB_BORDER.sIconName);
+    AddTabPage(u"area"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), 
RID_SVXPAGE_AREA,
+               RID_M + RID_TAB_BACKGROUND.sIconName);
+    if (!bStyle)
+        AddTabPage(u"shadow"_ustr, TabResId(RID_TAB_SHADOW.aLabel), 
SvxShadowTabPage::Create,
+                   RID_M + RID_TAB_SHADOW.sIconName);
 }
 
 void SvxFormatCellsDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index a67ac828cdcf..7081f2eab84f 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -35,24 +35,31 @@
 #include <tools/resary.hxx>
 #include <vcl/svapp.hxx>
 
+#include <vcl/tabs.hrc>
+
 SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const 
SfxItemSet& rSet)
     : SfxTabDialogController(pParent, u"cui/ui/searchformatdialog.ui"_ustr, 
u"SearchFormatDialog"_ustr, &rSet)
 {
-    AddTabPage(u"font"_ustr, SvxCharNamePage::Create, nullptr);
-    AddTabPage(u"fonteffects"_ustr, SvxCharEffectsPage::Create, nullptr);
-    AddTabPage(u"position"_ustr, SvxCharPositionPage::Create, nullptr);
-    AddTabPage(u"asianlayout"_ustr, SvxCharTwoLinesPage::Create, nullptr);
-    AddTabPage(u"indents"_ustr, SvxStdParagraphTabPage::Create, nullptr);
-    AddTabPage(u"alignment"_ustr, SvxParaAlignTabPage::Create, nullptr);
-    AddTabPage(u"textflow"_ustr, SvxExtParagraphTabPage::Create, nullptr);
-    AddTabPage(u"asiantypo"_ustr, SvxAsianTabPage::Create, nullptr );
-    AddTabPage(u"background"_ustr, SvxBkgTabPage::Create, nullptr);
-
-    // remove asian tabpages if necessary
-    if ( !SvtCJKOptions::IsDoubleLinesEnabled() )
-        RemoveTabPage(u"asianlayout"_ustr);
-    if ( !SvtCJKOptions::IsAsianTypographyEnabled() )
-        RemoveTabPage(u"asiantypo"_ustr);
+    AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel), 
SvxCharNamePage::Create,
+               RID_M + RID_TAB_FONT.sIconName);
+    AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel),
+               SvxCharEffectsPage::Create, RID_M + 
RID_TAB_FONTEFFECTS.sIconName);
+    AddTabPage(u"position"_ustr, TabResId(RID_TAB_POSITION.aLabel), 
SvxCharPositionPage::Create,
+               RID_M + RID_TAB_POSITION.sIconName);
+    if (SvtCJKOptions::IsDoubleLinesEnabled())
+        AddTabPage(u"asianlayout"_ustr, TabResId(RID_TAB_ASIANLAYOUT.aLabel),
+                   SvxCharTwoLinesPage::Create, RID_M + 
RID_TAB_ASIANLAYOUT.sIconName);
+    AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTS.aLabel), 
SvxStdParagraphTabPage::Create,
+               RID_M + RID_TAB_INDENTS.sIconName);
+    AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel), 
SvxParaAlignTabPage::Create,
+               RID_M + RID_TAB_ALIGNMENT.sIconName);
+    AddTabPage(u"textflow"_ustr, TabResId(RID_TAB_TEXTFLOW.aLabel), 
SvxExtParagraphTabPage::Create,
+               RID_M + RID_TAB_TEXTFLOW.sIconName);
+    if (SvtCJKOptions::IsAsianTypographyEnabled())
+        AddTabPage(u"asiantypo"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel), 
SvxAsianTabPage::Create,
+                   RID_M + RID_TAB_ASIANTYPO.sIconName);
+    AddTabPage(u"background"_ustr, TabResId(RID_TAB_HIGHLIGHTING.aLabel), 
SvxBkgTabPage::Create,
+               RID_M + RID_TAB_HIGHLIGHTING.sIconName);
 }
 
 SvxSearchFormatDialog::~SvxSearchFormatDialog()
diff --git a/cui/uiconfig/ui/customizedialog.ui 
b/cui/uiconfig/ui/customizedialog.ui
index ad4117b6715e..d10d7b590c58 100644
--- a/cui/uiconfig/ui/customizedialog.ui
+++ b/cui/uiconfig/ui/customizedialog.ui
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="CustomizeDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" 
context="customizedialog|CustomizeDialog">Customize</property>
     <property name="modal">True</property>
-    <property name="default_width">0</property>
-    <property name="default_height">0</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="default-width">0</property>
+    <property name="default-height">0</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" 
context="stock">_OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -42,8 +39,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" 
context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -56,8 +53,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" 
context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -71,8 +68,8 @@
               <object class="GtkButton" id="reset">
                 <property name="label" translatable="yes" 
context="stock">_Reset</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -85,336 +82,19 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="tabcontrol">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="scrollable">True</property>
             <property name="tab-pos">left</property>
+            <property name="scrollable">True</property>
             <property name="group-name">icons</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="menus">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imMenus">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/32/menubar.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbMenus"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbMenus">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="customizedialog|menus">Menus</property>
-                    <property name="mnemonic-widget">menus</property>
-                    <accessibility>
-                      <relation type="label-for" target="imMenus"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="toolbars">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imToolbars">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/32/showtoolbar.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbToolbars"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbToolbars">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="customizedialog|toolbars">Toolbars</property>
-                    <property name="mnemonic-widget">toolbars</property>
-                    <accessibility>
-                      <relation type="label-for" target="imToolbars"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="notebookbar">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imNotebookbar">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/32/toggletabbarvisibility.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbNotebookbar"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbNotebookbar">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="customizedialog|notebookbar">Notebookbar</property>
-                    <property name="mnemonic-widget">notebookbar</property>
-                    <accessibility>
-                      <relation type="label-for" target="imNotebookbar"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="contextmenus">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imContextmenus">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/32/listbox.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbContextmenus"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbContextmenus">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="customizedialog|contextmenus">Context Menus</property>
-                    <property name="mnemonic-widget">contextmenus</property>
-                    <accessibility>
-                      <relation type="label-for" target="imContextmenus"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="keyboard">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imKeyboard">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/32/underline.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbKeyboard"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbKeyboard">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="customizedialog|keyboard">Keyboard</property>
-                    <property name="mnemonic-widget">keyboard</property>
-                    <accessibility>
-                      <relation type="label-for" target="imKeyboard"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="events">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imEvents">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/32/closedoc.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbEvents"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbEvents">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="customizedialog|events">Events</property>
-                    <property name="mnemonic-widget">events</property>
-                    <accessibility>
-                      <relation type="label-for" target="imEvents"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/formatcellsdialog.ui 
b/cui/uiconfig/ui/formatcellsdialog.ui
index 6d251a8337b6..308cf8ab94f5 100644
--- a/cui/uiconfig/ui/formatcellsdialog.ui
+++ b/cui/uiconfig/ui/formatcellsdialog.ui
@@ -106,541 +106,8 @@
             <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="scrollable">True</property>
             <property name="tab-pos">left</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="font">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fontdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|name">Font</property>
-                    <property name="mnemonic-widget">font</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="fonteffects">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFonteffects">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_color.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFonteffects"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFonteffects">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|effects">Font Effects</property>
-                    <property name="mnemonic-widget">fonteffects</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFonteffects"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="position">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imPosition">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fontwork.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbPosition"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbPosition">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|position">Position</property>
-                    <property name="mnemonic-widget">position</property>
-                    <accessibility>
-                      <relation type="label-for" target="imPosition"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="highlight">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imHighlight">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_backcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbHighlight"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbHighlight">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|highlight">Highlighting</property>
-                    <property name="mnemonic-widget">highlight</property>
-                    <accessibility>
-                      <relation type="label-for" target="imHighlight"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="indentspacing">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imIndentspacing">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_paraspaceincrease.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbIndentspacing"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbIndentspacing">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|indentspacing">Indents &amp; Spacing</property>
-                    <property name="mnemonic-widget">indentspacing</property>
-                    <accessibility>
-                      <relation type="label-for" target="imIndentspacing"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="asian">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAsian">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_defaultcharstyle.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAsian"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAsian">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|asian">Asian Typography</property>
-                    <property name="mnemonic-widget">asian</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAsian"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="alignment">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_alignblock.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|alignment">Alignment</property>
-                    <property name="mnemonic-widget">alignment</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="border">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBorder">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_borderdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBorder"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBorder">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|border">Borders</property>
-                    <property name="mnemonic-widget">border</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBorder"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="area">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imArea">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_backgroundcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbArea"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbArea">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|area">Background</property>
-                    <property name="mnemonic-widget">area</property>
-                    <accessibility>
-                      <relation type="label-for" target="imArea"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">9</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="shadow">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imShadow">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fillshadow.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbShadow"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbShadow">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="formatcellsdialog|shadow">Shadow</property>
-                    <property name="mnemonic-widget">shadow</property>
-                    <accessibility>
-                      <relation type="label-for" target="imShadow"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">9</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
+            <property name="scrollable">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/searchformatdialog.ui 
b/cui/uiconfig/ui/searchformatdialog.ui
index 8e983a2c4d7c..f609c690149a 100644
--- a/cui/uiconfig/ui/searchformatdialog.ui
+++ b/cui/uiconfig/ui/searchformatdialog.ui
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="SearchFormatDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" 
context="searchformatdialog|SearchFormatDialog">Text Format </property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="reset">
                 <property name="label" translatable="yes" 
context="stock">_Reset</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -38,10 +35,10 @@
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" 
context="stock">_OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -54,8 +51,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" 
context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -68,8 +65,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" 
context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -83,493 +80,18 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="tabcontrol">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="scrollable">True</property>
             <property name="tab-pos">left</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="font">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fontdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|font">Font</property>
-                    <property name="mnemonic-widget">font</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="fonteffects">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFonteffects">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_color.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFonteffects"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFonteffects">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|fonteffects">Font Effects</property>
-                    <property name="mnemonic-widget">fonteffects</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFonteffects"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="position">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imPosition">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fontwork.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbPosition"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbPosition">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|position">Position</property>
-                    <property name="mnemonic-widget">position</property>
-                    <accessibility>
-                      <relation type="label-for" target="imPosition"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="asianlayout">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAsianlayout">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_textdirectiontoptobottom.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAsianlayout"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAsianlayout">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|asianlayout">Asian Layout</property>
-                    <property name="mnemonic-widget">asianlayout</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAsianlayout"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="indents">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imParaIndent">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_paraspaceincrease.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbParaIndent"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbParaIndent">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
-                    <property name="mnemonic-widget">indents</property>
-                    <accessibility>
-                      <relation type="label-for" target="imParaIndent"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="alignment">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_alignblock.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|labelTP_PARA_ALIGN">Alignment</property>
-                    <property name="mnemonic-widget">alignment</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="textflow">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imTextflow">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_hyphenate.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbTextflow"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbTextflow">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|labelTP_PARA_EXT">Text Flow</property>
-                    <property name="mnemonic-widget">textflow</property>
-                    <accessibility>
-                      <relation type="label-for" target="imTextflow"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="asiantypo">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAsiantypo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_defaultcharstyle.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAsiantypo"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAsiantypo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|labelTP_PARA_ASIAN">Asian Typography</property>
-                    <property name="mnemonic-widget">asiantypo</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAsiantypo"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="background">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_backcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="searchformatdialog|background">Highlighting</property>
-                    <property name="mnemonic-widget">background</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
+            <property name="scrollable">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index 49a8aeac9df8..624a49e37f09 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -122,6 +122,13 @@ inline constexpr TabData RID_TAB_CHART_LAYOUT{ 
NC_("RID_TAB_CHART_LAYOUT", "Layo
 inline constexpr TabData RID_TAB_CHART_PERSPECTIVE{ 
NC_("RID_TAB_CHART_PERSPECTIVE", "Perspective"), u"window3d.png"_ustr };
 inline constexpr TabData RID_TAB_CHART_APPEARANCE{ 
NC_("RID_TAB_CHART_APPEARANCE", "Appearance"), u"shell3d.png"_ustr };
 inline constexpr TabData RID_TAB_CHART_ILLUMINATION{ 
NC_("RID_TAB_CHART_ILLUMINATION", "Illumination"), u"grafluminance.png"_ustr };
+// customization
+inline constexpr TabData RID_TAB_MENUS{ NC_("RID_TAB_MENUS", "Menus"), 
u"menubar.png"_ustr };
+inline constexpr TabData RID_TAB_TOOLBARS{ NC_("RID_TAB_TOOLBARS", 
"Toolbars"), u"showtoolbar.png"_ustr };
+inline constexpr TabData RID_TAB_NOTEBOOKBARS{ NC_("RID_TAB_NOTEBOOKBARS", 
"Notebookbars"), u"toggletabbarvisibility.png"_ustr };
+inline constexpr TabData RID_TAB_CONTEXTMENUS{ NC_("RID_TAB_CONTEXTMENUS", 
"Context Menus"), u"listbox.png"_ustr };
+inline constexpr TabData RID_TAB_KEYBOARD{ NC_("RID_TAB_KEYBOARD", 
"Keyboard"), u"underline.png"_ustr };
+inline constexpr TabData RID_TAB_EVENTS{ NC_("RID_TAB_EVENTS", "Events"), 
u"closedoc.png"_ustr };
 
 static OUString TabResId(TranslateId aId)
 {

Reply via email to