System idle:

- plugin StdIdle that had been acting as an options dialog for StdAutoAway removed;
- service MS_IDLE_GETIDLEINFO moved into the core and replaced with Idle_GetInfo();
- new function Idle_Enter() is available to tell the core that Miranda is idle;
- StdAutoAway & StatusManager adapted for these changes;

7 files changed, 120 insertions, 101 deletions

diff --git a/plugins/StatusManager/res/resource.rc b/plugins/StatusManager/res/resource.rc
index 7bd71d111b..0bb96d7e8c 100644
--- a/plugins/StatusManager/res/resource.rc
+++ b/plugins/StatusManager/res/resource.rc
@@ -65,9 +65,9 @@ END
 // AFX_DIALOG_LAYOUT
 //
 
-IDD_OPT_SUBPLUGINS AFX_DIALOG_LAYOUT 
+IDD_OPT_SUBPLUGINS AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
 #endif    // English resources
@@ -125,14 +125,13 @@ BEGIN
     PUSHBUTTON      "Message",IDC_SETSTSMSG,131,100,50,14
 END
 
-IDD_OPT_AUTOAWAY DIALOGEX 0, 0, 298, 204
+IDD_OPT_AUTOAWAY DIALOGEX 0, 0, 298, 218
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "Account:",IDC_STATIC,191,11,96,8
     COMBOBOX        IDC_PROTOCOL,190,22,106,138,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        "Away mode",IDC_STATIC,8,5,174,95
     RTEXT           "Set",IDC_STATIC,15,18,33,8
     COMBOBOX        IDC_LV1STATUS,51,16,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -144,7 +143,6 @@ BEGIN
     CONTROL         "after",IDC_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,86,32,8
     EDITTEXT        IDC_AWAYTIME,53,84,26,12,ES_AUTOHSCROLL
     LTEXT           "minutes of inactivity",IDC_LV1AFTERSTR,85,86,89,8
-
     GROUPBOX        "After away",IDC_STATIC,8,101,174,58
     RTEXT           "Set",IDC_STATIC,15,115,33,8
     COMBOBOX        IDC_LV2STATUS,51,113,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -152,14 +150,12 @@ BEGIN
     EDITTEXT        IDC_NATIME,53,129,26,12,ES_AUTOHSCROLL
     LTEXT           "minutes of level 1 mode",IDC_SETNASTR,84,131,89,8
     CONTROL         "only set when inactive",IDC_LV2ONINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,144,159,10
-    CONTROL         "Monitor Miranda's activity only",IDC_MONITORMIRANDA,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,163,174,12
-
-    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,176,174,11
+    CONTROL         "Monitor Miranda's activity only",IDC_MONITORMIRANDA, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,163,174,10
+    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,176,174,10
     CONTROL         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,189,174,10
-
+    CONTROL         "Enter idle mode",IDC_ENTERIDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,202,174,10
     LTEXT           "Only set if current status is",IDC_STATIC,191,42,106,8
-    CONTROL         "",IDC_STATUSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,191,52,107,146
+    CONTROL         "",IDC_STATUSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,191,52,106,146
 END
 
 IDD_CMDLOPTIONS DIALOGEX 0, 0, 315, 82
@@ -424,6 +420,7 @@ BEGIN
     IDD_OPT_AUTOAWAY, DIALOG
     BEGIN
         VERTGUIDE, 182
+        BOTTOMMARGIN, 204
     END
 
     IDD_PUOPT_KEEPSTATUS, DIALOG
@@ -473,34 +470,34 @@ END
 // AFX_DIALOG_LAYOUT
 //
 
-IDD_OPT_KS_ADV AFX_DIALOG_LAYOUT 
+IDD_OPT_KS_ADV AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
-IDD_OPT_AUTOAWAY AFX_DIALOG_LAYOUT 
+IDD_OPT_AUTOAWAY AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
-IDD_OPT_GENAUTOAWAY AFX_DIALOG_LAYOUT 
+IDD_OPT_GENAUTOAWAY AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
-IDD_OPT_KS_BASIC AFX_DIALOG_LAYOUT 
+IDD_OPT_KS_BASIC AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
-IDD_PUOPT_KEEPSTATUS AFX_DIALOG_LAYOUT 
+IDD_PUOPT_KEEPSTATUS AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
-IDD_TRG_AAASTATECHANGE AFX_DIALOG_LAYOUT 
+IDD_TRG_AAASTATECHANGE AFX_DIALOG_LAYOUT
 BEGIN
-    0x0000
+    0
 END
 
 
@@ -538,7 +535,9 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_TTBDOWN             ICON                    "ttbDown.ico"
+
 IDI_TTBUP               ICON                    "ttbUp.ico"
+
 #endif    // German (Germany) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp b/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
index bd96bccb30..eb91254af3 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
+++ b/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
@@ -66,6 +66,7 @@ static void SetDialogItems(HWND hwndDlg, SMProto *setting)
 	CheckDlgButton(hwndDlg, IDC_SETNA, bSetNA ? BST_CHECKED : BST_UNCHECKED);
 	CheckDlgButton(hwndDlg, IDC_CONFIRM, (setting->optionFlags & FLAG_CONFIRM) != 0 ? BST_CHECKED : BST_UNCHECKED);
 	CheckDlgButton(hwndDlg, IDC_RESETSTATUS, (setting->optionFlags & FLAG_RESET) != 0 ? BST_CHECKED : BST_UNCHECKED);
+	CheckDlgButton(hwndDlg, IDC_ENTERIDLE, (setting->optionFlags & FLAG_ENTERIDLE) != 0 ? BST_CHECKED : BST_UNCHECKED);
 	CheckDlgButton(hwndDlg, IDC_MONITORMIRANDA, (setting->optionFlags & FLAG_MONITORMIRANDA) != 0 ? BST_CHECKED : BST_UNCHECKED);
 	CheckDlgButton(hwndDlg, IDC_LV2ONINACTIVE, (setting->optionFlags & FLAG_LV2ONINACTIVE) != 0 ? BST_CHECKED : BST_UNCHECKED);
 
@@ -298,6 +299,11 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 			setting->optionFlags ^= FLAG_MONITORMIRANDA;
 			SetDialogItems(hwndDlg, setting);
 			break;
+
+		case IDC_ENTERIDLE:
+			setting->optionFlags ^= FLAG_ENTERIDLE;
+			SetDialogItems(hwndDlg, setting);
+			break;
 		}
 		break;
 
diff --git a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp
index 734d50ffdb..270375e94c 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp
+++ b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp
@@ -116,7 +116,7 @@ int LoadAutoAwaySetting(SMProto &autoAwaySetting, char* protoName)
 {
 	char setting[128];
 	mir_snprintf(setting, "%s_OptionFlags", protoName);
-	autoAwaySetting.optionFlags = db_get_w(0, AAAMODULENAME, setting, FLAG_LV2ONINACTIVE | FLAG_RESET);
+	autoAwaySetting.optionFlags = db_get_w(0, AAAMODULENAME, setting, FLAG_LV2ONINACTIVE | FLAG_RESET | FLAG_ENTERIDLE);
 	mir_snprintf(setting, "%s_AwayTime", protoName);
 	autoAwaySetting.awayTime = db_get_w(0, AAAMODULENAME, setting, SETTING_AWAYTIME_DEFAULT);
 	mir_snprintf(setting, "%s_NATime", protoName);
@@ -173,7 +173,7 @@ static char* status2descr(int status)
 	return "ERROR";
 }
 
-static int changeState(SMProto &setting, STATES newState)
+static int changeState(SMProto &setting, int mode, STATES newState)
 {
 	if (setting.curState == newState)
 		return 0;
@@ -198,6 +198,13 @@ static int changeState(SMProto &setting, STATES newState)
 		setting.m_szMsg = nullptr;
 	}
 
