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;

1 files changed, 22 insertions, 23 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
 /////////////////////////////////////////////////////////////////////////////