diff options
author | Susobhan Ghosh <susobhang70@gmail.com> | 2016-06-10 16:33:42 +0530 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-16 08:09:27 +0000 |
commit | b0a9ba98ba83154680f8aea0fd0e58b85e2cfb04 (patch) | |
tree | 165763a46727b2303bcbd1a367813313534a2926 /sd | |
parent | d2106d8c8c1af64924f5423223388dbbe99af352 (diff) |
Rename Slide Background Panel to Slide in Impress.
Reorder Properties Deck
Change-Id: Ib2039c41c56a0182887f19aa362d633dcabfe9dd
Reviewed-on: https://gerrit.libreoffice.org/26159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/sidebar/SlideBackground.cxx | 35 | ||||
-rw-r--r-- | sd/source/ui/sidebar/SlideBackground.hxx | 8 |
2 files changed, 40 insertions, 3 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 279d8e4471ac..4cd012fa5cd7 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -63,6 +63,7 @@ #include <svx/dlgutil.hxx> #include <algorithm> #include "EventMultiplexer.hxx" +#include "glob.hrc" using namespace ::com::sun::star; @@ -94,6 +95,8 @@ SlideBackground::SlideBackground( mpHatchItem(), mpBitmapItem(), mxFrame(rxFrame), + maContext(), + mbTitle(false), mpBindings(pBindings) { get(mpPaperSizeBox,"paperformat"); @@ -155,6 +158,14 @@ void SlideBackground::Initialize() Update(); } +void SlideBackground::HandleContextChange( + const ::sfx2::sidebar::EnumContext& rContext) +{ + if (maContext == rContext) + return; + maContext = rContext; +} + void SlideBackground::Update() { const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos(); @@ -290,7 +301,8 @@ void SlideBackground::addListener() aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED | - tools::EventMultiplexerEvent::EID_SHAPE_CHANGED ); + tools::EventMultiplexerEvent::EID_SHAPE_CHANGED | + tools::EventMultiplexerEvent::EID_VIEW_ADDED); } void SlideBackground::removeListener() @@ -338,6 +350,27 @@ IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener, GetBindings()->Invalidate( SidArray ); } break; + case tools::EventMultiplexerEvent::EID_VIEW_ADDED: + { + if(!mbTitle) + { + sfx2::sidebar::EnumContext rDrawContext(sfx2::sidebar::EnumContext::Application_Draw, + sfx2::sidebar::EnumContext::Context_DrawPage); + sfx2::sidebar::EnumContext rImpressContext(sfx2::sidebar::EnumContext::Application_Impress, + sfx2::sidebar::EnumContext::Context_DrawPage); + if(maContext == rDrawContext) + { + SetPanelTitle(SD_RESSTR(STR_PAGE_NAME)); + mbTitle = true; + } + else if(maContext == rImpressContext) + { + SetPanelTitle(SD_RESSTR(STR_SLIDE_NAME)); + mbTitle = true; + } + } + } + break; default: break; } diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index b5b892ea9ea6..65d908045be2 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -43,12 +43,13 @@ #include <svx/xbtmpit.hxx> #include <svx/xflhtit.hxx> #include "EventMultiplexer.hxx" - +#include <sfx2/sidebar/IContextChangeReceiver.hxx> namespace sd { namespace sidebar { class SlideBackground : public PanelLayout, + public ::sfx2::sidebar::IContextChangeReceiver, public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: @@ -67,6 +68,8 @@ public: const SfxItemState eState, const SfxPoolItem* pState, const bool bIsEnabled) override; + virtual void HandleContextChange( + const ::sfx2::sidebar::EnumContext& rContext) override; private: @@ -100,6 +103,8 @@ private: std::unique_ptr< XFillBitmapItem > mpBitmapItem; css::uno::Reference<css::frame::XFrame> mxFrame; + ::sfx2::sidebar::EnumContext maContext; + bool mbTitle; SfxBindings* mpBindings; SfxMapUnit meUnit; @@ -115,7 +120,6 @@ private: void Initialize(); void Update(); - //DO NOT REMOVE, will be used in follow-up commits void SetPanelTitle(const OUString& rTitle); Color GetColorSetOrDefault(); |