Skip to content

C
core
Kaydet (Commit) f4c094f7 authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

split area property sidebar panel into two parts 

The AreaPropertyPanelBase is independent from the dispatcher,
    SfxBindings and some other sfx2 stuff. There are still a few open
    points about some of the controls used but it is a step forward.

Change-Id: I8eed42522abb3d3efc46bad352da9cbaa0b88b12
üst 477e35f7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 113 deletions
svx/Library_svx.mk
Dosyayı görüntüle @ f4c094f7
......@@ -186,6 +186,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/paragraph/ParaLineSpacingPopup \
svx/source/sidebar/paragraph/ParaPropertyPanel \
svx/source/sidebar/area/AreaPropertyPanel \
svx/source/sidebar/area/AreaPropertyPanelBase \
svx/source/sidebar/area/AreaTransparencyGradientControl \
svx/source/sidebar/area/AreaTransparencyGradientPopup \
svx/source/sidebar/shadow/ShadowPropertyPanel \
......
svx/source/sidebar/area/AreaPropertyPanel.hxx
Dosyayı görüntüle @ f4c094f7
......@@ -19,9 +19,7 @@
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
#include "AreaTransparencyGradientPopup.hxx"
#include <vcl/ctrl.hxx>
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <svx/xgrad.hxx>
#include <svx/itemwin.hxx>
......@@ -32,29 +30,28 @@
#include <svx/xbtmpit.hxx>
#include <svx/drawitem.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/vclptr.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/ui/XUIElement.hpp>
#include <boost/scoped_ptr.hpp>
#include "AreaPropertyPanelBase.hxx"
class XFillFloatTransparenceItem;
class XFillTransparenceItem;
class XFillStyleItem;
class XFillGradientItem;
class XFillColorItem;
class XFillHatchItem;
class XFillBitmapItem;
namespace svx { namespace sidebar {
class PopupContainer;
class AreaTransparencyGradientControl;
class AreaPropertyPanel
: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
class AreaPropertyPanel : public AreaPropertyPanelBase
{
public:
virtual ~AreaPropertyPanel();
virtual void dispose() SAL_OVERRIDE;
static VclPtr<vcl::Window> Create(
......@@ -62,103 +59,39 @@ public:
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
const DataChangedEvent& rEvent) SAL_OVERRIDE;
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
const SfxPoolItem* pState,
const bool bIsEnabled) SAL_OVERRIDE;
SfxBindings* GetBindings() { return mpBindings;}
const static sal_Int32 DEFAULT_CENTERX;
const static sal_Int32 DEFAULT_CENTERY;
const static sal_Int32 DEFAULT_ANGLE;
const static sal_Int32 DEFAULT_STARTVALUE;
const static sal_Int32 DEFAULT_ENDVALUE;
const static sal_Int32 DEFAULT_BORDER;
XGradient GetGradient (const css::awt::GradientStyle eStyle) const;
void SetGradient (const XGradient& rGradient);
sal_Int32 GetSelectedTransparencyTypeIndex() const;
// constructor/destuctor
AreaPropertyPanel(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~AreaPropertyPanel();
virtual void setFillTransparence(const XFillTransparenceItem& rItem);
virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem);
virtual void setFillStyle(const XFillStyleItem& rItem);
virtual void setFillStyleAndColor(const XFillStyleItem* pStyleItem, const XFillColorItem& aColorItem);
virtual void setFillStyleAndGradient(const XFillStyleItem* pStyleItem, const XFillGradientItem& aGradientItem);
virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& aHatchItem);
virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& aHatchItem);
private:
sal_uInt16 meLastXFS;
sal_Int32 mnLastPosGradient;
sal_Int32 mnLastPosHatch;
sal_Int32 mnLastPosBitmap;
sal_uInt16 mnLastTransSolid;
XGradient maGradientLinear;
XGradient maGradientAxial;
XGradient maGradientRadial;
XGradient maGradientElliptical;
XGradient maGradientSquare;
XGradient maGradientRect;
//ui controls
VclPtr<FixedText> mpColorTextFT;
VclPtr<SvxFillTypeBox> mpLbFillType;
VclPtr<SvxFillAttrBox> mpLbFillAttr;
VclPtr<ToolBox> mpToolBoxColor; // for new color picker
VclPtr<FixedText> mpTrspTextFT;
VclPtr<ListBox> mpLBTransType;
VclPtr<MetricField> mpMTRTransparent;
VclPtr<ToolBox> mpBTNGradient;
::boost::scoped_ptr< XFillStyleItem > mpStyleItem;
::boost::scoped_ptr< XFillColorItem > mpColorItem;
::boost::scoped_ptr< XFillGradientItem > mpFillGradientItem;
::boost::scoped_ptr< XFillHatchItem > mpHatchItem;
::boost::scoped_ptr< XFillBitmapItem > mpBitmapItem;
::sfx2::sidebar::ControllerItem maStyleControl;
::sfx2::sidebar::ControllerItem maColorControl;
::sfx2::sidebar::ControllerItem maGradientControl;
::sfx2::sidebar::ControllerItem maHatchControl;
::sfx2::sidebar::ControllerItem maBitmapControl;
::sfx2::sidebar::ControllerItem maGradientListControl;
::sfx2::sidebar::ControllerItem maHatchListControl;
::sfx2::sidebar::ControllerItem maBitmapListControl;
::sfx2::sidebar::ControllerItem maFillTransparenceController;
::sfx2::sidebar::ControllerItem maFillFloatTransparenceController;
Image maImgAxial;
Image maImgElli;
Image maImgQuad;
Image maImgRadial;
Image maImgSquare;
Image maImgLinear;
AreaTransparencyGradientPopup maTrGrPopup;
::boost::scoped_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem;
::boost::scoped_ptr< SfxUInt16Item > mpTransparanceItem;
css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings;
DECL_LINK(SelectFillTypeHdl, ListBox* );
DECL_LINK(SelectFillAttrHdl, ListBox* );
DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
DECL_LINK(ModifyTransparentHdl_Impl, void*);
// for transparency gradient
VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent);
DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void );
::sfx2::sidebar::ControllerItem maStyleControl;
::sfx2::sidebar::ControllerItem maColorControl;
::sfx2::sidebar::ControllerItem maGradientControl;
::sfx2::sidebar::ControllerItem maHatchControl;
::sfx2::sidebar::ControllerItem maBitmapControl;
::sfx2::sidebar::ControllerItem maGradientListControl;
::sfx2::sidebar::ControllerItem maHatchListControl;
::sfx2::sidebar::ControllerItem maBitmapListControl;
::sfx2::sidebar::ControllerItem maFillTransparenceController;
::sfx2::sidebar::ControllerItem maFillFloatTransparenceController;
SfxBindings* mpBindings;
void Initialize();
void Update();
void ImpUpdateTransparencies();
};
......
svx/source/sidebar/area/AreaPropertyPanelBase.cxx 0 → 100644
Dosyayı görüntüle @ f4c094f7
This diff is collapsed.
svx/source/sidebar/area/AreaPropertyPanelBase.hxx 0 → 100644
Dosyayı görüntüle @ f4c094f7
/* -*- 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/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANELBASE_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANELBASE_HXX
#include "AreaTransparencyGradientPopup.hxx"
#include <vcl/ctrl.hxx>
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <svx/xgrad.hxx>
#include <svx/itemwin.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/drawitem.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/vclptr.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/ui/XUIElement.hpp>
#include <boost/scoped_ptr.hpp>
class XFillFloatTransparenceItem;
class XFillTransparenceItem;
class XFillStyleItem;
class XFillGradientItem;
class XFillColorItem;
class XFillHatchItem;
class XFillBitmapItem;
namespace svx { namespace sidebar {
class PopupContainer;
class AreaTransparencyGradientControl;
class AreaPropertyPanelBase
: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
virtual void dispose() SAL_OVERRIDE;
virtual void DataChanged(
const DataChangedEvent& rEvent) SAL_OVERRIDE;
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
const SfxPoolItem* pState,
const bool bIsEnabled) SAL_OVERRIDE;
const static sal_Int32 DEFAULT_CENTERX;
const static sal_Int32 DEFAULT_CENTERY;
const static sal_Int32 DEFAULT_ANGLE;
const static sal_Int32 DEFAULT_STARTVALUE;
const static sal_Int32 DEFAULT_ENDVALUE;
const static sal_Int32 DEFAULT_BORDER;
XGradient GetGradient (const css::awt::GradientStyle eStyle) const;
void SetGradient (const XGradient& rGradient);
sal_Int32 GetSelectedTransparencyTypeIndex() const;
// constructor/destuctor
AreaPropertyPanelBase(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual ~AreaPropertyPanelBase();
virtual void setFillTransparence(const XFillTransparenceItem& rItem) = 0;
virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem) = 0;
virtual void setFillStyle(const XFillStyleItem& rItem) = 0;
virtual void setFillStyleAndColor(const XFillStyleItem* pStyleItem, const XFillColorItem& aColorItem) = 0;
virtual void setFillStyleAndGradient(const XFillStyleItem* pStyleItem, const XFillGradientItem& aGradientItem) = 0;
virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& aHatchItem) = 0;
virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& aHatchItem) = 0;
protected:
sal_uInt16 meLastXFS;
sal_Int32 mnLastPosGradient;
sal_Int32 mnLastPosHatch;
sal_Int32 mnLastPosBitmap;
sal_uInt16 mnLastTransSolid;
XGradient maGradientLinear;
XGradient maGradientAxial;
XGradient maGradientRadial;
XGradient maGradientElliptical;
XGradient maGradientSquare;
XGradient maGradientRect;
//ui controls
VclPtr<FixedText> mpColorTextFT;
VclPtr<SvxFillTypeBox> mpLbFillType;
VclPtr<SvxFillAttrBox> mpLbFillAttr;
VclPtr<ToolBox> mpToolBoxColor; // for new color picker
VclPtr<FixedText> mpTrspTextFT;
VclPtr<ListBox> mpLBTransType;
VclPtr<MetricField> mpMTRTransparent;
VclPtr<ToolBox> mpBTNGradient;
::boost::scoped_ptr< XFillStyleItem > mpStyleItem;
::boost::scoped_ptr< XFillColorItem > mpColorItem;
::boost::scoped_ptr< XFillGradientItem > mpFillGradientItem;
::boost::scoped_ptr< XFillHatchItem > mpHatchItem;
::boost::scoped_ptr< XFillBitmapItem > mpBitmapItem;
Image maImgAxial;
Image maImgElli;
Image maImgQuad;
Image maImgRadial;
Image maImgSquare;
Image maImgLinear;
AreaTransparencyGradientPopup maTrGrPopup;
::boost::scoped_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem;
::boost::scoped_ptr< SfxUInt16Item > mpTransparanceItem;
css::uno::Reference<css::frame::XFrame> mxFrame;
DECL_LINK(SelectFillTypeHdl, ListBox* );
DECL_LINK(SelectFillAttrHdl, ListBox* );
DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
DECL_LINK(ModifyTransparentHdl_Impl, void*);
// for transparency gradient
VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent);
DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void );
void Initialize();
void Update();
void ImpUpdateTransparencies();
};
} } // end of namespace svx::sidebar
#endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
Dosyayı görüntüle @ f4c094f7
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "AreaTransparencyGradientControl.hxx"
#include "AreaPropertyPanel.hxx"
#include "AreaPropertyPanelBase.hxx"
#include "AreaPropertyPanel.hrc"
#include <svx/dialogs.hrc>
......@@ -51,7 +51,7 @@ namespace svx { namespace sidebar {
AreaTransparencyGradientControl::AreaTransparencyGradientControl (
vcl::Window* pParent,
AreaPropertyPanel& rPanel)
AreaPropertyPanelBase& rPanel)
: PopupControl( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)),
maFtTrgrCenterX(VclPtr<FixedText>::Create(this, SVX_RES(FT_TRGR_CENTER_X))),
maMtrTrgrCenterX(VclPtr<MetricField>::Create(this, SVX_RES(MTR_TRGR_CENTER_X))),
......@@ -69,8 +69,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (
maMtrTrgrBorder(VclPtr<MetricField>::Create(this, SVX_RES(MTR_TRGR_BORDER))),
maRotLeft( SVX_RES(IMG_ROT_LEFT)),
maRotRight( SVX_RES(IMG_ROT_RIGHT)),
mrAreaPropertyPanel(rPanel),
mpBindings(NULL)
mrAreaPropertyPanel(rPanel)
{
Link<> aLink = LINK( this, AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl);
maMtrTrgrCenterX->SetModifyHdl( aLink );
......@@ -97,7 +96,6 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (
maBtnRight45->SetPaintTransparent(true);
FreeResource();
mpBindings = mrAreaPropertyPanel.GetBindings();
}
AreaTransparencyGradientControl::~AreaTransparencyGradientControl()
......@@ -241,14 +239,14 @@ void AreaTransparencyGradientControl::InitStatus(XFillFloatTransparenceItem* pGr
XGradient aGradient;
if (rGradient.GetXOffset() == AreaPropertyPanel::DEFAULT_CENTERX
&& rGradient.GetYOffset() == AreaPropertyPanel::DEFAULT_CENTERY
&& (rGradient.GetAngle() / 10) == AreaPropertyPanel::DEFAULT_ANGLE
if (rGradient.GetXOffset() == AreaPropertyPanelBase::DEFAULT_CENTERX
&& rGradient.GetYOffset() == AreaPropertyPanelBase::DEFAULT_CENTERY
&& (rGradient.GetAngle() / 10) == AreaPropertyPanelBase::DEFAULT_ANGLE
&& ((sal_uInt16)((((sal_uInt16)rGradient.GetStartColor().GetRed() + 1) * 100) / 255))
== AreaPropertyPanel::DEFAULT_STARTVALUE
== AreaPropertyPanelBase::DEFAULT_STARTVALUE
&& ((sal_uInt16)((((sal_uInt16)rGradient.GetEndColor().GetRed() + 1) * 100) / 255))
== AreaPropertyPanel::DEFAULT_ENDVALUE
&& rGradient.GetBorder() == AreaPropertyPanel::DEFAULT_BORDER)
== AreaPropertyPanelBase::DEFAULT_ENDVALUE
&& rGradient.GetBorder() == AreaPropertyPanelBase::DEFAULT_BORDER)
{
aGradient = mrAreaPropertyPanel.GetGradient(rGradient.GetGradientStyle());
}
......@@ -290,7 +288,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s
bool bEnable = true;
XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable );
mpBindings->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SfxCallMode::RECORD, &aGradientItem, 0L );
mrAreaPropertyPanel.setFillFloatTransparence(aGradientItem);
}
IMPL_LINK_NOARG(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl)
......
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
Dosyayı görüntüle @ f4c094f7
......@@ -33,14 +33,14 @@ class SfxBindings;
namespace svx { namespace sidebar {
class AreaPropertyPanel;
class AreaPropertyPanelBase;
class AreaTransparencyGradientControl : public PopupControl
{
public:
AreaTransparencyGradientControl (
vcl::Window* pParent,
AreaPropertyPanel& rPanel);
AreaPropertyPanelBase& rPanel);
virtual ~AreaTransparencyGradientControl();
virtual void dispose() SAL_OVERRIDE;
......@@ -66,8 +66,7 @@ private:
Image maRotLeft;
Image maRotRight;
AreaPropertyPanel& mrAreaPropertyPanel;
SfxBindings* mpBindings;
AreaPropertyPanelBase& mrAreaPropertyPanel;
DECL_LINK( ModifiedTrgrHdl_Impl, void* );
DECL_LINK_TYPED( Left_Click45_Impl, ToolBox*, void );
DECL_LINK_TYPED( Right_Click45_Impl, ToolBox*, void );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment