diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-06-12 11:22:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-12 15:53:47 +0200 |
commit | df652aa70869f42ada2f4d8e7d1cacf55c6e6e96 (patch) | |
tree | 92d467081a8955fc71c2e69d2d2ced9a27c1dfde /cui/source/inc/cuitabarea.hxx | |
parent | 2c771d597f0afcdfa1c246877e57d49ae637fe01 (diff) |
weld SvxTransparenceTabPage
Change-Id: If8c8a6cf74664f9acd360d877c57e8dd9de2f2b5
Reviewed-on: https://gerrit.libreoffice.org/55683
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/inc/cuitabarea.hxx')
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index da368bf460e0..7a72431bb9a5 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -146,42 +146,48 @@ class SvxTransparenceTabPage : public SvxTabPage PageType nPageType; sal_uInt16 nDlgType; + bool bBitmap; + + XFillAttrSetItem aXFillAttr; + SfxItemSet& rXFSet; + + XRectPreview m_aCtlBitmapPreview; + XRectPreview m_aCtlXRectPreview; + // main selection - VclPtr<RadioButton> m_pRbtTransOff; - VclPtr<RadioButton> m_pRbtTransLinear; - VclPtr<RadioButton> m_pRbtTransGradient; + std::unique_ptr<weld::RadioButton> m_xRbtTransOff; + std::unique_ptr<weld::RadioButton> m_xRbtTransLinear; + std::unique_ptr<weld::RadioButton> m_xRbtTransGradient; /// linear transparency - VclPtr<MetricField> m_pMtrTransparent; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTransparent; // gradient transparency - VclPtr<VclGrid> m_pGridGradient; - VclPtr<ListBox> m_pLbTrgrGradientType; - VclPtr<FixedText> m_pFtTrgrCenterX; - VclPtr<MetricField> m_pMtrTrgrCenterX; - VclPtr<FixedText> m_pFtTrgrCenterY; - VclPtr<MetricField> m_pMtrTrgrCenterY; - VclPtr<FixedText> m_pFtTrgrAngle; - VclPtr<MetricField> m_pMtrTrgrAngle; - VclPtr<MetricField> m_pMtrTrgrBorder; - VclPtr<MetricField> m_pMtrTrgrStartValue; - VclPtr<MetricField> m_pMtrTrgrEndValue; + std::unique_ptr<weld::Widget> m_xGridGradient; + std::unique_ptr<weld::ComboBoxText> m_xLbTrgrGradientType; + std::unique_ptr<weld::Label> m_xFtTrgrCenterX; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrCenterX; + std::unique_ptr<weld::Label> m_xFtTrgrCenterY; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrCenterY; + std::unique_ptr<weld::Label> m_xFtTrgrAngle; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrAngle; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrBorder; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrStartValue; + std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrEndValue; + std::unique_ptr<weld::Widget> m_xCtlBitmapBorder; + std::unique_ptr<weld::Widget> m_xCtlXRectBorder; // preview - VclPtr<SvxXRectPreview> m_pCtlBitmapPreview; - VclPtr<SvxXRectPreview> m_pCtlXRectPreview; - bool bBitmap; - - XFillAttrSetItem aXFillAttr; - SfxItemSet& rXFSet; + std::unique_ptr<weld::CustomWeld> m_xCtlBitmapPreview; + std::unique_ptr<weld::CustomWeld> m_xCtlXRectPreview; - DECL_LINK(ClickTransOffHdl_Impl, Button*, void ); - DECL_LINK(ClickTransLinearHdl_Impl, Button*, void ); - DECL_LINK(ClickTransGradientHdl_Impl, Button*, void ); - DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void); - DECL_LINK(ModifiedTrgrEditHdl_Impl, Edit&, void); - DECL_LINK(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); - void ModifiedTrgrHdl_Impl(void const *); + DECL_LINK(ClickTransOffHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ClickTransLinearHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ClickTransGradientHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void); + DECL_LINK(ModifiedTrgrEditHdl_Impl, weld::MetricSpinButton&, void); + DECL_LINK(ModifiedTrgrListBoxHdl_Impl, weld::ComboBoxText&, void); + void ModifiedTrgrHdl_Impl(const weld::ComboBoxText*); void ActivateLinear(bool bActivate); void ActivateGradient(bool bActivate); @@ -191,9 +197,8 @@ class SvxTransparenceTabPage : public SvxTabPage void InvalidatePreview (bool bEnable = true ); public: - SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); + SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxTransparenceTabPage() override; - virtual void dispose() override; static VclPtr<SfxTabPage> Create(TabPageParent, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } |