summaryrefslogtreecommitdiff
path: root/plugins/StatusManager/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/StatusManager/src')
-rw-r--r--plugins/StatusManager/src/resource.h2
-rw-r--r--plugins/StatusManager/src/ss_main.cpp9
-rw-r--r--plugins/StatusManager/src/ss_options.cpp36
-rw-r--r--plugins/StatusManager/src/startupstatus.h7
4 files changed, 1 insertions, 53 deletions
diff --git a/plugins/StatusManager/src/resource.h b/plugins/StatusManager/src/resource.h
index a96ced8f45..14dc39f971 100644
--- a/plugins/StatusManager/src/resource.h
+++ b/plugins/StatusManager/src/resource.h
@@ -39,8 +39,6 @@
#define IDC_MAXRETRIES 1018
#define IDC_INITDELAY 1019
#define IDC_SETPROFILEDELAY 1020
-#define IDC_DOCKED 1021
-#define IDC_SETDOCKED 1022
#define IDC_MAXDELAY 1023
#define IDC_INCREASEEXPONENTIAL 1024
#define IDC_LNOTHING 1025
diff --git a/plugins/StatusManager/src/ss_main.cpp b/plugins/StatusManager/src/ss_main.cpp
index 52d704d42e..c4e9b59eb5 100644
--- a/plugins/StatusManager/src/ss_main.cpp
+++ b/plugins/StatusManager/src/ss_main.cpp
@@ -428,15 +428,6 @@ void StartupStatusLoad()
if (SSPlugin.getByte(SETTING_SETPROFILE, 1) || SSPlugin.getByte(SETTING_OFFLINECLOSE, 0))
db_set_w(0, "CList", "Status", (uint16_t)ID_STATUS_OFFLINE);
- // docking
- if (SSPlugin.getByte(SETTING_SETDOCKED, 0)) {
- int docked = SSPlugin.getByte(SETTING_DOCKED, DOCKED_NONE);
- if (docked == DOCKED_LEFT || docked == DOCKED_RIGHT)
- docked = -docked;
-
- db_set_b(0, MODULE_CLIST, SETTING_DOCKED, (uint8_t)docked);
- }
-
// Create service functions; the get functions are created here; they don't rely on commonstatus
hServices[0] = CreateServiceFunction(MS_SS_GETPROFILE, SrvGetProfile);
hServices[1] = CreateServiceFunction(MS_SS_GETPROFILECOUNT, GetProfileCount);
diff --git a/plugins/StatusManager/src/ss_options.cpp b/plugins/StatusManager/src/ss_options.cpp
index 8dddc81d68..f40f8c7ced 100644
--- a/plugins/StatusManager/src/ss_options.cpp
+++ b/plugins/StatusManager/src/ss_options.cpp
@@ -250,10 +250,6 @@ class CSSMainOptDlg : public CSSOptionsBaseDlg
else profiles.AddString(TranslateT("default"));
profiles.SetCurSel(defProfile);
- chkSetDocked.Enable(db_get_b(0, MODULE_CLIST, SETTING_TOOLWINDOW, 1));
- if (!chkSetDocked.Enabled())
- chkSetDocked.SetState(false);
-
int val = SSPlugin.getByte(SETTING_WINSTATE, SETTING_STATE_NORMAL);
SendDlgItemMessage(m_hwnd, IDC_WINSTATE, CB_RESETCONTENT, 0, 0);
@@ -276,7 +272,7 @@ class CSSMainOptDlg : public CSSOptionsBaseDlg
}
CCtrlButton btnShowCmdl;
- CCtrlCheck chkSetProfile, chkShowDialog, chkSetWinSize, chkSetWinState, chkSetWinLocation, chkSetDocked;
+ CCtrlCheck chkSetProfile, chkShowDialog, chkSetWinSize, chkSetWinState, chkSetWinLocation;
CCtrlCombo profiles;
CTimer timer;
@@ -286,7 +282,6 @@ public:
timer(this, 10),
profiles(this, IDC_PROFILE),
btnShowCmdl(this, IDC_SHOWCMDL),
- chkSetDocked(this, IDC_SETDOCKED),
chkSetProfile(this, IDC_SETPROFILE),
chkShowDialog(this, IDC_SHOWDIALOG),
chkSetWinSize(this, IDC_SETWINSIZE),
@@ -297,7 +292,6 @@ public:
timer.OnEvent = Callback(this, &CSSMainOptDlg::onTimer);
- chkSetDocked.OnChange = Callback(this, &CSSMainOptDlg::onChange_Docked);
chkSetProfile.OnChange = Callback(this, &CSSMainOptDlg::onChange_SetProfile);
chkShowDialog.OnChange = Callback(this, &CSSMainOptDlg::onChange_ShowDialog);
chkSetWinSize.OnChange = Callback(this, &CSSMainOptDlg::onChange_SetWinSize);
@@ -312,7 +306,6 @@ public:
CheckDlgButton(m_hwnd, IDC_SHOWDIALOG, SSPlugin.getByte(SETTING_SHOWDIALOG, 0) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(m_hwnd, IDC_SETWINSTATE, SSPlugin.getByte(SETTING_SETWINSTATE, 0) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(m_hwnd, IDC_SETWINLOCATION, SSPlugin.getByte(SETTING_SETWINLOCATION, 0) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(m_hwnd, IDC_SETDOCKED, SSPlugin.getByte(SETTING_SETDOCKED, 0) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(m_hwnd, IDC_SETWINSIZE, SSPlugin.getByte(SETTING_SETWINSIZE, 0) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(m_hwnd, IDC_OFFLINECLOSE, SSPlugin.getByte(SETTING_OFFLINECLOSE, 1) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(m_hwnd, IDC_AUTODIAL, SSPlugin.getByte(SETTING_AUTODIAL, 0) ? BST_CHECKED : BST_UNCHECKED);
@@ -324,22 +317,6 @@ public:
SetDlgItemInt(m_hwnd, IDC_WIDTH, SSPlugin.getWord(SETTING_WIDTH, 0), FALSE);
SetDlgItemInt(m_hwnd, IDC_HEIGHT, SSPlugin.getWord(SETTING_HEIGHT, 0), FALSE);
- int val = SSPlugin.getByte(SETTING_DOCKED, DOCKED_NONE);
- int item = SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_ADDSTRING, 0, (LPARAM)TranslateT("Left"));
- SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETITEMDATA, (WPARAM)item, (LPARAM)DOCKED_LEFT);
- if (val == DOCKED_LEFT)
- SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETCURSEL, (WPARAM)item, 0);
-
- item = SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_ADDSTRING, 0, (LPARAM)TranslateT("Right"));
- SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETITEMDATA, (WPARAM)item, (LPARAM)DOCKED_RIGHT);
- if (val == DOCKED_RIGHT)
- SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETCURSEL, (WPARAM)item, 0);
-
- item = SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_ADDSTRING, 0, (LPARAM)TranslateT("None"));
- SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETITEMDATA, (WPARAM)item, (LPARAM)DOCKED_NONE);
- if (val == DOCKED_NONE)
- SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETCURSEL, (WPARAM)item, 0);
-
ReinitProfiles();
timer.Start(100);
return true;
@@ -366,12 +343,6 @@ public:
SSPlugin.setByte(SETTING_WINSTATE, (uint8_t)val);
}
- SSPlugin.setByte(SETTING_SETDOCKED, bChecked = chkSetDocked.GetState());
- if (bChecked) {
- int val = (int)SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_GETITEMDATA, SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_GETCURSEL, 0, 0), 0);
- SSPlugin.setByte(SETTING_DOCKED, (uint8_t)val);
- }
-
SSPlugin.setByte(SETTING_SETWINLOCATION, bChecked = chkSetWinLocation.GetState());
if (bChecked) {
SSPlugin.setDword(SETTING_XPOS, GetDlgItemInt(m_hwnd, IDC_XPOS, nullptr, TRUE));
@@ -438,11 +409,6 @@ public:
EnableWindow(GetDlgItem(m_hwnd, IDC_HEIGHT), !db_get_b(0, MODULE_CLUI, SETTING_AUTOSIZE, 0) && bChecked);
}
- void onChange_Docked(CCtrlCheck*)
- {
- EnableWindow(GetDlgItem(m_hwnd, IDC_DOCKED), chkSetDocked.GetState());
- }
-
void onTimer(CTimer*)
{
if (chkSetWinLocation.GetState() && chkSetWinSize.GetState()) {
diff --git a/plugins/StatusManager/src/startupstatus.h b/plugins/StatusManager/src/startupstatus.h
index 7e3ad71123..8e81b9b63a 100644
--- a/plugins/StatusManager/src/startupstatus.h
+++ b/plugins/StatusManager/src/startupstatus.h
@@ -58,9 +58,6 @@ typedef struct {
#define SETTING_SETWINSTATE "SetState"
#define SETTING_WINSTATE "State"
-#define SETTING_SETDOCKED "SetDocked"
-#define SETTING_DOCKED "Docked"
-
#define SETTING_SHOWDIALOG "ShowDialog"
#define SETTING_OFFLINECLOSE "OfflineOnClose"
#define SETTING_SETPROFILE "SetStatusOnStartup"
@@ -98,10 +95,6 @@ typedef struct {
#define SHORTCUT_DESC L"Miranda NG"
#define SHORTCUT_FILENAME L"\\Miranda NG.lnk"
-#define DOCKED_NONE 0
-#define DOCKED_LEFT 1
-#define DOCKED_RIGHT 2
-
#define MS_SS_MENUSETPROFILEPREFIX "StartupStatus/SetProfile_"
// options