From f531ff887729783a7fe7a3e12ad12f658eefc7b0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jun 2020 17:03:28 +0300 Subject: UI classes: - CDlgBase::m_bSucceeded variable introduced to check whether IDOK was pressed or not; - unused/useless buttons with id=IDOK or IDCANCEL removed; - brnOk.OnClick replaced with OnApply calls; - unused/useless calls of EndDialog/EndModal removed; - minor code cleaning --- protocols/IRCG/src/irc_dlg.h | 27 ++++++++------------------- protocols/IRCG/src/options.cpp | 34 ++++++++++++++-------------------- protocols/IRCG/src/windows.cpp | 39 +++++++++++++++++---------------------- 3 files changed, 39 insertions(+), 61 deletions(-) (limited to 'protocols/IRCG/src') diff --git a/protocols/IRCG/src/irc_dlg.h b/protocols/IRCG/src/irc_dlg.h index f4d7d1363b..6da582a634 100644 --- a/protocols/IRCG/src/irc_dlg.h +++ b/protocols/IRCG/src/irc_dlg.h @@ -30,8 +30,7 @@ struct CMessageBoxDlg : public CProtoDlgBase < CIrcProto > CMessageBoxDlg(CIrcProto* _pro, DCCINFO* _dci); - CCtrlButton m_Ok; - void OnOk(CCtrlButton*); + bool OnApply() override; }; struct CCoolIrcDlg : public CProtoDlgBase < CIrcProto > @@ -74,13 +73,11 @@ struct CNickDlg : public CCoolIrcDlg { CNickDlg(CIrcProto* _pro); - CCtrlCombo m_Enick; - CCtrlButton m_Ok; + CCtrlCombo m_Enick; bool OnInitDialog() override; + bool OnApply() override; void OnDestroy() override; - - void OnOk(CCtrlButton*); }; struct CListDlg : public CProtoDlgBase < CIrcProto > @@ -111,10 +108,8 @@ struct CJoinDlg : public CCoolIrcDlg CJoinDlg(CIrcProto* _pro); bool OnInitDialog() override; + bool OnApply() override; void OnDestroy() override; - - CCtrlButton m_Ok; - void OnOk(CCtrlButton*); }; struct CQuickDlg : public CCoolIrcDlg @@ -122,14 +117,12 @@ struct CQuickDlg : public CCoolIrcDlg CQuickDlg(CIrcProto* _pro); bool OnInitDialog() override; + bool OnApply() override; void OnDestroy() override; CCtrlCombo m_serverCombo; void OnServerCombo(CCtrlData*); - CCtrlButton m_Ok; - void OnOk(CCtrlButton*); - private: struct SERVER_INFO* m_si; }; @@ -176,11 +169,9 @@ struct CQuestionDlg : public CCoolIrcDlg CQuestionDlg(CIrcProto* _pro, CManagerDlg* owner = nullptr); bool OnInitDialog() override; + bool OnApply() override; bool OnClose() override; - CCtrlButton m_Ok; - void OnOk(CCtrlButton*); - void Activate(); private: @@ -282,8 +273,8 @@ struct CIgnorePrefsDlg : public CProtoDlgBase < CIrcProto > CIgnorePrefsDlg(CIrcProto* _pro); bool OnInitDialog() override; - void OnDestroy() override; bool OnApply() override; + void OnDestroy() override; INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override; @@ -301,7 +292,6 @@ struct CIgnorePrefsDlg : public CProtoDlgBase < CIrcProto > struct CAddIgnoreDlg : public CProtoDlgBase < CIrcProto > { - CCtrlButton m_Ok; CIgnorePrefsDlg* m_owner; wchar_t szOldMask[500]; @@ -309,7 +299,6 @@ struct CAddIgnoreDlg : public CProtoDlgBase < CIrcProto > CAddIgnoreDlg(CIrcProto* _pro, const wchar_t* mask, CIgnorePrefsDlg* parent); bool OnInitDialog() override; + bool OnApply() override; bool OnClose() override; - - void OnOk(CCtrlButton*); }; diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index e289ccaeb6..22bbde0610 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -267,7 +267,6 @@ struct CServerDlg : public CProtoDlgBase CConnectPrefsDlg *m_owner; int m_action; - CCtrlButton m_OK; CCtrlEdit m_server, m_address, m_port, m_port2; CCtrlCombo m_groupCombo; @@ -275,7 +274,6 @@ struct CServerDlg : public CProtoDlgBase : CProtoDlgBase(_pro, IDD_ADDSERVER), m_owner(_owner), m_action(_action), - m_OK(this, IDOK), m_groupCombo(this, IDC_ADD_COMBO), m_address(this, IDC_ADD_ADDRESS), m_server(this, IDC_ADD_SERVER), @@ -283,8 +281,6 @@ struct CServerDlg : public CProtoDlgBase m_port2(this, IDC_ADD_PORT2) { m_hwndParent = _owner->GetHwnd(); - m_OK.OnClick = Callback(this, &CServerDlg::OnOk); - m_autoClose = CLOSE_ON_CANCEL; } bool OnInitDialog() override @@ -330,21 +326,12 @@ struct CServerDlg : public CProtoDlgBase return true; } - bool OnClose() override - { - m_owner->m_serverCombo.Enable(); - m_owner->m_add.Enable(); - m_owner->m_edit.Enable(); - m_owner->m_del.Enable(); - return true; - } - - void OnOk(CCtrlButton*) + bool OnApply() override { for (auto &it : sttRequiredFields) if (!GetWindowTextLength(GetDlgItem(m_hwnd, it))) { MessageBox(m_hwnd, TranslateT("Please complete all fields"), TranslateT("IRC error"), MB_OK | MB_ICONERROR); - return; + return false; } if (m_action == 2) { @@ -375,7 +362,16 @@ struct CServerDlg : public CProtoDlgBase m_owner->OnServerCombo(nullptr); m_owner->m_serverlistModified = true; - ::PostMessage(m_hwnd, WM_CLOSE, 0, 0); + return true; + } + + bool OnClose() override + { + m_owner->m_serverCombo.Enable(); + m_owner->m_add.Enable(); + m_owner->m_edit.Enable(); + m_owner->m_del.Enable(); + return true; } }; @@ -1171,7 +1167,6 @@ void COtherPrefsDlg::addPerformComboValue(int idx, const char* szValueName) CAddIgnoreDlg::CAddIgnoreDlg(CIrcProto* _pro, const wchar_t* mask, CIgnorePrefsDlg* _owner) : CProtoDlgBase(_pro, IDD_ADDIGNORE), - m_Ok(this, IDOK), m_owner(_owner) { m_hwndParent = _owner->GetHwnd(); @@ -1180,8 +1175,6 @@ CAddIgnoreDlg::CAddIgnoreDlg(CIrcProto* _pro, const wchar_t* mask, CIgnorePrefsD szOldMask[0] = 0; else wcsncpy(szOldMask, mask, _countof(szOldMask)); - - m_Ok.OnClick = Callback(this, &CAddIgnoreDlg::OnOk); } bool CAddIgnoreDlg::OnInitDialog() @@ -1198,7 +1191,7 @@ bool CAddIgnoreDlg::OnInitDialog() return true; } -void CAddIgnoreDlg::OnOk(CCtrlButton*) +bool CAddIgnoreDlg::OnApply() { wchar_t szMask[500]; wchar_t szNetwork[500]; @@ -1224,6 +1217,7 @@ void CAddIgnoreDlg::OnOk(CCtrlButton*) m_proto->AddIgnore(Mask.c_str(), flags.c_str(), szNetwork); } } + return true; } bool CAddIgnoreDlg::OnClose() diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp index c1f4aa254b..b952e936f3 100644 --- a/protocols/IRCG/src/windows.cpp +++ b/protocols/IRCG/src/windows.cpp @@ -26,13 +26,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. CMessageBoxDlg::CMessageBoxDlg(CIrcProto *_pro, DCCINFO *_dci) : CProtoDlgBase(_pro, IDD_MESSAGEBOX), - pdci(_dci), - m_Ok(this, IDOK) + pdci(_dci) { - m_Ok.OnClick = Callback(this, &CMessageBoxDlg::OnOk); } -void CMessageBoxDlg::OnOk(CCtrlButton*) +bool CMessageBoxDlg::OnApply() { CDccSession *dcc = new CDccSession(m_proto, pdci); @@ -42,6 +40,7 @@ void CMessageBoxDlg::OnOk(CCtrlButton*) m_proto->AddDCCSession(pdci->hContact, dcc); dcc->Connect(); + return true; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -199,12 +198,10 @@ void CWhoisDlg::ShowMessageNoUser(const CIrcMessage *pmsg) ///////////////////////////////////////////////////////////////////////////////////////// // 'Change nickname' dialog -CNickDlg::CNickDlg(CIrcProto *_pro) - : CCoolIrcDlg(_pro, IDD_NICK), - m_Ok(this, IDOK), +CNickDlg::CNickDlg(CIrcProto *_pro) : + CCoolIrcDlg(_pro, IDD_NICK), m_Enick(this, IDC_ENICK) { - m_Ok.OnClick = Callback(this, &CNickDlg::OnOk); } bool CNickDlg::OnInitDialog() @@ -229,7 +226,7 @@ void CNickDlg::OnDestroy() m_proto->m_nickDlg = nullptr; } -void CNickDlg::OnOk(CCtrlButton*) +bool CNickDlg::OnApply() { wchar_t szTemp[255]; m_Enick.GetText(szTemp, _countof(szTemp)); @@ -246,6 +243,7 @@ void CNickDlg::OnOk(CCtrlButton*) db_free(&dbv); } m_proto->setWString("RecentNicks", S.c_str()); + return true; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -499,11 +497,9 @@ void CListDlg::UpdateList() ///////////////////////////////////////////////////////////////////////////////////////// // 'Join' dialog -CJoinDlg::CJoinDlg(CIrcProto *_pro) - : CCoolIrcDlg(_pro, IDD_NICK), - m_Ok(this, IDOK) +CJoinDlg::CJoinDlg(CIrcProto *_pro) : + CCoolIrcDlg(_pro, IDD_NICK) { - m_Ok.OnClick = Callback(this, &CJoinDlg::OnOk); } bool CJoinDlg::OnInitDialog() @@ -530,7 +526,7 @@ void CJoinDlg::OnDestroy() m_proto->m_joinDlg = nullptr; } -void CJoinDlg::OnOk(CCtrlButton*) +bool CJoinDlg::OnApply() { wchar_t szTemp[255]; GetDlgItemText(m_hwnd, IDC_ENICK, szTemp, _countof(szTemp)); @@ -553,6 +549,7 @@ void CJoinDlg::OnOk(CCtrlButton*) db_free(&dbv); } m_proto->setWString("RecentChannels", S.c_str()); + return true; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -560,10 +557,8 @@ void CJoinDlg::OnOk(CCtrlButton*) CQuickDlg::CQuickDlg(CIrcProto *_pro) : CCoolIrcDlg(_pro, IDD_QUICKCONN), - m_Ok(this, IDOK), m_serverCombo(this, IDC_SERVERCOMBO) { - m_Ok.OnClick = Callback(this, &CQuickDlg::OnOk); m_serverCombo.OnChange = Callback(this, &CQuickDlg::OnServerCombo); } @@ -621,7 +616,7 @@ void CQuickDlg::OnDestroy() m_proto->m_quickDlg = nullptr; } -void CQuickDlg::OnOk(CCtrlButton*) +bool CQuickDlg::OnApply() { GetDlgItemTextA(m_hwnd, IDC_SERVER, m_proto->m_serverName, _countof(m_proto->m_serverName)); GetDlgItemTextA(m_hwnd, IDC_PORT, m_proto->m_portStart, _countof(m_proto->m_portStart)); @@ -656,6 +651,7 @@ void CQuickDlg::OnOk(CCtrlButton*) m_proto->setDword("QuickComboSelection", m_proto->m_quickComboSelection); m_proto->DisconnectFromServer(); m_proto->ConnectToServer(); + return true; } void CQuickDlg::OnServerCombo(CCtrlData*) @@ -710,14 +706,12 @@ void CQuickDlg::OnServerCombo(CCtrlData*) ///////////////////////////////////////////////////////////////////////////////////////// // 'Question' dialog -CQuestionDlg::CQuestionDlg(CIrcProto *_pro, CManagerDlg *owner) - : CCoolIrcDlg(_pro, IDD_QUESTION), - m_Ok(this, IDOK), +CQuestionDlg::CQuestionDlg(CIrcProto *_pro, CManagerDlg *owner) : + CCoolIrcDlg(_pro, IDD_QUESTION), m_owner(owner) { if (owner != nullptr) m_hwndParent = owner->GetHwnd(); - m_Ok.OnClick = Callback(this, &CQuestionDlg::OnOk); } bool CQuestionDlg::OnInitDialog() @@ -735,7 +729,7 @@ bool CQuestionDlg::OnClose() return true; } -void CQuestionDlg::OnOk(CCtrlButton*) +bool CQuestionDlg::OnApply() { int i = GetWindowTextLength(GetDlgItem(m_hwnd, IDC_EDIT)); if (i > 0) { @@ -779,6 +773,7 @@ void CQuestionDlg::OnOk(CCtrlButton*) if (m_owner) m_owner->ApplyQuestion(); } + return true; } void CQuestionDlg::Activate() -- cgit v1.2.3