diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2017-02-21 11:31:18 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-15 15:54:19 +0000 |
| commit | e681749ffa5a18c8a6ff874787d4ab8411a46125 (patch) | |
| tree | afa5c4095f4d1ef35f007cc64178e71b92c78cd2 /include/sfx2 | |
| parent | 5411d99c0a7345e9c68ad55debcb20eecdc0b36a (diff) | |
tdf#105040 Notebookbar: added shortcuts toolbox
In the tabbed notebookbar the shortcuts toolbox is introduced.
It is placed before tab labels, after the menu button.
Customization is possible, buttons are loaded from the
newly created toolbar "Notebookbar shortcuts".
NotebookbarTabControl was moved to the sfx module.
Change-Id: Ifa4a1688c6e92c2f03bd386608e3e9d1c28069d4
Reviewed-on: https://gerrit.libreoffice.org/35194
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/notebookbar/NotebookbarContextControl.hxx | 1 | ||||
| -rw-r--r-- | include/sfx2/notebookbar/NotebookbarTabControl.hxx | 46 | ||||
| -rw-r--r-- | include/sfx2/notebookbar/SfxNotebookBar.hxx | 2 |
3 files changed, 46 insertions, 3 deletions
diff --git a/include/sfx2/notebookbar/NotebookbarContextControl.hxx b/include/sfx2/notebookbar/NotebookbarContextControl.hxx index 348b52101df1..172b25756d8f 100644 --- a/include/sfx2/notebookbar/NotebookbarContextControl.hxx +++ b/include/sfx2/notebookbar/NotebookbarContextControl.hxx @@ -19,7 +19,6 @@ class NotebookbarContextControl public: virtual ~NotebookbarContextControl() {} virtual void SetContext( vcl::EnumContext::Context eContext ) = 0; - virtual void SetIconClickHdl( Link<NotebookBar*, void> aHdl ) = 0; }; #endif // INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARCONTEXTCONTROL_HXX diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/include/sfx2/notebookbar/NotebookbarTabControl.hxx new file mode 100644 index 000000000000..062fe9631f48 --- /dev/null +++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX +#define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX + +#include <vcl/toolbox.hxx> +#include <sfx2/dllapi.h> +#include <com/sun/star/frame/XLayoutManager.hpp> +#include <vcl/tabctrl.hxx> + +class ChangedUIEventListener; + +class SFX2_DLLPUBLIC NotebookbarTabControl : public NotebookbarTabControlBase +{ +friend class ChangedUIEventListener; + +public: + NotebookbarTabControl( Window* pParent ); + + virtual void StateChanged(StateChangedType nStateChange) override; + +private: + static void FillShortcutsToolBox(css::uno::Reference<css::uno::XComponentContext>& xContext, + const css::uno::Reference<css::frame::XFrame>& xFrame, + const OUString& aModuleName, + ToolBox* pShortcuts + ); + DECL_STATIC_LINK(NotebookbarTabControl, OpenNotebookbarPopupMenu, NotebookBar*, void); + + ChangedUIEventListener* m_pListener; + +protected: + bool m_bInitialized; + bool m_bInvalidate; +}; + +#endif // INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index 8792eecf3a4f..e87e7d928c45 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -50,8 +50,6 @@ public: private: static bool m_bLock; static bool m_bHide; - - DECL_STATIC_LINK(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, void); }; } // namespace sfx2 |