From cccc98921e04bd16651b8ff92f82ff9073a1b12c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 4 Mar 2021 10:41:37 +0000 Subject: master slide panel shouldn't have "more options" button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit default the toolbox to hidden and show it if "more options" is enabled Change-Id: I6ff867268809d949e7854e0e76d3e45c8806797b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111953 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sfx2/source/sidebar/DeckTitleBar.cxx | 2 +- sfx2/source/sidebar/PanelTitleBar.cxx | 4 ++-- sfx2/uiconfig/ui/decktitlebar.ui | 2 +- sfx2/uiconfig/ui/paneltitlebar.ui | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 91d95d69f264..59e9aa0db6c8 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -119,7 +119,7 @@ void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) mbIsCloserVisible = bIsCloserVisible; - mxToolBox->set_item_visible("button", mbIsCloserVisible); + mxToolBox->set_visible(mbIsCloserVisible); } void DeckTitleBar::HandleToolBoxItemClick() diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 7f2ff3214722..ddde9ca7aa6f 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -91,7 +91,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, return; if (!msMoreOptionsCommand.isEmpty()) - mxToolBox->set_item_visible(msIdent, false); + mxToolBox->hide(); msMoreOptionsCommand = rsCommandName; @@ -108,7 +108,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, ControllerFactory::CreateToolBoxController( *mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame, rxController, true); - mxToolBox->set_item_visible(msIdent, true); + mxToolBox->show(); } void PanelTitleBar::HandleToolBoxItemClick() diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui index bbfcba7bf69b..8c34a7d5b415 100644 --- a/sfx2/uiconfig/ui/decktitlebar.ui +++ b/sfx2/uiconfig/ui/decktitlebar.ui @@ -52,8 +52,8 @@ - True False + True icons False 2 diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui b/sfx2/uiconfig/ui/paneltitlebar.ui index 2e352bf21a4f..eac7c877cf2e 100644 --- a/sfx2/uiconfig/ui/paneltitlebar.ui +++ b/sfx2/uiconfig/ui/paneltitlebar.ui @@ -59,8 +59,8 @@ - True False + True icons False 2 -- cgit