diff options
| author | Rishabh Kumar <kris.kr296@gmail.com> | 2015-08-23 00:34:17 +0530 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-08-26 14:14:15 +0000 |
| commit | 489582458a03aaf25ddc83ae5e4416bbe236991d (patch) | |
| tree | 734b00be3285f44efc35e63cb2b96815046435be /include/svx/sidebar | |
| parent | be95c7430d2fd9858f41ee8e8882d987a5bbe749 (diff) | |
tdf#90078: Improve the Area section of the properties tab
Addition of new controls to gradient mode and area tab reorganisation
Change-Id: I5c122705c41e14cddc2eaaac2561c02df22574f2
Reviewed-on: https://gerrit.libreoffice.org/16965
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'include/svx/sidebar')
| -rw-r--r-- | include/svx/sidebar/AreaPropertyPanelBase.hxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 24ebcedc07ba..c12842f7708b 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -23,6 +23,7 @@ #include <vcl/ctrl.hxx> #include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> +#include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/SidebarToolBox.hxx> #include <svx/xgrad.hxx> #include <svx/itemwin.hxx> @@ -35,6 +36,7 @@ #include <svx/sidebar/PanelLayout.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> +#include <vcl/slider.hxx> #include <vcl/fixed.hxx> #include <vcl/vclptr.hxx> #include <svl/intitem.hxx> @@ -125,11 +127,16 @@ protected: VclPtr<FixedText> mpColorTextFT; VclPtr<SvxFillTypeBox> mpLbFillType; VclPtr<SvxFillAttrBox> mpLbFillAttr; - VclPtr<sfx2::sidebar::SidebarToolBox> mpToolBoxColor; // for new color picker + VclPtr<ColorLB> mpLbFillGradFrom; + VclPtr<ColorLB> mpLbFillGradTo; + VclPtr<sfx2::sidebar::SidebarToolBox> mpToolBoxColor; // for new color picker VclPtr<FixedText> mpTrspTextFT; VclPtr<ListBox> mpLBTransType; VclPtr<MetricField> mpMTRTransparent; + VclPtr<Slider> mpSldTransparent; VclPtr<ToolBox> mpBTNGradient; + VclPtr<MetricField> mpMTRAngle; + VclPtr<ListBox> mpGradientStyle; ::boost::scoped_ptr< XFillStyleItem > mpStyleItem; ::boost::scoped_ptr< XFillColorItem > mpColorItem; @@ -151,10 +158,13 @@ protected: css::uno::Reference<css::frame::XFrame> mxFrame; + sfx2::sidebar::SidebarController* mpSidebarController; + DECL_LINK(SelectFillTypeHdl, ListBox* ); DECL_LINK(SelectFillAttrHdl, ListBox* ); DECL_LINK(ChangeTrgrTypeHdl_Impl, void*); DECL_LINK(ModifyTransparentHdl_Impl, void*); + DECL_LINK(ModifyTransSliderHdl, void*); // for transparency gradient VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent); @@ -163,6 +173,7 @@ protected: void Initialize(); void Update(); void ImpUpdateTransparencies(); + void SetTransparency(sal_uInt16 nVal); }; |