From b2c91edc9646daa331de71d589e4fec6bdef4945 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 11 Jul 2018 17:09:17 +0300 Subject: GUI change: - methods OnInitDialog, OnApply & OnClose of CDlgBase now return true if successful. return of false prevents a dialog from being loaded or left respectively; - massive code cleaning considering the 'virtual' attribute of overridden methods; - also fixes #1476 (Don't close "Create new account" window if user not set account name) --- plugins/StartPosition/src/options.cpp | 6 ++++-- plugins/StartPosition/src/options.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/StartPosition') diff --git a/plugins/StartPosition/src/options.cpp b/plugins/StartPosition/src/options.cpp index cdc56bf45a..ac9991cbdb 100644 --- a/plugins/StartPosition/src/options.cpp +++ b/plugins/StartPosition/src/options.cpp @@ -49,7 +49,7 @@ COptionsDlg::COptionsDlg() : chkStartState.OnChange = Callback(this, &COptionsDlg::onCheck_StartState); } -void COptionsDlg::OnInitDialog() +bool COptionsDlg::OnInitDialog() { if (g_plugin.spOptions.clistState == ClistState::normal) chkStartNormal.SetState(true); @@ -71,9 +71,10 @@ void COptionsDlg::OnInitDialog() edtPositionBottom.Enable(chkPositionBottom.GetState()); edtPositionSide.Enable(chkPositionSide.GetState()); edtWidth.Enable(chkWidth.GetState()); + return true; } -void COptionsDlg::OnApply() +bool COptionsDlg::OnApply() { removeOldSettings(); @@ -86,6 +87,7 @@ void COptionsDlg::OnApply() g_plugin.spOptions.clistAlign = ClistAlign::right; else g_plugin.spOptions.clistAlign = ClistAlign::left; + return true; } void COptionsDlg::removeOldSettings() diff --git a/plugins/StartPosition/src/options.h b/plugins/StartPosition/src/options.h index 26e922cf11..f8d0abd5a4 100644 --- a/plugins/StartPosition/src/options.h +++ b/plugins/StartPosition/src/options.h @@ -79,8 +79,8 @@ class COptionsDlg : public CDlgBase public: COptionsDlg(); - void OnInitDialog() override; - void OnApply() override; + bool OnInitDialog() override; + bool OnApply() override; private: void removeOldSettings(); -- cgit v1.2.3