diff options
| -rw-r--r-- | plugins/Scriver/res/resource.rc | 4 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgoptions.cpp | 12 | ||||
| -rw-r--r-- | src/core/stdmsg/res/resource.rc | 4 | ||||
| -rw-r--r-- | 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();
|