+	if (setting.optionFlags & FLAG_ENTERIDLE) {
+		if (newState == ACTIVE) // we're returning back
+			Idle_Enter(-1);
+		else
+			Idle_Enter(mode);
+	}
+
 	return 0;
 }
 
@@ -209,7 +216,7 @@ static VOID CALLBACK AutoAwayTimer(HWND, UINT, UINT_PTR, DWORD)
 	for (auto &it : protoList) {
 		it->aaaStatus = ID_STATUS_DISABLED;
 
-		BOOL bTrigger = false;
+		int mode = 0;
 
 		if (it->optionFlags & FLAG_MONITORMIRANDA)
 			mouseStationaryTimer = (GetTickCount() - lastMirandaInput) / 1000;
@@ -225,45 +232,48 @@ static VOID CALLBACK AutoAwayTimer(HWND, UINT, UINT_PTR, DWORD)
 		int currentMode = Proto_GetStatus(it->m_szName);
 
 		if (it->optionFlags & FLAG_ONSAVER)
-			bTrigger |= IsScreenSaverRunning();
-		if (it->optionFlags & FLAG_ONLOCK)
-			bTrigger |= IsWorkstationLocked();
-		if (it->optionFlags & FLAG_ONTS)
-			bTrigger |= IsTerminalDisconnected();
-		if (it->optionFlags & FLAG_FULLSCREEN)
-			bTrigger |= IsFullScreen();
+			mode = 1;
+		else if (it->optionFlags & FLAG_ONLOCK)
+			mode = 2;
+		else if (it->optionFlags & FLAG_ONTS)
+			mode = 3;
+		else if (it->optionFlags & FLAG_FULLSCREEN)
+			mode = 4;
 
 		/* check states */
 		if (it->curState == ACTIVE) {
-			if (((mouseStationaryTimer >= sts1Time && (it->optionFlags & FLAG_ONMOUSE)) || bTrigger) && currentMode != it->lv1Status && it->statusFlags&StatusModeToProtoFlag(currentMode)) {
+			if (((mouseStationaryTimer >= sts1Time && (it->optionFlags & FLAG_ONMOUSE)) || mode) && currentMode != it->lv1Status && it->statusFlags&StatusModeToProtoFlag(currentMode)) {
+				if (it->optionFlags & FLAG_ONMOUSE)
+					mode = 5;
+
 				/* from ACTIVE to STATUS1_SET */
 				it->m_lastStatus = it->originalStatusMode = Proto_GetStatus(it->m_szName);
 				it->aaaStatus = it->lv1Status;
 				it->sts1setTimer = GetTickCount();
 				sts1setTime = 0;
 				it->bStatusChanged = statusChanged = true;
-				changeState(*it, STATUS1_SET);
+				changeState(*it, mode, STATUS1_SET);
 			}
 			else if (mouseStationaryTimer >= sts2Time && currentMode == it->lv1Status && currentMode != it->lv2Status && (it->optionFlags & FLAG_SETNA) && (it->statusFlags & StatusModeToProtoFlag(currentMode))) {
 				/* from ACTIVE to STATUS2_SET */
 				it->m_lastStatus = it->originalStatusMode = Proto_GetStatus(it->m_szName);
 				it->aaaStatus = it->lv2Status;
 				it->bStatusChanged = statusChanged = true;
-				changeState(*it, STATUS2_SET);
+				changeState(*it, mode, STATUS2_SET);
 			}
 		}
 
 		if (it->curState == STATUS1_SET) {
-			if ((mouseStationaryTimer < sts1Time && !bTrigger) && !(it->optionFlags & FLAG_RESET)) {
+			if ((mouseStationaryTimer < sts1Time && !mode) && !(it->optionFlags & FLAG_RESET)) {
 				/* from STATUS1_SET to HIDDEN_ACTIVE */
-				changeState(*it, HIDDEN_ACTIVE);
+				changeState(*it, mode, HIDDEN_ACTIVE);
 				it->m_lastStatus = Proto_GetStatus(it->m_szName);
 			}
-			else if (((mouseStationaryTimer < sts1Time) && !bTrigger) &&
-				((it->optionFlags & FLAG_LV2ONINACTIVE) || (!(it->optionFlags&FLAG_SETNA))) &&
+			else if (((mouseStationaryTimer < sts1Time) && !mode) &&
+				((it->optionFlags & FLAG_LV2ONINACTIVE) || (!(it->optionFlags & FLAG_SETNA))) &&
 				(it->optionFlags & FLAG_RESET)) {
 				/* from STATUS1_SET to SET_ORGSTATUS */
-				changeState(*it, SET_ORGSTATUS);
+				changeState(*it, mode, SET_ORGSTATUS);
 			}
 			else if ((it->optionFlags & FLAG_SETNA) && sts1setTime >= sts2Time) {
 				/* when set STATUS2, currentMode doesn't have to be in the selected status list (statusFlags) */
@@ -271,19 +281,19 @@ static VOID CALLBACK AutoAwayTimer(HWND, UINT, UINT_PTR, DWORD)
 				it->m_lastStatus = Proto_GetStatus(it->m_szName);
 				it->aaaStatus = it->lv2Status;
 				it->bStatusChanged = statusChanged = true;
-				changeState(*it, STATUS2_SET);
+				changeState(*it, mode, STATUS2_SET);
 			}
 		}
 
 		if (it->curState == STATUS2_SET) {
-			if (mouseStationaryTimer < sts2Time && !bTrigger && (it->optionFlags & FLAG_RESET)) {
+			if (mouseStationaryTimer < sts2Time && !mode && (it->optionFlags & FLAG_RESET)) {
 				/* from STATUS2_SET to SET_ORGSTATUS */
-				changeState(*it, SET_ORGSTATUS);
+				changeState(*it, mode, SET_ORGSTATUS);
 			}
-			else if (mouseStationaryTimer < sts2Time && !bTrigger && !(it->optionFlags & FLAG_RESET)) {
+			else if (mouseStationaryTimer < sts2Time && !mode && !(it->optionFlags & FLAG_RESET)) {
 				/* from STATUS2_SET to HIDDEN_ACTIVE */
 				/* Remember: after status1 is set, and "only on inactive" is NOT set, it implies !reset. */
-				changeState(*it, HIDDEN_ACTIVE);
+				changeState(*it, mode, HIDDEN_ACTIVE);
 				it->m_lastStatus = Proto_GetStatus(it->m_szName);
 			}
 		}
@@ -292,7 +302,7 @@ static VOID CALLBACK AutoAwayTimer(HWND, UINT, UINT_PTR, DWORD)
 			if (it->bManualStatus) {
 				/* HIDDEN_ACTIVE to ACTIVE */
 				// it->bStatusChanged = false;
-				changeState(*it, ACTIVE);
+				changeState(*it, mode, ACTIVE);
 				it->sts1setTimer = 0;
 				it->bManualStatus = false;
 			}
@@ -303,7 +313,7 @@ static VOID CALLBACK AutoAwayTimer(HWND, UINT, UINT_PTR, DWORD)
 				it->m_lastStatus = it->originalStatusMode = Proto_GetStatus(it->m_szName);
 				it->aaaStatus = it->lv2Status;
 				it->bStatusChanged = statusChanged = true;
-				changeState(*it, STATUS2_SET);
+				changeState(*it, mode, STATUS2_SET);
 			}
 		}
 		if (it->curState == SET_ORGSTATUS) {
@@ -312,7 +322,7 @@ static VOID CALLBACK AutoAwayTimer(HWND, UINT, UINT_PTR, DWORD)
 			it->aaaStatus = it->originalStatusMode;
 			confirm = (it->optionFlags & FLAG_CONFIRM) ? TRUE : confirm;
 			it->bStatusChanged = statusChanged = true;
-			changeState(*it, ACTIVE);
+			changeState(*it, mode, ACTIVE);
 			it->sts1setTimer = 0;
 		}
 		it->bManualStatus = false;
diff --git a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
index b6ca5cbeb6..e2d6b4ec61 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
+++ b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
@@ -28,6 +28,7 @@
 #define SETTING_MSGCUSTOM    "Custom"
 #define SETTING_STATUSMSG    "Msg"
 #define SETTING_CONFIRMDELAY "ConfirmTimeout"
+#define SETTING_ENTERIDLE    "EnterIdle"
 
 #define SETTING_AWAYTIME_DEFAULT 5
 #define SETTING_NATIME_DEFAULT  20
diff --git a/plugins/StatusManager/src/commonstatus.h b/plugins/StatusManager/src/commonstatus.h
index fe80354d9c..217903ff79 100644
--- a/plugins/StatusManager/src/commonstatus.h
+++ b/plugins/StatusManager/src/commonstatus.h
@@ -89,6 +89,7 @@ bool IsSuitableProto(PROTOACCOUNT *pa);
 #define FLAG_ONLOCK         0x0080 // db: on work station lock
 #define FLAG_FULLSCREEN     0x0100 // db: on full screen
 #define FLAG_ONTS           0x0200 // db: on terminal session disconnect
+#define FLAG_ENTERIDLE      0x0400 // db: enter idle with AA mode
 
 typedef enum
 {
diff --git a/plugins/StatusManager/src/resource.h b/plugins/StatusManager/src/resource.h
index d3701f8c2f..b507e0c632 100644
--- a/plugins/StatusManager/src/resource.h
+++ b/plugins/StatusManager/src/resource.h
@@ -22,48 +22,57 @@
 #define IDC_PROTOCOL                    1000
 #define IDC_STATUS                      1001
 #define IDC_PROFILE                     1002
-#define IDC_STARTUPLIST                 1008
-#define IDC_STATUSMSG                   1008
-#define IDC_SETPROFILE                  1010
-#define IDC_SETWINSTATE                 1011
-#define IDC_WINSTATE                    1012
-#define IDC_CLOSE                       1013
-#define IDC_SHOWDIALOG                  1014
-#define IDC_OFFLINECLOSE                1016
-#define IDC_CONFIRM                     1017
-#define IDC_SHOWCMDL                    1018
-#define IDC_COPY                        1019
-#define IDC_CMDL                        1020
-#define IDC_OK                          1021
-#define IDC_SHORTCUT                    1022
-#define IDC_CHECKCONNECTION             1025
-#define IDC_MAXRETRIES                  1026
-#define IDC_INITDELAY                   1027
-#define IDC_SETPROFILEDELAY             1027
-#define IDC_DOCKED                      1028
-#define IDC_SETDOCKED                   1029
-#define IDC_MAXDELAY                    1031
-#define IDC_INCREASEEXPONENTIAL         1032
-#define IDC_LNOTHING                    1032
-#define IDC_LCLOSE                      1033
-#define IDC_LV1STATUS                   1035
-#define IDC_LV2STATUS                   1036
-#define IDC_STATUSLIST                  1037
-#define IDC_LV1AFTERSTR                 1038
-#define IDC_SHOWCONNECTIONPOPUPS        1040
-#define IDC_ADDPROFILE                  1041
-#define IDC_DELPROFILE                  1042
-#define IDC_PROFILENAME                 1043
-#define IDC_CANCEL                      1044
-#define IDC_MONITORMIRANDA              1045
-#define IDC_WINCOLORS                   1045
-#define IDC_CHKINET                     1045
-#define IDC_IGNLOCK                     1045
-#define IDC_CREATETTB                   1046
-#define IDC_PERPROTOCOLSETTINGS         1050
-#define IDC_SAMESETTINGS                1051
-#define IDC_RESETSTATUS                 1052
-#define IDC_SETSTSMSG                   1053
+#define IDC_STARTUPLIST                 1003
+#define IDC_STATUSMSG                   1004
+#define IDC_SETPROFILE                  1005
+#define IDC_SETWINSTATE                 1006
+#define IDC_WINSTATE                    1007
+#define IDC_CLOSE                       1008
+#define IDC_SHOWDIALOG                  1009
+#define IDC_OFFLINECLOSE                1010
+#define IDC_CONFIRM                     1011
+#define IDC_SHOWCMDL                    1012
+#define IDC_COPY                        1013
+#define IDC_CMDL                        1014
+#define IDC_OK                          1015
+#define IDC_SHORTCUT                    1016
+#define IDC_CHECKCONNECTION             1017
+#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
+#define IDC_LCLOSE                      1026
+#define IDC_LV1STATUS                   1027
+#define IDC_LV2STATUS                   1028
+#define IDC_STATUSLIST                  1029
+#define IDC_LV1AFTERSTR                 1030
+#define IDC_SHOWCONNECTIONPOPUPS        1031
+#define IDC_ADDPROFILE                  1032
+#define IDC_DELPROFILE                  1033
+#define IDC_PROFILENAME                 1034
+#define IDC_CANCEL                      1035
+#define IDC_MONITORMIRANDA              1036
+#define IDC_WINCOLORS                   1037
+#define IDC_CHKINET                     1038
+#define IDC_IGNLOCK                     1039
+#define IDC_CREATETTB                   1040
+#define IDC_PERPROTOCOLSETTINGS         1041
+#define IDC_SAMESETTINGS                1042
+#define IDC_RESETSTATUS                 1043
+#define IDC_SETSTSMSG                   1044
+#define IDC_SCREENSAVE                  1045
+#define IDC_TIMED                       1046
+#define IDC_AWAYTIME                    1047
+#define IDC_SETNA                       1048
+#define IDC_NATIME                      1049
+#define IDC_FULLSCREEN                  1050
+#define IDC_RADUSEMIRANDA               1051
+#define IDC_RADUSECUSTOM                1052
+#define IDC_SETNASTR                    1053
 #define IDC_DEFAULTCOLORS               1054
 #define IDC_ONLOCK                      1055
 #define IDC_LOGINERR                    1056
@@ -86,6 +95,7 @@
 #define IDC_TEXTCOLOR                   1075
 #define IDC_PREV                        1076
 #define IDC_LOGINERR_DELAY              1077
+#define IDC_ENTERIDLE                   1078
 #define IDC_PROTOLIST                   1079
 #define IDC_ENABLECHECKING              1080
 #define IDC_DISABLECHECKING             1081
@@ -139,15 +149,6 @@
 #define IDC_ENABLE_KEEPSTATUS           1141
 #define IDC_ENABLE_STARTUPSTATUS        1142
 #define IDC_ENABLE_ADVANCEDAUTOAWAY     1143
-#define IDC_SCREENSAVE                  1145
-#define IDC_TIMED                       1146
-#define IDC_AWAYTIME                    1147
-#define IDC_SETNA                       1148
-#define IDC_NATIME                      1149
-#define IDC_FULLSCREEN                  1150
-#define IDC_RADUSEMIRANDA               1210
-#define IDC_RADUSECUSTOM                1212
-#define IDC_SETNASTR                    1568
 
 // Next default values for new objects
 // 
@@ -155,7 +156,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        131
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1144
+#define _APS_NEXT_CONTROL_VALUE         1145
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h
index dbf035fe4a..6767d08ef4 100644
--- a/plugins/StatusManager/src/stdafx.h
+++ b/plugins/StatusManager/src/stdafx.h
@@ -15,6 +15,7 @@
 #include <m_skin.h>
 #include <m_clistint.h>
 #include <m_utils.h>
+#include <m_idle.h>
 #include <m_icolib.h>
 #include <m_options.h>
 #include <m_protosvc.h>