vcl/inc/salvtables.hxx | 42 +++++++++++++ vcl/source/app/salvtables.cxx | 127 +++++++++++++++++------------------------- 2 files changed, 96 insertions(+), 73 deletions(-)
New commits: commit 7e7d7e5f1ec0aa678009b2d0993a9ccc05bb1ea8 Author: Szymon Kłos <[email protected]> AuthorDate: Wed May 13 10:31:33 2020 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Thu May 14 13:01:06 2020 +0200 Move SalInstanceCheckButton to header file Change-Id: Id6597cd259abefe69a61f0ab414c6bd2114c9749 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94100 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 779067586c29..628b4b707c34 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -1082,4 +1082,25 @@ public: virtual weld::Container* weld_message_area() override; }; +class SalInstanceCheckButton : public SalInstanceButton, public virtual weld::CheckButton +{ +private: + VclPtr<CheckBox> m_xCheckButton; + + DECL_LINK(ToggleHdl, CheckBox&, void); + +public: + SalInstanceCheckButton(CheckBox* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership); + + virtual void set_active(bool active) override; + + virtual bool get_active() const override; + + virtual void set_inconsistent(bool inconsistent) override; + + virtual bool get_inconsistent() const override; + + virtual ~SalInstanceCheckButton() override; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 453404f31d13..fef4615ab96f 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2731,52 +2731,39 @@ IMPL_LINK(SalInstanceToggleButton, ToggleListener, VclWindowEvent&, rEvent, void signal_toggled(); } -namespace -{ -class SalInstanceCheckButton : public SalInstanceButton, public virtual weld::CheckButton +SalInstanceCheckButton::SalInstanceCheckButton(CheckBox* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) + : SalInstanceButton(pButton, pBuilder, bTakeOwnership) + , m_xCheckButton(pButton) { -private: - VclPtr<CheckBox> m_xCheckButton; - - DECL_LINK(ToggleHdl, CheckBox&, void); - -public: - SalInstanceCheckButton(CheckBox* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceButton(pButton, pBuilder, bTakeOwnership) - , m_xCheckButton(pButton) - { - m_xCheckButton->SetToggleHdl(LINK(this, SalInstanceCheckButton, ToggleHdl)); - } - - virtual void set_active(bool active) override - { - disable_notify_events(); - m_xCheckButton->EnableTriState(false); - m_xCheckButton->Check(active); - enable_notify_events(); - } + m_xCheckButton->SetToggleHdl(LINK(this, SalInstanceCheckButton, ToggleHdl)); +} - virtual bool get_active() const override { return m_xCheckButton->IsChecked(); } +void SalInstanceCheckButton::set_active(bool active) +{ + disable_notify_events(); + m_xCheckButton->EnableTriState(false); + m_xCheckButton->Check(active); + enable_notify_events(); +} - virtual void set_inconsistent(bool inconsistent) override - { - disable_notify_events(); - m_xCheckButton->EnableTriState(true); - m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET : TRISTATE_FALSE); - enable_notify_events(); - } +bool SalInstanceCheckButton::get_active() const { return m_xCheckButton->IsChecked(); } - virtual bool get_inconsistent() const override - { - return m_xCheckButton->GetState() == TRISTATE_INDET; - } +void SalInstanceCheckButton::set_inconsistent(bool inconsistent) +{ + disable_notify_events(); + m_xCheckButton->EnableTriState(true); + m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET : TRISTATE_FALSE); + enable_notify_events(); +} - virtual ~SalInstanceCheckButton() override - { - m_xCheckButton->SetToggleHdl(Link<CheckBox&, void>()); - } -}; +bool SalInstanceCheckButton::get_inconsistent() const +{ + return m_xCheckButton->GetState() == TRISTATE_INDET; +} +SalInstanceCheckButton::~SalInstanceCheckButton() +{ + m_xCheckButton->SetToggleHdl(Link<CheckBox&, void>()); } IMPL_LINK_NOARG(SalInstanceCheckButton, ToggleHdl, CheckBox&, void) commit 976abc2be4ff03a34936e94ff2cbf3292e7ba9b4 Author: Szymon Kłos <[email protected]> AuthorDate: Wed May 13 10:17:08 2020 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Thu May 14 13:00:54 2020 +0200 Move SalInstanceMessageDialog to header file Change-Id: Ie982bae356f3e13ec40012e5dd9bac45887d2925 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94098 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index f8347ca8cda0..779067586c29 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -22,6 +22,7 @@ #include <vcl/combobox.hxx> #include <vcl/tabctrl.hxx> #include <vcl/layout.hxx> +#include "messagedialog.hxx" class SalInstanceBuilder : public weld::Builder { @@ -1061,4 +1062,24 @@ public: virtual ~SalInstanceNotebook() override; }; +class SalInstanceMessageDialog : public SalInstanceDialog, public virtual weld::MessageDialog +{ +private: + VclPtr<::MessageDialog> m_xMessageDialog; + +public: + SalInstanceMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, + bool bTakeOwnership); + + virtual void set_primary_text(const OUString& rText) override; + + virtual OUString get_primary_text() const override; + + virtual void set_secondary_text(const OUString& rText) override; + + virtual OUString get_secondary_text() const override; + + virtual weld::Container* weld_message_area() override; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7e683bb6d433..453404f31d13 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1565,46 +1565,40 @@ IMPL_LINK(SalInstanceDialog, PopupScreenShotMenuHdl, const CommandEvent&, rCEvt, return false; } -namespace -{ -class SalInstanceMessageDialog : public SalInstanceDialog, public virtual weld::MessageDialog +SalInstanceMessageDialog::SalInstanceMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, + bool bTakeOwnership) + : SalInstanceDialog(pDialog, pBuilder, bTakeOwnership) + , m_xMessageDialog(pDialog) { -private: - VclPtr<::MessageDialog> m_xMessageDialog; +} -public: - SalInstanceMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, - bool bTakeOwnership) - : SalInstanceDialog(pDialog, pBuilder, bTakeOwnership) - , m_xMessageDialog(pDialog) - { - } +void SalInstanceMessageDialog::set_primary_text(const OUString& rText) +{ + m_xMessageDialog->set_primary_text(rText); +} - virtual void set_primary_text(const OUString& rText) override - { - m_xMessageDialog->set_primary_text(rText); - } +OUString SalInstanceMessageDialog::get_primary_text() const +{ + return m_xMessageDialog->get_primary_text(); +} - virtual OUString get_primary_text() const override - { - return m_xMessageDialog->get_primary_text(); - } +void SalInstanceMessageDialog::set_secondary_text(const OUString& rText) +{ + m_xMessageDialog->set_secondary_text(rText); +} - virtual void set_secondary_text(const OUString& rText) override - { - m_xMessageDialog->set_secondary_text(rText); - } +OUString SalInstanceMessageDialog::get_secondary_text() const +{ + return m_xMessageDialog->get_secondary_text(); +} - virtual OUString get_secondary_text() const override - { - return m_xMessageDialog->get_secondary_text(); - } +weld::Container* SalInstanceMessageDialog::weld_message_area() +{ + return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false); +} - virtual Container* weld_message_area() override - { - return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false); - } -}; +namespace +{ class SalInstanceAssistant : public SalInstanceDialog, public virtual weld::Assistant { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
