diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-06-17 23:54:00 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-06-27 17:51:56 +0000 |
commit | 1df394503f1e62b091453c95c05a212892ae8d58 (patch) | |
tree | 4767346ce348cc498df09985b6fa431a45f255d3 /svx | |
parent | 0c80b4dfd27109def7a5bdc34c3fcc5499db6c0d (diff) |
GSoC notebookbar: switching tabs depending on context
+ sfx2::sidebar::EnumContext moved to the vcl module
+ TabPage contains vector with context values
+ vcl builder reads control's contexts from the "class" mark
+ ContextTabControl shows tabs depending on context
Change-Id: I661b0d3f35d46ace2a2e8eb1d374148f0c60017d
Reviewed-on: https://gerrit.libreoffice.org/26447
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/pch/precompiled_svx.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/ContextChangeEventMultiplexer.cxx | 10 | ||||
-rw-r--r-- | svx/source/sidebar/PanelFactory.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/SelectionAnalyzer.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/SelectionChangeHandler.cxx | 12 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.hxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingControl.cxx | 6 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 6 | ||||
-rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/styles/StylesPropertyPanel.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.cxx | 6 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.hxx | 10 |
17 files changed, 39 insertions, 41 deletions
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index d10895b99996..c1dff2d4149a 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -91,6 +91,7 @@ #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/edit.hxx> +#include <vcl/EnumContext.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/floatwin.hxx> @@ -331,7 +332,6 @@ #include <sfx2/sfxuno.hxx> #include <sfx2/shell.hxx> #include <sfx2/sidebar/ControlFactory.hxx> -#include <sfx2/sidebar/EnumContext.hxx> #include <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/TabBar.hxx> #include <sfx2/sidebar/Theme.hxx> diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 53f40f4b3bbb..f8dbc13110f2 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -33,14 +33,14 @@ using namespace css::uno; void ContextChangeEventMultiplexer::NotifyContextChange ( const css::uno::Reference<css::frame::XController>& rxController, - const ::sfx2::sidebar::EnumContext::Context eContext) + const vcl::EnumContext::Context eContext) { if (rxController.is() && rxController->getFrame().is()) { const css::ui::ContextChangeEventObject aEvent( rxController, GetModuleName(rxController->getFrame()), - ::sfx2::sidebar::EnumContext::GetContextName(eContext)); + vcl::EnumContext::GetContextName(eContext)); css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( css::ui::ContextChangeEventMultiplexer::get( @@ -53,7 +53,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( void ContextChangeEventMultiplexer::NotifyContextChange ( SfxViewShell* pViewShell, - const ::sfx2::sidebar::EnumContext::Context eContext) + const vcl::EnumContext::Context eContext) { if (pViewShell != nullptr) NotifyContextChange(pViewShell->GetController(), eContext); @@ -75,8 +75,8 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( // during initialization or destruction of a view. // Ignore it. } - return ::sfx2::sidebar::EnumContext::GetApplicationName( - ::sfx2::sidebar::EnumContext::Application_None); + return vcl::EnumContext::GetApplicationName( + vcl::EnumContext::Application_None); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 4b954ec8e2be..ceb4f68f0ec3 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -114,7 +114,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault("Sidebar", Reference<ui::XSidebar>())); const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); - ::sfx2::sidebar::EnumContext aContext ( + vcl::EnumContext aContext ( aArguments.getOrDefault("ApplicationName", OUString()), aArguments.getOrDefault("ContextName", OUString())); diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index a4c6dbf4d007..df468fb72a03 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -25,7 +25,7 @@ #include "svx/fmglob.hxx" #include "svx/globl3d.hxx" -using sfx2::sidebar::EnumContext; +using vcl::EnumContext; namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index 2cc8cc9b9a84..76430afbd6b0 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -21,21 +21,19 @@ #include "svx/sidebar/ContextChangeEventMultiplexer.hxx" #include "svx/svdmrkv.hxx" -#include <sfx2/sidebar/EnumContext.hxx> +#include <vcl/EnumContext.hxx> #include <sfx2/shell.hxx> using namespace css; using namespace css::uno; -using namespace sfx2::sidebar; - namespace svx { namespace sidebar { SelectionChangeHandler::SelectionChangeHandler ( const std::function<rtl::OUString()>& rSelectionChangeCallback, const Reference<css::frame::XController>& rxController, - const EnumContext::Context eDefaultContext) + const vcl::EnumContext::Context eDefaultContext) : SelectionChangeHandlerInterfaceBase(m_aMutex), maSelectionChangeCallback(rSelectionChangeCallback), mxController(rxController), @@ -55,11 +53,11 @@ void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject& { if (maSelectionChangeCallback) { - const EnumContext::Context eContext ( - EnumContext::GetContextEnum(maSelectionChangeCallback())); + const vcl::EnumContext::Context eContext ( + vcl::EnumContext::GetContextEnum(maSelectionChangeCallback())); ContextChangeEventMultiplexer::NotifyContextChange( mxController, - eContext==EnumContext::Context_Unknown + eContext==vcl::EnumContext::Context_Unknown ? meDefaultContext : eContext); } diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 9670e74a1aa9..b5038bc10ed4 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -184,7 +184,7 @@ void LinePropertyPanel::NotifyItemUpdate( } void LinePropertyPanel::HandleContextChange( - const sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if(maContext == rContext) { diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 595cc457290a..19b2cdd5f937 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -71,7 +71,7 @@ public: SfxBindings* pBindings); virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -113,7 +113,7 @@ private: sfx2::sidebar::ControllerItem maCapStyle; SfxBindings* mpBindings; - sfx2::sidebar::EnumContext maContext; + vcl::EnumContext maContext; void Initialize(); }; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b50c587ab0ed..f5cdf2b26231 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -72,7 +72,7 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create ( } void ParaPropertyPanel::HandleContextChange ( - const ::sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if (maContext == rContext) { @@ -146,7 +146,7 @@ void ParaPropertyPanel::HandleContextChange ( break; } - mpTBxOutline->Show( maContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application_DrawImpress ); + mpTBxOutline->Show( maContext.GetApplication_DI() == vcl::EnumContext::Application_DrawImpress ); } void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 50fde91799cf..4b204749efd3 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -56,7 +56,7 @@ public: SfxBindings* GetBindings() { return mpBindings;} virtual void HandleContextChange ( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -107,7 +107,7 @@ private: ::sfx2::sidebar::ControllerItem maIncIndentControl; ::sfx2::sidebar::ControllerItem m_aMetricCtl; - ::sfx2::sidebar::EnumContext maContext; + vcl::EnumContext maContext; SfxBindings* mpBindings; css::uno::Reference<css::ui::XSidebar> mxSidebar; diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index 7822db158fa7..e4dc5d0c897f 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -137,9 +137,9 @@ void SAL_CALL ParaLRSpacingControl::notifyContextChangeEvent(const css::ui::Cont if(pWindow) { - ::sfx2::sidebar::EnumContext eContext = ::sfx2::sidebar::EnumContext( - ::sfx2::sidebar::EnumContext::GetApplicationEnum(rEvent.ApplicationName), - ::sfx2::sidebar::EnumContext::GetContextEnum(rEvent.ContextName)); + vcl::EnumContext eContext = vcl::EnumContext( + vcl::EnumContext::GetApplicationEnum(rEvent.ApplicationName), + vcl::EnumContext::GetContextEnum(rEvent.ContextName)); pWindow->SetContext(eContext); } } diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index 93a2099c92c2..e5d81ed0c97d 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -135,7 +135,7 @@ void ParaLRSpacingWindow::dispose() VclVBox::dispose(); } -void ParaLRSpacingWindow::SetContext(const ::sfx2::sidebar::EnumContext& eContext) +void ParaLRSpacingWindow::SetContext(const vcl::EnumContext& eContext) { m_aContext = eContext; } diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index 4a01ae8ed372..61ccfca53445 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -24,10 +24,10 @@ #include <editeng/lrspitem.hxx> #include <vcl/builder.hxx> #include <vcl/layout.hxx> +#include <vcl/EnumContext.hxx> #include <svx/relfld.hxx> #include <svtools/unitconv.hxx> #include <sfx2/sidebar/ControllerItem.hxx> -#include <sfx2/sidebar/EnumContext.hxx> using namespace com::sun::star; @@ -64,7 +64,7 @@ public: void SetValue(SfxItemState eState, const SfxPoolItem* pState); void SetUnit(FieldUnit eUnit); - void SetContext(const ::sfx2::sidebar::EnumContext& eContext); + void SetContext(const vcl::EnumContext& eContext); private: VclPtr<SvxRelativeField> m_pBeforeSpacing; @@ -73,7 +73,7 @@ private: SfxMapUnit m_eUnit; - ::sfx2::sidebar::EnumContext m_aContext; + vcl::EnumContext m_aContext; DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); }; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 103d226d2616..155e2a3fc2e7 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -253,7 +253,7 @@ void PosSizePropertyPanel::DataChanged( } void PosSizePropertyPanel::HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if (maContext == rContext) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 21ada21e093d..9ec990c4d135 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -65,7 +65,7 @@ public: const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -136,7 +136,7 @@ private: ::sfx2::sidebar::ControllerItem maAutoHeightControl; ::sfx2::sidebar::ControllerItem m_aMetricCtl; - ::sfx2::sidebar::EnumContext maContext; + vcl::EnumContext maContext; SfxBindings* mpBindings; /// bitfield diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index dd91133f89a4..1b16267bff53 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -4,7 +4,7 @@ #include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> -#include <sfx2/sidebar/EnumContext.hxx> +#include <vcl/EnumContext.hxx> #include <svtools/ctrlbox.hxx> #include <editeng/fhgtitem.hxx> #include <com/sun/star/ui/XUIElement.hpp> diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 85cbaab74e81..e9c8d965a17c 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -39,7 +39,7 @@ VclPtr<vcl::Window> TextPropertyPanel::Create ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const ::sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if (pParent == nullptr) throw lang::IllegalArgumentException("no parent Window given to TextPropertyPanel::Create", nullptr, 0); @@ -55,7 +55,7 @@ VclPtr<vcl::Window> TextPropertyPanel::Create ( rContext); } -TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) +TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const vcl::EnumContext& /*rContext*/ ) : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame), maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this, OUString("FontHeight"), rxFrame), @@ -91,7 +91,7 @@ void TextPropertyPanel::dispose() } void TextPropertyPanel::HandleContextChange ( - const ::sfx2::sidebar::EnumContext& rContext) + const vcl::EnumContext& rContext) { if (maContext == rContext) return; diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index fbdb7118cb06..a61ea40e9962 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -22,7 +22,7 @@ #include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> -#include <sfx2/sidebar/EnumContext.hxx> +#include <vcl/EnumContext.hxx> #include <svtools/ctrlbox.hxx> #include <editeng/fhgtitem.hxx> @@ -51,11 +51,11 @@ public: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const ::sfx2::sidebar::EnumContext& rContext); + const vcl::EnumContext& rContext); virtual void HandleContextChange ( - const ::sfx2::sidebar::EnumContext& rContext) override; + const vcl::EnumContext& rContext) override; virtual void NotifyItemUpdate( @@ -68,7 +68,7 @@ public: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, - const ::sfx2::sidebar::EnumContext& rContext); + const vcl::EnumContext& rContext); private: //ui controls @@ -84,7 +84,7 @@ private: SvxFontHeightItem* mpHeightItem; - ::sfx2::sidebar::EnumContext maContext; + vcl::EnumContext maContext; }; } } // end of namespace svx::sidebar |