sfx2/source/sidebar/DeckTitleBar.cxx | 4 ++--
sfx2/source/sidebar/PanelTitleBar.cxx | 4 ++--
sfx2/uiconfig/ui/decktitlebar.ui | 4 ++--
sfx2/uiconfig/ui/paneltitlebar.ui | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 9250e8041e854e99fa7e53bb81a43dee987fab7b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 4 10:41:37 2021 +0000
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Mar 9 17:10:17 2021 +0100
master slide panel shouldn't have "more options" button
default the toolbox to hidden and show it if "more options" is enabled
Change-Id: I6ff867268809d949e7854e0e76d3e45c8806797b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111955
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index f7e0a8df7b7e..c797fc274f78 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -121,14 +121,14 @@ void DeckTitleBar::SetCloserVisible (const bool
bIsCloserVisible)
if (mbIsCloserVisible)
{
- mxToolBox->set_item_visible("button", true);
+ mxToolBox->show();
mxToolBox->set_item_icon_name("button", "sfx2/res/closedoc.png");
mxToolBox->set_item_tooltip_text("button",
SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK));
}
else
{
- mxToolBox->set_item_visible("button", false);
+ mxToolBox->hide();
}
}
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index d1ce0ef700e0..1de76008befd 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -98,7 +98,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString&
rsCommandName,
return;
if (!msMoreOptionsCommand.isEmpty())
- mxToolBox->set_item_visible(msIdent, false);
+ mxToolBox->hide();
msMoreOptionsCommand = rsCommandName;
mxFrame = rxFrame;
@@ -116,7 +116,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString&
rsCommandName,
ControllerFactory::CreateToolBoxController(
*mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame,
rxController, true);
- mxToolBox->set_item_visible(msIdent, true);
+ mxToolBox->show();
mxToolBox->set_item_icon_name(msIdent, "sfx2/res/symphony/morebutton.png");
mxToolBox->set_item_tooltip_text(msIdent,
SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS));
}
diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui
index 0e48eddd815f..9349956950b7 100644
--- a/sfx2/uiconfig/ui/decktitlebar.ui
+++ b/sfx2/uiconfig/ui/decktitlebar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="sfx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="DeckTitleBar">
@@ -52,8 +52,8 @@
</child>
<child>
<object class="GtkToolbar" id="toolbar">
- <property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
<property name="toolbar-style">icons</property>
<property name="show-arrow">False</property>
<property name="icon_size">2</property>
diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui
b/sfx2/uiconfig/ui/paneltitlebar.ui
index 721abab47dfd..8664dfa88fc4 100644
--- a/sfx2/uiconfig/ui/paneltitlebar.ui
+++ b/sfx2/uiconfig/ui/paneltitlebar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="sfx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="PanelTitleBar">
@@ -59,8 +59,8 @@
</child>
<child>
<object class="GtkToolbar" id="toolbar">
- <property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
<property name="toolbar-style">icons</property>
<property name="show-arrow">False</property>
<property name="icon_size">2</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
