diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-18 21:41:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-19 22:01:19 +0200 |
| commit | 98e45269e4d9f276a27c065dbd00614436856b20 (patch) | |
| tree | d2feea8a91752742dba616415364b10351792938 /starmath/inc | |
| parent | c1ad998afeef0238f1b823fec8aea4eed7187fcf (diff) | |
weld SmFontDialog
Change-Id: Id253631e7dfd44570a4261b7a7a5db1fac9d68ba
Reviewed-on: https://gerrit.libreoffice.org/60728
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/dialog.hxx | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 68b56efdb4d9..bd1c0d4bdd40 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -77,41 +77,36 @@ public: /**************************************************************************/ -class SmShowFont : public vcl::Window +class SmShowFont : public weld::CustomWidgetController { virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; vcl::Font maFont; public: - SmShowFont(vcl::Window *pParent, WinBits nStyle) - : Window(pParent, nStyle) + SmShowFont() { } - virtual Size GetOptimalSize() const override; + virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; void SetFont(const vcl::Font& rFont); }; -class SmFontDialog : public ModalDialog +class SmFontDialog : public weld::GenericDialogController { - VclPtr<ComboBox> m_pFontBox; - VclPtr<VclContainer> m_pAttrFrame; - VclPtr<CheckBox> m_pBoldCheckBox; - VclPtr<CheckBox> m_pItalicCheckBox; - VclPtr<SmShowFont> m_pShowFont; - vcl::Font maFont; + SmShowFont m_aShowFont; + std::unique_ptr<weld::EntryTreeView> m_xFontBox; + std::unique_ptr<weld::Widget> m_xAttrFrame; + std::unique_ptr<weld::CheckButton> m_xBoldCheckBox; + std::unique_ptr<weld::CheckButton> m_xItalicCheckBox; + std::unique_ptr<weld::CustomWeld> m_xShowFont; - DECL_LINK(FontSelectHdl, ComboBox&, void); - DECL_LINK(FontModifyHdl, Edit&, void); - DECL_LINK(AttrChangeHdl, Button *, void); - - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + DECL_LINK(FontSelectHdl, weld::ComboBox&, void); + DECL_LINK(AttrChangeHdl, weld::ToggleButton&, void); public: - SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); + SmFontDialog(weld::Window* pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); virtual ~SmFontDialog() override; - virtual void dispose() override; const vcl::Font& GetFont() const { |