diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-08 19:24:57 +0200 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-08 19:24:57 +0200 |
| commit | 669e4cc003dd0a0adb0fc9ba4cbc06170098ae55 (patch) | |
| tree | da27d6bd1a2a09889567776178c4198426689268 /src | |
| parent | 9bdae200e50f5974977d4d0ba11c5e05b9733fe4 (diff) | |
fixes #1331 (StdMsg: rework "Send message on" settings)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/res/resource.rc | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgoptions.cpp | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index dc3abac474..dbdc5bcf2b 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -46,8 +46,8 @@ BEGIN CONTROL "Show toolbar buttons on top row",IDC_SHOWBUTTONLINE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,192,137,10
CONTROL "Send message on double 'Enter'",IDC_SENDONDBLENTER,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,166,149,10
- CONTROL "Send message on 'Enter'",IDC_SENDONENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,179,152,10
+ "Button", BS_AUTORADIOBUTTON | WS_TABSTOP,148,166,149,10
+ CONTROL "Send message on 'Enter'",IDC_SENDONENTER,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,148,179,152,10
CONTROL "Show character count",IDC_CHARCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,192,149,10
LTEXT "Show warning when message has not been received after",IDC_STATIC,8,208,211,8
EDITTEXT IDC_SECONDS,223,206,25,12,ES_AUTOHSCROLL
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 59fc8bfd72..6e719d6975 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -220,8 +220,6 @@ public: chkAutoMin.OnChange = Callback(this, &COptionMainDlg::onChange_AutoMin);
chkAutoClose.OnChange = Callback(this, &COptionMainDlg::onChange_AutoClose);
chkLimitAvatar.OnChange = Callback(this, &COptionMainDlg::onChange_LimitAvatar);
- chkSendOnEnter.OnChange = Callback(this, &COptionMainDlg::onChange_SendOnEnter);
- chkSendOnDblEnter.OnChange = Callback(this, &COptionMainDlg::onChange_SendOnDblEnter);
chkSavePerContact.OnChange = Callback(this, &COptionMainDlg::onChange_SavePerContact);
CreateLink(edtNFlash, g_dat.nFlashMax);
@@ -282,16 +280,6 @@ public: chkCtrlSupport.Enable(!chkAutoClose.GetState());
}
- void onChange_SendOnEnter(CCtrlCheck*)
- {
- chkSendOnDblEnter.SetState(false);
- }
-
- void onChange_SendOnDblEnter(CCtrlCheck*)
- {
- chkSendOnEnter.SetState(false);
- }
-
void onChange_SavePerContact(CCtrlCheck*)
{
chkCascade.Enable(!chkSavePerContact.GetState());
|