From f4d2bc200b670221a1bfa8c818cc86c56d51ec64 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Jan 2021 15:19:45 +0300 Subject: =?UTF-8?q?fixes=20#2697=20(Scriver:=20=D0=BF=D0=B0=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=BF?= =?UTF-8?q?=D1=8B=D1=82=D0=BA=D0=B5=20=D0=B7=D0=B0=D0=B9=D1=82=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/Scriver/res/resource.rc | 4 ++-- plugins/Scriver/src/msgoptions.cpp | 12 ------------ src/core/stdmsg/res/resource.rc | 4 ++-- src/core/stdmsg/src/msgoptions.cpp | 6 ------ 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index fcf6a8ec9e..18b887e848 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -35,9 +35,9 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,155,10 CONTROL "Tree1",IDC_POPLIST,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,163,12,98,44 CONTROL "and stay minimized",IDC_STAYMINIMIZED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,23,141,10 - CONTROL "Cascade new windows",IDC_CASCADE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,58,293,10 + CONTROL "Cascade new windows",IDC_CASCADE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,58,293,10 CONTROL "Save size and location for each contact",IDC_SAVEPERCONTACT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,69,293,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,69,293,10 CONTROL "Minimize on send",IDC_AUTOMIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,80,293,10 CONTROL "Hide windows on close",IDC_HIDECONTAINERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,91,293,10 CONTROL "Remember unsent messages",IDC_SAVEDRAFTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,103,293,10 diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 6193b1a9d0..09c66ce93d 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -271,9 +271,7 @@ public: CreateLink(chkStayMinimized, g_plugin.bStayMinimized); CreateLink(chkSavePerContact, g_plugin.bSavePerContact); - chkCascade.OnChange = Callback(this, &CMainOptionsDlg::onChange_Cascade); chkAutoPopup.OnChange = Callback(this, &CMainOptionsDlg::onChange_AutoPopup); - chkSavePerContact.OnChange = Callback(this, &CMainOptionsDlg::onChange_SavePerContact); } bool OnInitDialog() override @@ -303,16 +301,6 @@ public: m_tree.Enable(bChecked); EnableWindow(GetDlgItem(m_hwnd, IDC_STAYMINIMIZED), bChecked); } - - void onChange_Cascade(CCtrlCheck*) - { - chkSavePerContact.SetState(!chkCascade.GetState()); - } - - void onChange_SavePerContact(CCtrlCheck*) - { - chkCascade.SetState(!chkSavePerContact.GetState()); - } }; ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index d7cc7e427b..97a45e8480 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -43,8 +43,8 @@ BEGIN CONTROL "Use the contact's status icon as the window icon",IDC_STATUSWIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,75,290,10 CONTROL "Save the window size and location individually for each contact",IDC_SAVEPERCONTACT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,88,289,10 - CONTROL "Cascade new windows",IDC_CASCADE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,100,289,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,88,289,10 + CONTROL "Cascade new windows",IDC_CASCADE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,100,289,10 CONTROL "Support Ctrl+Up/Down in message area to show previously sent messages",IDC_CTRLSUPPORT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,112,289,10 CONTROL "Delete temporary contacts when closing message window",IDC_DELTEMP, diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 49aeb6873b..5f1051f0b6 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -214,7 +214,6 @@ public: chkAutoMin.OnChange = Callback(this, &COptionMainDlg::onChange_AutoMin); chkAutoClose.OnChange = Callback(this, &COptionMainDlg::onChange_AutoClose); chkLimitAvatar.OnChange = Callback(this, &COptionMainDlg::onChange_LimitAvatar); - chkSavePerContact.OnChange = Callback(this, &COptionMainDlg::onChange_SavePerContact); CreateLink(edtNFlash, g_dat.nFlashMax); CreateLink(edtAvatarH, g_dat.iAvatarHeight); @@ -275,11 +274,6 @@ public: chkCtrlSupport.Enable(!chkAutoClose.GetState()); } - void onChange_SavePerContact(CCtrlCheck*) - { - chkCascade.Enable(!chkSavePerContact.GetState()); - } - void onChange_Avatar(CCtrlCheck*) { bool bEnabled = chkAvatar.GetState(); -- cgit v1.2.3