diff options
author | Susobhan Ghosh <susobhang70@gmail.com> | 2016-06-07 19:20:22 +0530 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-23 13:15:07 +0000 |
commit | 3881fffe4233ce3aa02051b205c114c1cb520d67 (patch) | |
tree | 455a1b8230155788b62e82d2ee89f3e1a4fdbce9 /sw/source/uibase | |
parent | 2fe32490f097ac107603ba5b1fa15599d720b8f6 (diff) |
tdf#83830: Page Styles Panel
Added new helper class to svx for numbering
Change-Id: Ie7db4059568024e9bed460fcf7c9215bd2ef788f
Reviewed-on: https://gerrit.libreoffice.org/26020
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/sidebar/PageStylesPanel.cxx | 504 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageStylesPanel.hxx | 57 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/SwPanelFactory.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewtab.cxx | 124 |
4 files changed, 676 insertions, 11 deletions
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index 0b3e939bc495..85b6734b4876 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -24,6 +24,8 @@ #include <svx/svxids.hrc> #include <svx/dlgutil.hxx> #include <svx/rulritem.hxx> +#include "svx/drawitem.hxx" +#include <svx/SvxNumOptionsTabPageHelper.hxx> #include "PageStylesPanel.hxx" #include <sfx2/sidebar/ControlFactory.hxx> #include <sfx2/dispatch.hxx> @@ -35,26 +37,79 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> +using namespace ::com::sun::star; + namespace sw { namespace sidebar{ +const sal_uInt16 aArr[] = +{ + SVX_PAGE_ALL, + SVX_PAGE_MIRROR, + SVX_PAGE_RIGHT, + SVX_PAGE_LEFT +}; + + +sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) +{ + for ( sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aArr); ++i ) + if ( aArr[i] == ( nUsage & 0x000f ) ) + return i; + return SVX_PAGE_ALL; +} + + +sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) +{ + if ( nPos >= SAL_N_ELEMENTS(aArr) ) + return 0; + return aArr[nPos]; +} + VclPtr<vcl::Window> PageStylesPanel::Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame) + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, + SfxBindings* pBindings) { if( pParent == nullptr ) throw ::com::sun::star::lang::IllegalArgumentException("no parent window given to PageStylesPanel::Create", nullptr, 0); if( !rxFrame.is() ) throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PageStylesPanel::Create", nullptr, 0); + if( pBindings == nullptr ) + throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PageStylesPanel::Create", nullptr, 0); - return VclPtr<PageStylesPanel>::Create(pParent, rxFrame); + return VclPtr<PageStylesPanel>::Create(pParent, rxFrame, pBindings); } PageStylesPanel::PageStylesPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, + SfxBindings* pBindings ) : - PanelLayout(pParent, "PageStylesPanel", "modules/swriter/ui/pagestylespanel.ui", rxFrame) + PanelLayout(pParent, "PageStylesPanel", "modules/swriter/ui/pagestylespanel.ui", rxFrame), + mpBindings( pBindings ), + mpPageColumnItem( new SfxInt16Item(SID_ATTR_PAGE_COLUMN) ), + mpPageItem( new SvxPageItem(SID_ATTR_PAGE) ), + maPageColumnControl(SID_ATTR_PAGE_COLUMN, *pBindings, *this), + maPageNumFormatControl( SID_ATTR_PAGE, *pBindings, *this ), + maBgColorControl( SID_ATTR_PAGE_COLOR, *pBindings, *this ), + maBgHatchingControl( SID_ATTR_PAGE_HATCH, *pBindings, *this ), + maBgGradientControl( SID_ATTR_PAGE_GRADIENT, *pBindings, *this ), + maBgBitmapControl( SID_ATTR_PAGE_BITMAP, *pBindings, *this ), + maBgFillStyleControl(SID_ATTR_PAGE_FILLSTYLE, *pBindings, *this), + aCustomEntry() { + get(mpColumnCount, "columnbox"); + get(mpNumberSelectLB, "numberbox"); + get(mpBgFillType, "bgselect"); + get(mpBgColorLB, "lbcolor"); + get(mpBgHatchingLB, "lbhatching"); + get(mpBgGradientLB, "lbgradient"); + get(mpBgBitmapLB, "lbbitmap"); + get(mpLayoutSelectLB, "layoutbox"); + get(mpCustomEntry, "customlabel"); + + Initialize(); } PageStylesPanel::~PageStylesPanel() @@ -64,16 +119,449 @@ PageStylesPanel::~PageStylesPanel() void PageStylesPanel::dispose() { + mpColumnCount.disposeAndClear(); + mpNumberSelectLB.disposeAndClear(); + mpBgFillType.disposeAndClear(); + mpBgColorLB.disposeAndClear(); + mpBgHatchingLB.disposeAndClear(); + mpBgGradientLB.disposeAndClear(); + mpBgBitmapLB.disposeAndClear(); + mpLayoutSelectLB.disposeAndClear(); + + maBgBitmapControl.dispose(); + maBgColorControl.dispose(); + maBgFillStyleControl.dispose(); + maBgGradientControl.dispose(); + maBgHatchingControl.dispose(); + maPageColumnControl.dispose(); + maPageNumFormatControl.dispose(); + mpCustomEntry.clear(); PanelLayout::dispose(); } +void PageStylesPanel::Initialize() +{ + aCustomEntry = mpCustomEntry->GetText(); + mpColumnCount->SetSelectHdl( LINK(this, PageStylesPanel, ModifyColumnCountHdl) ); + + SvxNumOptionsTabPageHelper::GetI18nNumbering( *mpNumberSelectLB, ::std::numeric_limits<sal_uInt16>::max()); + mpNumberSelectLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyNumberingHdl) ); + + mpLayoutSelectLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyLayoutHdl) ); + mpBgFillType->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillStyleHdl)); + mpBgColorLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl)); + mpBgGradientLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl)); + mpBgHatchingLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl)); + mpBgBitmapLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl)); + + mpBindings->Invalidate(SID_ATTR_PAGE_COLUMN); + mpBindings->Invalidate(SID_ATTR_PAGE); + mpBindings->Invalidate(SID_ATTR_PAGE_FILLSTYLE); + Update(); +} + +void PageStylesPanel::Update() +{ + const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); + SfxObjectShell* pSh = SfxObjectShell::Current(); + switch(eXFS) + { + case drawing::FillStyle_NONE: + { + mpBgColorLB->Hide(); + mpBgHatchingLB->Hide(); + mpBgGradientLB->Hide(); + mpBgBitmapLB->Hide(); + } + break; + case drawing::FillStyle_SOLID: + { + mpBgBitmapLB->Hide(); + mpBgGradientLB->Hide(); + mpBgHatchingLB->Hide(); + mpBgColorLB->Show(); + mpBgColorLB->Clear(); + const SvxColorListItem aItem( *static_cast<const SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE))); + mpBgColorLB->Fill(aItem.GetColorList()); + + const Color aColor = GetColorSetOrDefault(); + mpBgColorLB->SelectEntry( aColor ); + + if(mpBgColorLB->GetSelectEntryCount() == 0) + { + mpBgColorLB->InsertEntry(aColor, OUString()); + mpBgColorLB->SelectEntry(aColor); + } + } + break; + case drawing::FillStyle_GRADIENT: + { + const SvxColorListItem aItem(*static_cast<const SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE))); + mpBgBitmapLB->Hide(); + mpBgHatchingLB->Hide(); + mpBgColorLB->Show(); + mpBgGradientLB->Show(); + mpBgColorLB->Clear(); + mpBgGradientLB->Clear(); + mpBgColorLB->Fill(aItem.GetColorList()); + mpBgGradientLB->Fill(aItem.GetColorList()); + + const XGradient xGradient = GetGradientSetOrDefault(); + const Color aStartColor = xGradient.GetStartColor(); + const Color aEndColor = xGradient.GetEndColor(); + mpBgColorLB->SelectEntry( aStartColor ); + mpBgGradientLB->SelectEntry( aEndColor ); + + if(mpBgColorLB->GetSelectEntryCount() == 0) + { + mpBgColorLB->InsertEntry(aStartColor, OUString()); + mpBgColorLB->SelectEntry(aStartColor); + } + + if(mpBgGradientLB->GetSelectEntryCount() == 0) + { + mpBgGradientLB->InsertEntry(aEndColor, OUString()); + mpBgGradientLB->SelectEntry(aEndColor); + } + } + break; + + case drawing::FillStyle_HATCH: + { + mpBgColorLB->Hide(); + mpBgGradientLB->Hide(); + mpBgBitmapLB->Hide(); + const SvxHatchListItem aItem(*static_cast<const SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST))); + mpBgHatchingLB->Show(); + mpBgHatchingLB->Clear(); + mpBgHatchingLB->Fill(aItem.GetHatchList()); + + const OUString aHatchName = GetHatchingSetOrDefault(); + mpBgHatchingLB->SelectEntry( aHatchName ); + } + break; + + case drawing::FillStyle_BITMAP: + { + mpBgColorLB->Hide(); + mpBgGradientLB->Hide(); + mpBgHatchingLB->Hide(); + const SvxBitmapListItem aItem(*static_cast<const SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST))); + mpBgBitmapLB->Show(); + mpBgBitmapLB->Clear(); + mpBgBitmapLB->Fill(aItem.GetBitmapList()); + + const OUString aBitmapName = GetBitmapSetOrDefault(); + mpBgBitmapLB->SelectEntry( aBitmapName ); + } + break; + + default: + break; + } +} + +Color PageStylesPanel::GetColorSetOrDefault() +{ + if ( !mpBgColorItem ) + mpBgColorItem.reset( new XFillColorItem( OUString(), Color(0x72, 0x9f, 0xcf) ) ); + + return mpBgColorItem->GetColorValue(); +} + +XGradient PageStylesPanel::GetGradientSetOrDefault() +{ + if( !mpBgGradientItem ) + { + SfxObjectShell* pSh = SfxObjectShell::Current(); + const SvxGradientListItem aGradListItem(*static_cast<const SvxGradientListItem*>(pSh->GetItem(SID_GRADIENT_LIST))); + const XGradient aGradient = aGradListItem.GetGradientList()->GetGradient(0)->GetGradient(); + const OUString aGradientName = aGradListItem.GetGradientList()->GetGradient(0)->GetName(); + + mpBgGradientItem.reset( new XFillGradientItem( aGradientName, aGradient ) ); + } + + return mpBgGradientItem->GetGradientValue(); +} + +const OUString PageStylesPanel::GetHatchingSetOrDefault() +{ + if( !mpBgHatchItem ) + { + SfxObjectShell* pSh = SfxObjectShell::Current(); + const SvxHatchListItem aHatchListItem(*static_cast<const SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST))); + const XHatch aHatch = aHatchListItem.GetHatchList()->GetHatch(0)->GetHatch(); + const OUString aHatchName = aHatchListItem.GetHatchList()->GetHatch(0)->GetName(); + + mpBgHatchItem.reset( new XFillHatchItem( aHatchName, aHatch ) ); + } + + return mpBgHatchItem->GetName(); +} + +const OUString PageStylesPanel::GetBitmapSetOrDefault() +{ + if( !mpBgBitmapItem ) + { + SfxObjectShell* pSh = SfxObjectShell::Current(); + const SvxBitmapListItem aBmpListItem(*static_cast<const SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST))); + const GraphicObject aGraphObj = aBmpListItem.GetBitmapList()->GetBitmap(0)->GetGraphicObject(); + const OUString aBmpName = aBmpListItem.GetBitmapList()->GetBitmap(0)->GetName(); + + mpBgBitmapItem.reset( new XFillBitmapItem( aBmpName, aGraphObj ) ); + } + + return mpBgBitmapItem->GetName(); +} + void PageStylesPanel::NotifyItemUpdate( - const sal_uInt16 /*nSid*/, - const SfxItemState /*eState*/, - const SfxPoolItem* /*pState*/, - const bool /*bIsEnabled*/) + const sal_uInt16 nSid, + const SfxItemState eState, + const SfxPoolItem* pState, + const bool bIsEnabled) +{ + (void)bIsEnabled; + + if(IsDisposed()) + return; + + switch(nSid) + { + case SID_ATTR_PAGE_COLUMN: + { + if ( eState >= SfxItemState::DEFAULT && + pState && dynamic_cast< const SfxInt16Item *>( pState ) != nullptr ) + { + mpPageColumnItem.reset( static_cast<SfxInt16Item*>(pState->Clone()) ); + if(mpPageColumnItem->GetValue() <= 5) + { + mpColumnCount->SelectEntryPos(mpPageColumnItem->GetValue() - 1); + mpColumnCount->RemoveEntry(aCustomEntry); + } + else + { + if(mpColumnCount->GetEntryPos(aCustomEntry) == LISTBOX_ENTRY_NOTFOUND) + mpColumnCount->InsertEntry(aCustomEntry); + mpColumnCount->SelectEntry(aCustomEntry); + } + } + } + break; + + case SID_ATTR_PAGE: + { + if( eState >= SfxItemState::DEFAULT && + pState && dynamic_cast< const SvxPageItem*>( pState ) != nullptr ) + { + mpPageItem.reset( static_cast<SvxPageItem*>(pState->Clone()) ); + SvxNumType eNumType = mpPageItem->GetNumType(); + mpNumberSelectLB->SetSelection(eNumType); + + sal_uInt16 nUse = mpPageItem->GetPageUsage(); + mpLayoutSelectLB->SelectEntryPos( PageUsageToPos_Impl( nUse ) ); + } + } + break; + + case SID_ATTR_PAGE_COLOR: + { + if(eState >= SfxItemState::DEFAULT) + { + mpBgFillType->SelectEntryPos(1); + mpBgColorItem.reset(pState ? static_cast< XFillColorItem* >(pState->Clone()) : nullptr); + Update(); + } + } + break; + + case SID_ATTR_PAGE_HATCH: + { + if(eState >= SfxItemState::DEFAULT) + { + mpBgFillType->SelectEntryPos(3); + mpBgHatchItem.reset(pState ? static_cast < XFillHatchItem* >(pState->Clone()) : nullptr); + Update(); + } + } + break; + + case SID_ATTR_PAGE_GRADIENT: + { + if(eState >= SfxItemState::DEFAULT) + { + mpBgFillType->SelectEntryPos(2); + mpBgGradientItem.reset(pState ? static_cast< XFillGradientItem* >(pState->Clone()) : nullptr); + Update(); + } + } + break; + case SID_ATTR_PAGE_BITMAP: + { + if(eState >= SfxItemState::DEFAULT) + { + mpBgFillType->SelectEntryPos(4); + mpBgBitmapItem.reset(pState ? static_cast< XFillBitmapItem* >(pState->Clone()) : nullptr); + Update(); + } + } + break; + + case SID_ATTR_PAGE_FILLSTYLE: + { + const XFillStyleItem* pFillStyleItem = nullptr; + if (eState >= SfxItemState::DEFAULT) + pFillStyleItem = dynamic_cast< const XFillStyleItem* >(pState); + if (pFillStyleItem) + { + css::drawing::FillStyle eXFS = pFillStyleItem->GetValue(); + switch(eXFS) + { + case drawing::FillStyle_NONE: + mpBgFillType->SelectEntryPos(0); + break; + case drawing::FillStyle_SOLID: + mpBgFillType->SelectEntryPos(1); + break; + case drawing::FillStyle_GRADIENT: + mpBgFillType->SelectEntryPos(2); + break; + case drawing::FillStyle_HATCH: + mpBgFillType->SelectEntryPos(3); + break; + case drawing::FillStyle_BITMAP: + mpBgFillType->SelectEntryPos(4); + break; + default: + break; + } + Update(); + } + } + break; + + default: + break; + } +} + +IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) { + sal_uInt16 nColumnType = mpColumnCount->GetSelectEntryPos() + 1; + mpPageColumnItem->SetValue( nColumnType ); + mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_COLUMN, + SfxCallMode::RECORD, { mpPageColumnItem.get() }); +} + +IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyNumberingHdl, ListBox&, void ) +{ + sal_uInt16 nEntryData = (sal_uInt16)reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectEntryPos())); + mpPageItem->SetNumType((SvxNumType)nEntryData); + mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); +} + +IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyLayoutHdl, ListBox&, void ) +{ + sal_uInt16 nUse = mpLayoutSelectLB->GetSelectEntryPos(); + mpPageItem->SetPageUsage(PosToPageUsage_Impl(nUse)); + mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); +} + +IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) +{ + const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); + const XFillStyleItem aXFillStyleItem(eXFS); + Update(); + + switch (eXFS) + { + case drawing::FillStyle_NONE: + { + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_FILLSTYLE, SfxCallMode::RECORD, { &aXFillStyleItem }); + } + break; + + case drawing::FillStyle_SOLID: + { + XFillColorItem aItem( OUString(), mpBgColorItem->GetColorValue() ); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_COLOR, SfxCallMode::RECORD, { &aItem }); + } + break; + + case drawing::FillStyle_GRADIENT: + { + XFillGradientItem aItem( mpBgGradientItem->GetName(), mpBgGradientItem->GetGradientValue() ); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_GRADIENT, SfxCallMode::RECORD, { &aItem }); + } + break; + + case drawing::FillStyle_HATCH: + { + XFillHatchItem aItem( mpBgHatchItem->GetName(), mpBgHatchItem->GetHatchValue() ); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_HATCH, SfxCallMode::RECORD, { &aItem }); + } + break; + + case drawing::FillStyle_BITMAP: + { + XFillBitmapItem aItem( mpBgBitmapItem->GetName(), mpBgBitmapItem->GetGraphicObject() ); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_BITMAP, SfxCallMode::RECORD, { &aItem }); + } + break; + + default: + break; + } + mpBgFillType->Selected(); +} + +IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillColorHdl, ListBox&, void) +{ + const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); + SfxObjectShell* pSh = SfxObjectShell::Current(); + switch(eXFS) + { + case drawing::FillStyle_SOLID: + { + XFillColorItem aItem(OUString(), mpBgColorLB->GetSelectEntryColor()); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_COLOR, SfxCallMode::RECORD, { &aItem }); + } + break; + case drawing::FillStyle_GRADIENT: + { + XGradient aGradient; + aGradient.SetStartColor(mpBgColorLB->GetSelectEntryColor()); + aGradient.SetEndColor(mpBgGradientLB->GetSelectEntryColor()); + + XFillGradientItem aItem(aGradient); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_GRADIENT, SfxCallMode::RECORD, { &aItem }); + } + break; + case drawing::FillStyle_HATCH: + { + const SvxHatchListItem aHatchListItem(*static_cast<const SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST))); + sal_uInt16 nPos = mpBgHatchingLB->GetSelectEntryPos(); + XHatch aHatch = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetHatch(); + const OUString aHatchName = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetName(); + + XFillHatchItem aItem(aHatchName, aHatch); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_HATCH, SfxCallMode::RECORD, { &aItem }); + } + break; + + case drawing::FillStyle_BITMAP: + { + SvxBitmapListItem aBitmapListItem(*static_cast<const SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST))); + sal_Int16 nPos = mpBgBitmapLB->GetSelectEntryPos(); + GraphicObject aBitmap = aBitmapListItem.GetBitmapList()->GetBitmap(nPos)->GetGraphicObject(); + OUString aBitmapName = aBitmapListItem.GetBitmapList()->GetBitmap(nPos)->GetName(); + XFillBitmapItem aItem(aBitmapName, aBitmap); + GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_BITMAP, SfxCallMode::RECORD, { &aItem }); + } + break; + default: + break; + } } } } diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index 756994be4f96..f4ff4d3de5e9 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -43,7 +43,13 @@ #include <tools/fldunit.hxx> #include <svl/poolitem.hxx> #include <svx/rulritem.hxx> +#include <svx/dlgctrl.hxx> +#include <svx/xfillit.hxx> +#include <svx/xfillit0.hxx> +#include <svx/itemwin.hxx> +#include <svx/pagenumberlistbox.hxx> +class List; namespace sw { namespace sidebar { class PageStylesPanel: @@ -53,7 +59,8 @@ class PageStylesPanel: public: static VclPtr<vcl::Window> Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, + SfxBindings* pBindings); virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -61,11 +68,57 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) override; + SfxBindings* GetBindings() const { return mpBindings; } PageStylesPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, + SfxBindings* pBindings); virtual ~PageStylesPanel(); virtual void dispose() override; + +private: + + SfxBindings* mpBindings; + + ::std::unique_ptr<SfxInt16Item> mpPageColumnItem; + ::std::unique_ptr<SvxPageItem> mpPageItem; + ::std::unique_ptr<XFillStyleItem> mpBgFillStyleItem; + ::std::unique_ptr<XFillColorItem> mpBgColorItem; + ::std::unique_ptr<XFillGradientItem> mpBgGradientItem; + ::std::unique_ptr<XFillHatchItem> mpBgHatchItem; + ::std::unique_ptr<XFillBitmapItem> mpBgBitmapItem; + + ::sfx2::sidebar::ControllerItem maPageColumnControl; + ::sfx2::sidebar::ControllerItem maPageNumFormatControl; + ::sfx2::sidebar::ControllerItem maBgColorControl; + ::sfx2::sidebar::ControllerItem maBgHatchingControl; + ::sfx2::sidebar::ControllerItem maBgGradientControl; + ::sfx2::sidebar::ControllerItem maBgBitmapControl; + ::sfx2::sidebar::ControllerItem maBgFillStyleControl; + + VclPtr<ColorLB> mpBgColorLB; + VclPtr<SvxFillAttrBox> mpBgHatchingLB; + VclPtr<ColorLB> mpBgGradientLB; + VclPtr<SvxFillAttrBox> mpBgBitmapLB; + VclPtr<ListBox> mpLayoutSelectLB; + VclPtr<ListBox> mpColumnCount; + VclPtr<PageNumberListBox> mpNumberSelectLB; + VclPtr<SvxFillTypeBox> mpBgFillType; + VclPtr<FixedText> mpCustomEntry; + OUString aCustomEntry; + + void Initialize(); + void Update(); + Color GetColorSetOrDefault(); + XGradient GetGradientSetOrDefault(); + const OUString GetHatchingSetOrDefault(); + const OUString GetBitmapSetOrDefault(); + + DECL_LINK_TYPED( ModifyColumnCountHdl, ListBox&, void ); + DECL_LINK_TYPED( ModifyNumberingHdl, ListBox&, void ); + DECL_LINK_TYPED( ModifyLayoutHdl, ListBox&, void ); + DECL_LINK_TYPED( ModifyFillStyleHdl, ListBox&, void ); + DECL_LINK_TYPED( ModifyFillColorHdl, ListBox&, void ); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index 913a17086092..8cca8e26f9b8 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -135,7 +135,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } else if(rsResourceURL.endsWith("/PageStylesPanel")) { - VclPtr<vcl::Window> pPanel = sw::sidebar::PageStylesPanel::Create( pParentWindow, xFrame ); + VclPtr<vcl::Window> pPanel = sw::sidebar::PageStylesPanel::Create( pParentWindow, xFrame, pBindings ); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index e4e7964c9660..6f50300ac3a6 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -32,6 +32,8 @@ #include <svl/eitem.hxx> #include <svl/whiter.hxx> #include <svx/ruler.hxx> +#include <svx/xfillit.hxx> +#include <svx/xfillit0.hxx> #include <editeng/protitem.hxx> #include <svl/rectitem.hxx> #include <sfx2/bindings.hxx> @@ -1086,6 +1088,68 @@ void SwView::ExecTabWin( SfxRequest& rReq ) } break; + case SID_ATTR_PAGE_COLOR: + case SID_ATTR_PAGE_FILLSTYLE: + case SID_ATTR_PAGE_GRADIENT: + case SID_ATTR_PAGE_HATCH: + case SID_ATTR_PAGE_BITMAP: + { + if(pReqArgs) + { + SwPageDesc aDesc(rDesc); + SwFrameFormat &rMaster = aDesc.GetMaster(); + switch (nSlot) + { + case(SID_ATTR_PAGE_FILLSTYLE): + { + XFillStyleItem aFSItem( static_cast<const XFillStyleItem&>(pReqArgs->Get( XATTR_FILLSTYLE )) ); + drawing::FillStyle eXFS = aFSItem.GetValue(); + + if ( eXFS == drawing::FillStyle_NONE ) + rMaster.SetFormatAttr( XFillStyleItem( eXFS ) ); + } + break; + + case(SID_ATTR_PAGE_COLOR): + { + XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pReqArgs->Get( XATTR_FILLCOLOR )) ); + rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_SOLID ) ); + rMaster.SetFormatAttr( XFillColorItem( aColorItem )); + } + break; + + case(SID_ATTR_PAGE_GRADIENT): + { + XFillGradientItem aGradientItem( static_cast<const XFillGradientItem&>(pReqArgs->Get( XATTR_FILLGRADIENT )) ); + rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_GRADIENT ) ); + rMaster.SetFormatAttr( XFillGradientItem( aGradientItem ) ); + } + break; + + case(SID_ATTR_PAGE_HATCH): + { + XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pReqArgs->Get( XATTR_FILLHATCH )) ); + rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_HATCH ) ); + rMaster.SetFormatAttr( XFillHatchItem( aHatchItem )); + } + break; + + case(SID_ATTR_PAGE_BITMAP): + { + XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pReqArgs->Get( XATTR_FILLBITMAP )) ); + rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_BITMAP ) ); + rMaster.SetFormatAttr( XFillBitmapItem( aBitmapItem )); + } + break; + + default: + break; + } + rSh.ChgPageDesc(rSh.GetCurPageDesc(), aDesc); + } + } + break; + default: OSL_ENSURE( false, "wrong SlotId"); } @@ -2150,6 +2214,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) } } break; + case SID_ATTR_PAGE_HEADER: case SID_ATTR_PAGE_HEADER_LRMARGIN: case SID_ATTR_PAGE_HEADER_SPACING: @@ -2202,6 +2267,65 @@ void SwView::StateTabWin(SfxItemSet& rSet) } } break; + + case SID_ATTR_PAGE_COLOR: + case SID_ATTR_PAGE_FILLSTYLE: + case SID_ATTR_PAGE_GRADIENT: + case SID_ATTR_PAGE_HATCH: + case SID_ATTR_PAGE_BITMAP: + { + SfxItemSet aSet = rDesc.GetMaster().GetAttrSet(); + drawing::FillStyle eXFS = (drawing::FillStyle) ( static_cast<const XFillStyleItem*>( + aSet.GetItem(XATTR_FILLSTYLE) )->GetValue() ); + XFillStyleItem aFillStyleItem( eXFS ); + aFillStyleItem.SetWhich( SID_ATTR_PAGE_FILLSTYLE ); + rSet.Put(aFillStyleItem); + switch(eXFS) + { + case (drawing::FillStyle_SOLID): + { + Color aColor = static_cast<const XFillColorItem*>( aSet.GetItem( XATTR_FILLCOLOR, false ) )->GetColorValue(); + XFillColorItem aFillColorItem( OUString(), aColor ); + aFillColorItem.SetWhich( SID_ATTR_PAGE_COLOR ); + rSet.Put( aFillColorItem ); + } + break; + + case (drawing::FillStyle_GRADIENT): + { + const XGradient& xGradient = static_cast<const XFillGradientItem*>( aSet.GetItem( XATTR_FILLGRADIENT ) )->GetGradientValue(); + XFillGradientItem aFillGradientItem( OUString(), xGradient, SID_ATTR_PAGE_GRADIENT ); + rSet.Put( aFillGradientItem ); + } + break; + + case (drawing::FillStyle_HATCH): + { + const XFillHatchItem *pFillHatchItem( static_cast<const XFillHatchItem*>( aSet.GetItem( XATTR_FILLHATCH ) ) ); + XFillHatchItem aFillHatchItem( pFillHatchItem->GetName(), pFillHatchItem->GetHatchValue()); + aFillHatchItem.SetWhich( SID_ATTR_PAGE_HATCH ); + rSet.Put( aFillHatchItem ); + } + break; + + case (drawing::FillStyle_BITMAP): + { + const XFillBitmapItem *pFillBitmapItem = static_cast<const XFillBitmapItem*>( aSet.GetItem( XATTR_FILLBITMAP ) ); + XFillBitmapItem aFillBitmapItem( pFillBitmapItem->GetName(), pFillBitmapItem->GetGraphicObject() ); + aFillBitmapItem.SetWhich( SID_ATTR_PAGE_BITMAP ); + rSet.Put( aFillBitmapItem ); + } + break; + case (drawing::FillStyle_NONE): + { + } + break; + + default: + break; + } + } + break; } nWhich = aIter.NextWhich(); } |