ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Related tdf#158880 - [API CHANGE] Rename ToolbarModeDialog to UIPicker

Browse Source 
The scope of this dialog has changed with 98d1ac254bd62dff9d0aa9c72ba879d1d52495ef
and it's not just an UI for the ToolbarMode namespace

* Toolbarmodedlg* renamed to UIPIckerdlg*
* UNO command ToolbarModeUI renamed to UIPicker
* SID_TOOLBAR_MODE_UI renamed to SID_UI_PICKER

Change-Id: Id4d617aeee83ae1800d4b9a2d207d28c391dcdb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185789
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Heiko Tietze
2025-05-28 14:48:35 +02:00
committed by Heiko Tietze
parent ec7389d597
commit 043b186d10
33 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/IwyuFilter_cui.yaml
+1 -1
View File
@@ -30,7 +30,7 @@ excludelist:
cui/source/dialogs/tipofthedaydlg.cxx:
# Needed for direct member access
- com/sun/star/beans/PropertyValue.hpp
cui/source/dialogs/toolbarmodedlg.cxx:
cui/source/dialogs/uipickerdlg.cxx:
# Needed for direct member access
- com/sun/star/beans/PropertyValue.hpp
cui/source/tabpages/numfmt.cxx:
cui/Library_cui.mk
+1 -1
View File
@@ -160,7 +160,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/splitcelldlg \
cui/source/dialogs/srchxtra \
cui/source/dialogs/thesdlg \
cui/source/dialogs/toolbarmodedlg \
cui/source/dialogs/uipickerdlg \
cui/source/dialogs/whatsnewtabpage \
cui/source/dialogs/uitabpage \
cui/source/dialogs/toolbartabpage \
cui/UIConfig_cui.mk
+1 -1
View File
@@ -221,7 +221,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/textdialog \
cui/uiconfig/ui/textflowpage \
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/toolbarmodedialog \
cui/uiconfig/ui/uipickerdialog \
cui/uiconfig/ui/uitabpage \
cui/uiconfig/ui/toolbartabpage \
cui/uiconfig/ui/transparencytabpage \
cui/inc/tipoftheday.hrc
+1 -1
View File
@@ -51,7 +51,7 @@ enum tipModule : sal_uInt8
const std::tuple<TranslateId, OUString, OUString, tipModule> TIPOFTHEDAY_STRINGARRAY[] =
{
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME offers a variety of user interface options to make you feel at home"), ".uno:ToolbarModeUI", "toolbarmode.png", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME offers a variety of user interface options to make you feel at home"), ".uno:UIPicker", "toolbarmode.png", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to allow changes to parts of a read-only document in Writer? Insert frames or sections that can authorize changes."), "https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_edit.html", "", swriter}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to File ▸ Print ▸ %PRODUCTNAME Impress tab and select Notes under Document ▸ Type."), "", "printnote.png", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user profile, or to restore a non-working %PRODUCTNAME, use Help ▸ Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", "", soffice}, //https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
cui/source/dialogs/toolbarmodedlg.cxx → cui/source/dialogs/uipickerdlg.cxx
+9 -9
View File
@@ -7,7 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <toolbarmodedlg.hxx>
#include <uipickerdlg.hxx>
#include <uitabpage.hxx>
#include <toolbartabpage.hxx>
#include <comphelper/dispatchcommand.hxx>
@@ -17,9 +18,8 @@
#include <strings.hrc>
#include <unotools/confignode.hxx>
ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
: SfxTabDialogController(pParent, u"cui/ui/toolbarmodedialog.ui"_ustr,
u"ToolbarModeDialog"_ustr)
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))
, m_xApplyBtn(m_xBuilder->weld_button(u"apply"_ustr)) // Apply to %Module
, m_xCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr)) // Close
@@ -37,24 +37,24 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
CuiResId(RID_CUISTR_UI_APPLY).replaceFirst("%MODULE", UITabPage::GetCurrentApp()));
m_xApplyBtn->set_from_icon_name("sw/res/sc20558.png");
m_xResetBtn->set_label(CuiResId(RID_CUISTR_UI_APPLYALL));
m_xApplyBtn->connect_clicked(LINK(this, ToolbarmodeDialog, OnApplyClick));
m_xResetBtn->connect_clicked(LINK(this, ToolbarmodeDialog, OnApplyClick));
m_xApplyBtn->connect_clicked(LINK(this, UIPickerDialog, OnApplyClick));
m_xResetBtn->connect_clicked(LINK(this, UIPickerDialog, OnApplyClick));
}
void ToolbarmodeDialog::ActivatePage(const OUString& rPage)
void UIPickerDialog::ActivatePage(const OUString& rPage)
{
const bool bOn(rPage == "uimode");
m_xApplyBtn->set_visible(bOn); // preferably set_active() but not (yet) available
m_xResetBtn->set_visible(bOn);
}
IMPL_LINK(ToolbarmodeDialog, OnApplyClick, weld::Button&, rButton, void)
IMPL_LINK(UIPickerDialog, OnApplyClick, weld::Button&, rButton, void)
{
UITabPage* pUITabPage = static_cast<UITabPage*>(GetCurTabPage());
OUString sCmd = pUITabPage->GetSelectedMode();
if (sCmd.isEmpty())
{
SAL_WARN("cui.dialogs", "ToolbarmodeDialog: no mode selected");
SAL_WARN("cui.dialogs", "UIPickerDialog: no mode selected");
return;
}
cui/source/factory/dlgfact.cxx
+3 -3
View File
@@ -94,7 +94,7 @@
#include <thesdlg.hxx>
#include <tipofthedaydlg.hxx>
#include <widgettestdlg.hxx>
#include <toolbarmodedlg.hxx>
#include <uipickerdlg.hxx>
#include <DiagramDialog.hxx>
#include <fileextcheckdlg.hxx>
#include <TextColumnsPage.hxx>
@@ -1590,9 +1590,9 @@ AbstractDialogFactory_Impl::CreateWidgetTestDialog(weld::Window* pParent)
}
VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateToolbarmodeDialog(weld::Window* pParent)
AbstractDialogFactory_Impl::CreateUIPickerDialog(weld::Window* pParent)
{
return VclPtr<CuiAbstractController_Impl<ToolbarmodeDialog>>::Create(pParent);
return VclPtr<CuiAbstractController_Impl<UIPickerDialog>>::Create(pParent);
}
VclPtr<AbstractDiagramDialog>
cui/source/factory/dlgfact.hxx
+1 -1
View File
@@ -219,7 +219,7 @@ public:
virtual VclPtr<VclAbstractDialog> CreateWidgetTestDialog(weld::Window* pParent) override;
virtual VclPtr<VclAbstractDialog> CreateToolbarmodeDialog(weld::Window* pParent) override;
virtual VclPtr<VclAbstractDialog> CreateUIPickerDialog(weld::Window* pParent) override;
virtual VclPtr<AbstractDiagramDialog> CreateDiagramDialog(
weld::Window* pParent,
cui/source/inc/toolbarmodedlg.hxx → cui/source/inc/uipickerdlg.hxx
+2 -3
View File
@@ -10,9 +10,8 @@
#pragma once
#include <sfx2/tabdlg.hxx>
#include "uitabpage.hxx"
class ToolbarmodeDialog : public SfxTabDialogController
class UIPickerDialog : public SfxTabDialogController
{
private:
std::unique_ptr<weld::Button> m_xOKBtn;
@@ -26,7 +25,7 @@ private:
DECL_LINK(OnApplyClick, weld::Button&, void);
public:
ToolbarmodeDialog(weld::Window* pParent);
UIPickerDialog(weld::Window* pParent);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
cui/uiconfig/ui/toolbarmodedialog.ui → cui/uiconfig/ui/uipickerdialog.ui
+6 -6
View File
@@ -2,10 +2,10 @@
<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="ToolbarModeDialog">
<object class="GtkDialog" id="UIPickerDialog">
<property name="can-focus">False</property>
<property name="border-width">6</property>
<property name="title" translatable="yes" context="toolbarmodedialog|ToolbarModeDialog">Select Your Preferred User Interface</property>
<property name="title" translatable="yes" context="uipickerdialog|UIPickerDialog">Select Your Preferred User Interface</property>
<property name="modal">True</property>
<property name="default-width">0</property>
<property name="default-height">0</property>
@@ -122,7 +122,7 @@
<object class="GtkLabel" id="uimode">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="toolbarmodedialog|uimode">User Interface</property>
<property name="label" translatable="yes" context="uipickerdialog|uimode">User Interface</property>
</object>
<packing>
<property name="tab-fill">False</property>
@@ -145,7 +145,7 @@
<object class="GtkLabel" id="toolbars">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="toolbarmodedialog|toolbars">Toolbars</property>
<property name="label" translatable="yes" context="uipickerdialog|toolbars">Toolbars</property>
</object>
<packing>
<property name="position">1</property>
@@ -169,8 +169,8 @@
<action-widget response="102">apply</action-widget>
</action-widgets>
<child internal-child="accessible">
<object class="AtkObject" id="ToolbarModeDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="toolbarmodedialog|extended_tip|ToolbarModeDialog">Sets the fill properties of the selected drawing object.</property>
<object class="AtkObject" id="UIPickerDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="uipickerdialog|extended_tip|UIPickerDialog">Sets the fill properties of the selected drawing object.</property>
</object>
</child>
</object>
cui/uiconfig/ui/uitabpage.ui
+11 -11
View File
@@ -24,7 +24,7 @@
<property name="spacing">3</property>
<child>
<object class="GtkRadioButton" id="rbButton1">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton1">Standard Toolbar</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton1">Standard Toolbar</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -41,7 +41,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton2">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton2">Tabbed</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton2">Tabbed</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -69,7 +69,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton3">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton3">Single Toolbar</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton3">Single Toolbar</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -86,7 +86,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton4">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton4">Sidebar</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton4">Sidebar</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -103,7 +103,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton5">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton5">Tabbed Compact</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton5">Tabbed Compact</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -120,7 +120,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton6">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton6">Groupedbar</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton6">Groupedbar</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -137,7 +137,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton7">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton7">Groupedbar Compact</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton7">Groupedbar Compact</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -154,7 +154,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton8">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton8">Contextual Single</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton8">Contextual Single</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -171,7 +171,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rbButton9">
<property name="label" translatable="yes" context="ToolbarmodeDialog|radiobutton9">Contextual Groups</property>
<property name="label" translatable="yes" context="UITabPage|radiobutton9">Contextual Groups</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -192,7 +192,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="ToolbarmodeDialog|leftframe">Options</property>
<property name="label" translatable="yes" context="UITabPage|leftframe">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -290,7 +290,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="ToolbarmodeDialog|rightframe">Preview</property>
<property name="label" translatable="yes" context="UITabPage|rightframe">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
include/sfx2/sfxdlg.hxx
+1 -1
View File
@@ -164,7 +164,7 @@ public:
virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* _pParent) = 0;
virtual VclPtr<VclAbstractDialog> CreateToolbarmodeDialog(weld::Window* _pParent) = 0;
virtual VclPtr<VclAbstractDialog> CreateUIPickerDialog(weld::Window* _pParent) = 0;
virtual VclPtr<VclAbstractDialog> CreateWidgetTestDialog(weld::Window* _pParent) = 0;
include/sfx2/sfxsids.hrc
+1 -1
View File
@@ -292,7 +292,7 @@ class SvxZoomItem;
#define SID_REPLACEABLE TypedWhichId<SfxBoolItem>(SID_SFX_START + 1739)
#define SID_ADDITIONS_DIALOG (SID_SFX_START + 1740)
#define FN_PARAM_ADDITIONS_TAG TypedWhichId<SfxStringItem>(SID_SFX_START + 1741)
#define SID_TOOLBAR_MODE_UI (SID_SFX_START + 1742)
#define SID_UI_PICKER (SID_SFX_START + 1742)
#define SID_TOOLBAR_LOCK TypedWhichId<SfxBoolItem>(SID_SFX_START + 1743)
#define SID_WIDGET_TEST_DIALOG (SID_SFX_START + 1744)
#define FN_CHANGE_THEME (SID_SFX_START + 1745)
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+1 -1
View File
@@ -6404,7 +6404,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>1</value>
</prop>
</node>
<node oor:name=".uno:ToolbarModeUI" oor:op="replace">
<node oor:name=".uno:UIPicker" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">User ~Interface...</value>
</prop>
sc/uiconfig/scalc/menubar/menubar.xml
+1 -1
View File
@@ -149,7 +149,7 @@
<menu:menuitem menu:id=".uno:NormalViewMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:PagebreakMode" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars" menu:style="text"/>
<menu:menuitem menu:id=".uno:InputLineVisible" menu:style="text"/>
<menu:menuitem menu:id=".uno:StatusBarVisible" menu:style="text"/>
sc/uiconfig/scalc/popupmenu/notebookbar.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<menu:menuitem menu:id=".uno:RecentFileList"/>
<menu:menuitem menu:id=".uno:CloseDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:ConfigureDialog"/>
<menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+2 -2
View File
@@ -1929,10 +1929,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuSettings-ToolbarModeUI">
<object class="GtkMenuItem" id="MenuSettings-UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+2 -2
View File
@@ -2464,10 +2464,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuSettings-ToolbarModeUI">
<object class="GtkMenuItem" id="MenuSettings-UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
sd/uiconfig/sdraw/menubar/menubar.xml
+1 -1
View File
@@ -114,7 +114,7 @@
<menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars" menu:style="text"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:StatusBarVisible" menu:style="text"/>
sd/uiconfig/sdraw/popupmenu/notebookbar.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<menu:menuitem menu:id=".uno:RecentFileList"/>
<menu:menuitem menu:id=".uno:CloseDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:ConfigureDialog"/>
<menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+2 -2
View File
@@ -2348,10 +2348,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuSettings-ToolbarModeUI">
<object class="GtkMenuItem" id="MenuSettings-UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
sd/uiconfig/simpress/menubar/menubar.xml
+1 -1
View File
@@ -119,7 +119,7 @@
<menu:menuitem menu:id=".uno:NotesMasterPage" menu:style="radio"/>
<menu:menuitem menu:id=".uno:HandoutMode" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars" menu:style="text"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:StatusBarVisible" menu:style="text"/>
sd/uiconfig/simpress/popupmenu/notebookbar.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<menu:menuitem menu:id=".uno:RecentFileList"/>
<menu:menuitem menu:id=".uno:CloseDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:ConfigureDialog"/>
<menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+2 -2
View File
@@ -2334,10 +2334,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuSettings-ToolbarModeUI">
<object class="GtkMenuItem" id="MenuSettings-UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+2 -2
View File
@@ -2193,10 +2193,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="ToolbarModeUI">
<object class="GtkMenuItem" id="UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
sfx2/sdi/appslots.sdi
+1 -1
View File
@@ -176,7 +176,7 @@ interface Application
ExecMethod = MiscExec_Impl ;
StateMethod = MiscState_Impl ;
]
SID_TOOLBAR_MODE_UI
SID_UI_PICKER
[
ExecMethod = MiscExec_Impl ;
]
sfx2/sdi/sfx.sdi
+1 -1
View File
@@ -5493,7 +5493,7 @@ SfxVoidItem ToolbarMode SID_TOOLBAR_MODE
GroupId = SfxGroupId::Application;
]
SfxVoidItem ToolbarModeUI SID_TOOLBAR_MODE_UI
SfxVoidItem UIPicker SID_UI_PICKER
[
AutoUpdate = FALSE,
FastCall = FALSE,
sfx2/source/appl/appserv.cxx
+2 -2
View File
@@ -1206,11 +1206,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
bDone = true;
break;
}
case SID_TOOLBAR_MODE_UI:
case SID_UI_PICKER:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
ScopedVclPtr<VclAbstractDialog> pDlg(
pFact->CreateToolbarmodeDialog(rReq.GetFrameWeld()));
pFact->CreateUIPickerDialog(rReq.GetFrameWeld()));
pDlg->Execute();
bDone = true;
break;
static/CustomTarget_emscripten_fs_image.mk
+1 -1
View File
@@ -235,7 +235,7 @@ gb_emscripten_fs_image_files := \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/textdialog.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/textflowpage.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/thesaurus.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/toolbarmodedialog.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/uipickerdialog.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/transparencytabpage.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/tsaurldialog.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/twolinespage.ui \
sw/uiconfig/swriter/menubar/menubar.xml
+1 -1
View File
@@ -191,7 +191,7 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars" menu:style="text"/>
<menu:menuitem menu:id=".uno:StatusBarVisible" menu:style="text"/>
<menu:menuseparator/>
sw/uiconfig/swriter/popupmenu/notebookbar.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<menu:menuitem menu:id=".uno:RecentFileList"/>
<menu:menuitem menu:id=".uno:CloseDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarModeUI"/>
<menu:menuitem menu:id=".uno:UIPicker"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:ConfigureDialog"/>
<menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+2 -2
View File
@@ -2900,10 +2900,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuSettings-ToolbarModeUI">
<object class="GtkMenuItem" id="MenuSettings-UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+2 -2
View File
@@ -3088,10 +3088,10 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuSettings-ToolbarModeUI">
<object class="GtkMenuItem" id="MenuSettings-UIPicker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ToolbarModeUI</property>
<property name="action_name">.uno:UIPicker</property>
</object>
</child>
<child>
vcl/qt5/QtInstanceBuilder.cxx
+1 -1
View File
@@ -86,7 +86,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W
u"cui/ui/spelloptionsdialog.ui"_ustr,
u"cui/ui/splitcellsdialog.ui"_ustr,
u"cui/ui/tipofthedaydialog.ui"_ustr,
u"cui/ui/toolbarmodedialog.ui"_ustr,
u"cui/ui/uipickerdialog.ui"_ustr,
u"cui/ui/toolbartabpage.ui"_ustr,
u"cui/ui/uitabpage.ui"_ustr,
u"cui/ui/welcomedialog.ui"_ustr,