diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-09-16 16:06:23 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-17 18:12:01 +0200 |
commit | fb8d53ee0a5afc6305a988a7dca60d55376f8fcc (patch) | |
tree | f198f692b419d3d082c402d6547af63818ecebad /cui/source/inc/backgrnd.hxx | |
parent | b943b9b974ac8c093677b4f625e93c6e64e4ceb4 (diff) |
weld SvxBackgroundTabPage
Change-Id: I7b80ba0b2c85b191d5a7bec44d22293eb772d925
Reviewed-on: https://gerrit.libreoffice.org/60575
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/inc/backgrnd.hxx')
-rw-r--r-- | cui/source/inc/backgrnd.hxx | 84 |
1 files changed, 45 insertions, 39 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 3fc8009296ff..ebd62b0e8057 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -69,39 +69,10 @@ protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: - SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); + SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); virtual ~SvxBackgroundTabPage() override; virtual void dispose() override; - VclPtr<VclContainer> m_pAsGrid; - VclPtr<FixedText> m_pSelectTxt; - VclPtr<ListBox> m_pLbSelect; - VclPtr<FixedText> m_pTblDesc; - VclPtr<ListBox> m_pTblLBox; - - VclPtr<FixedText> m_pBackGroundColorLabelFT; - VclPtr<VclFrame> m_pBackGroundColorFrame; - VclPtr<SvxColorValueSet> m_pBackgroundColorSet; - VclPtr<BackgroundPreviewImpl> m_pPreviewWin1; - - VclPtr<CheckBox> m_pBtnPreview; - - // Background Bitmap ---------------------------------- - VclPtr<VclContainer> m_pBitmapContainer; - VclPtr<VclContainer> m_pFileFrame; - VclPtr<PushButton> m_pBtnBrowse; - VclPtr<CheckBox> m_pBtnLink; - VclPtr<FixedText> m_pFtUnlinked; - VclPtr<FixedText> m_pFtFile; - - VclPtr<VclContainer> m_pTypeFrame; - VclPtr<RadioButton> m_pBtnPosition; - VclPtr<RadioButton> m_pBtnArea; - VclPtr<RadioButton> m_pBtnTile; - VclPtr<SvxRectCtl> m_pWndPosition; - - VclPtr<BackgroundPreviewImpl> m_pPreviewWin2; - // DDListBox for Writer ------------------------------- Color aBgdColor; @@ -121,6 +92,41 @@ private: std::unique_ptr<SvxBackgroundTable_Impl> pTableBck_Impl;///< Items for Sw-Table must be corrected std::unique_ptr<SvxBrushItem> pHighlighting; + std::unique_ptr<RectCtl> m_xWndPosition; + std::unique_ptr<ColorValueSet> m_xBackgroundColorSet; + std::unique_ptr<BackgroundPreviewImpl> m_xPreview1; + std::unique_ptr<BackgroundPreviewImpl> m_xPreview2; + + std::unique_ptr<weld::Label> m_xFindGraphicsFt; + std::unique_ptr<weld::Widget> m_xAsGrid; + std::unique_ptr<weld::Label> m_xSelectTxt; + std::unique_ptr<weld::ComboBox> m_xLbSelect; + std::unique_ptr<weld::Label> m_xTblDesc; + std::unique_ptr<weld::ComboBox> m_xTblLBox; + + std::unique_ptr<weld::Label> m_xBackGroundColorLabelFT; + std::unique_ptr<weld::Widget> m_xBackGroundColorFrame; + + std::unique_ptr<weld::CheckButton> m_xBtnPreview; + + // Background Bitmap ---------------------------------- + std::unique_ptr<weld::Widget> m_xBitmapContainer; + std::unique_ptr<weld::Widget> m_xFileFrame; + std::unique_ptr<weld::Button> m_xBtnBrowse; + std::unique_ptr<weld::CheckButton> m_xBtnLink; + std::unique_ptr<weld::Label> m_xFtUnlinked; + std::unique_ptr<weld::Label> m_xFtFile; + + std::unique_ptr<weld::Widget> m_xTypeFrame; + std::unique_ptr<weld::RadioButton> m_xBtnPosition; + std::unique_ptr<weld::RadioButton> m_xBtnArea; + std::unique_ptr<weld::RadioButton> m_xBtnTile; + + std::unique_ptr<weld::CustomWeld> m_xWndPositionWin; + std::unique_ptr<weld::CustomWeld> m_xBackgroundColorSetWin; + std::unique_ptr<weld::CustomWeld> m_xPreviewWin1; + std::unique_ptr<weld::CustomWeld> m_xPreviewWin2; + void FillColorValueSets_Impl(); void ShowColorUI_Impl(); void HideColorUI_Impl(); @@ -131,15 +137,15 @@ private: void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); SvxGraphicPosition GetGraphicPosition_Impl(); void FillControls_Impl(const SvxBrushItem& rBgdAttr, - const OUString& rUserData); - - DECL_LINK( LoadIdleHdl_Impl, Timer*, void ); - DECL_LINK(SelectHdl_Impl, ListBox&, void ); - DECL_LINK(BrowseHdl_Impl, Button*, void); - DECL_LINK( RadioClickHdl_Impl, Button*, void ); - DECL_LINK( FileClickHdl_Impl, Button*, void ); - DECL_LINK(BackgroundColorHdl_Impl, ValueSet*, void); - DECL_LINK( TblDestinationHdl_Impl, ListBox&, void ); + const OUString& rUserData); + + DECL_LINK(LoadIdleHdl_Impl, Timer*, void); + DECL_LINK(SelectHdl_Impl, weld::ComboBox&, void); + DECL_LINK(BrowseHdl_Impl, weld::Button&, void); + DECL_LINK(RadioClickHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK(FileClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(BackgroundColorHdl_Impl, SvtValueSet*, void); + DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void); }; class SvxBkgTabPage : public SvxAreaTabPage |