cui/source/dialogs/uipickerdlg.cxx | 8 ++++-- cui/uiconfig/ui/uipickerdialog.ui | 46 +------------------------------------ include/vcl/tabs.hrc | 2 + 3 files changed, 10 insertions(+), 46 deletions(-)
New commits: commit 984deb93df3ec0c2eac634b50f2af6babcc78fd7 Author: Heiko Tietze <[email protected]> AuthorDate: Mon Aug 11 11:24:01 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Mon Aug 11 13:13:16 2025 +0200 Related tdf#167869 - Apply VT style to n<4 dialogs in cui UI Picker Change-Id: I386cc4612f7c61d723fb2e47c975ddbef0b2acee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189354 Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Jenkins diff --git a/cui/source/dialogs/uipickerdlg.cxx b/cui/source/dialogs/uipickerdlg.cxx index 8c74bc5df849..0b567ddc0891 100644 --- a/cui/source/dialogs/uipickerdlg.cxx +++ b/cui/source/dialogs/uipickerdlg.cxx @@ -18,6 +18,8 @@ #include <strings.hrc> #include <unotools/confignode.hxx> +#include <vcl/tabs.hrc> + UIPickerDialog::UIPickerDialog(weld::Window* pParent) : SfxTabDialogController(pParent, u"cui/ui/uipickerdialog.ui"_ustr, u"UIPickerDialog"_ustr) , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) @@ -25,8 +27,10 @@ UIPickerDialog::UIPickerDialog(weld::Window* pParent) , m_xCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr)) // Close , m_xResetBtn(m_xBuilder->weld_button(u"reset"_ustr)) // Apply to All { - AddTabPage("uimode", UITabPage::Create, nullptr); - AddTabPage("toolbars", ToolbarTabPage::Create, nullptr); + AddTabPage("uimode", TabResId(RID_TAB_UIMODE.aLabel), UITabPage::Create, + RID_L + RID_TAB_UIMODE.sIconName); + AddTabPage("toolbars", TabResId(RID_TAB_TOOLBARS.aLabel), ToolbarTabPage::Create, + RID_L + RID_TAB_TOOLBARS.sIconName); m_xOKBtn->set_visible(false); m_xCancelBtn->set_label(CuiResId(RID_CUISTR_HYPDLG_CLOSEBUT)); // "close" diff --git a/cui/uiconfig/ui/uipickerdialog.ui b/cui/uiconfig/ui/uipickerdialog.ui index 35c937156007..37a00f3e97c2 100644 --- a/cui/uiconfig/ui/uipickerdialog.ui +++ b/cui/uiconfig/ui/uipickerdialog.ui @@ -106,52 +106,10 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> <property name="enable-popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="uimode"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="uipickerdialog|uimode">User Interface</property> - </object> - <packing> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <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="GtkLabel" id="toolbars"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="uipickerdialog|toolbars">Toolbars</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc index 610597e2f8ca..0569ec62bc6e 100644 --- a/include/vcl/tabs.hrc +++ b/include/vcl/tabs.hrc @@ -150,6 +150,8 @@ inline constexpr TabData RID_TAB_NOTEBOOKBARS{ NC_("RID_TAB_NOTEBOOKBARS", "Note 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 }; +// ui mode +inline constexpr TabData RID_TAB_UIMODE{ NC_("RID_TAB_UIMODE", "UI Mode"), u"toggletabbarvisibility.png"_ustr }; // envelope inline constexpr TabData RID_TAB_ENVELOPE{ NC_("RID_TAB_ENVELOPE", "Envelope"), u"insertenvelope.png"_ustr }; inline constexpr TabData RID_TAB_ENV_FORMAT{ NC_("RID_TAB_ENV_FORMAT", "Format"), u"distributeverttop.png"_ustr };
