AAA:

- added ability to react to terminal session disconnection;
- options dialog rework;
- version bump

1 files changed, 31 insertions, 27 deletions

diff --git a/plugins/StatusManager/res/resource.rc b/plugins/StatusManager/res/resource.rc
index 9424df8dd2..7bd71d111b 100644
--- a/plugins/StatusManager/res/resource.rc
+++ b/plugins/StatusManager/res/resource.rc
@@ -125,33 +125,41 @@ BEGIN
     PUSHBUTTON      "Message",IDC_SETSTSMSG,131,100,50,14
 END
 
-IDD_OPT_AUTOAWAY DIALOGEX 0, 0, 284, 198
+IDD_OPT_AUTOAWAY DIALOGEX 0, 0, 298, 204
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    RTEXT           "Account",IDC_STATIC,16,11,155,8
-    COMBOBOX        IDC_PROTOCOL,177,9,100,138,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Set",IDC_STATIC,5,41,33,8
-    COMBOBOX        IDC_LV1STATUS,41,39,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "when full-screen mode is active",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,60,155,10
-    CONTROL         "when screen saver engages",IDC_SCREENSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,73,155,10
-    CONTROL         "when workstation is locked",IDC_ONLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,86,155,10
-    CONTROL         "after",IDC_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,32,8
-    EDITTEXT        IDC_AWAYTIME,51,98,26,12,ES_AUTOHSCROLL
-    LTEXT           "minutes of inactivity",IDC_LV1AFTERSTR,82,100,89,8
-    RTEXT           "Set",IDC_STATIC,5,115,33,8
-    COMBOBOX        IDC_LV2STATUS,41,113,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "after",IDC_SETNA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,131,32,8
-    EDITTEXT        IDC_NATIME,51,129,26,12,ES_AUTOHSCROLL
-    LTEXT           "minutes of level 1 mode",IDC_SETNASTR,82,131,89,8
-    CONTROL         "only set when inactive",IDC_LV2ONINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,143,261,10
+    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
+    CONTROL         "when full-screen mode is active",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,160,10
+    CONTROL         "when screen saver engages",IDC_SCREENSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,46,160,10
+    CONTROL         "when workstation is locked",IDC_ONLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,59,160,10
+    CONTROL         "when terminal session is disconnected",IDC_ONTSDISCONNECT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,72,160,10
+    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
+    CONTROL         "after",IDC_SETNA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,131,32,8
+    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,9,155,268,12
-    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,168,268,11
-    CONTROL         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,181,268,10
-    LTEXT           "Only set if current status is",IDC_STATIC,177,42,100,8
-    CONTROL         "",IDC_STATUSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,177,55,100,84
+                    "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         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,189,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
 END
 
 IDD_CMDLOPTIONS DIALOGEX 0, 0, 315, 82
@@ -415,11 +423,7 @@ BEGIN
 
     IDD_OPT_AUTOAWAY, DIALOG
     BEGIN
-        VERTGUIDE, 9
-        VERTGUIDE, 16
-        VERTGUIDE, 171
-        VERTGUIDE, 177
-        VERTGUIDE, 277
+        VERTGUIDE, 182
     END
 
     IDD_PUOPT_KEEPSTATUS, DIALOG