- added fullscreen detection into AAA;

- removed bunch of old clutches from it;
- version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@7362 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 22 insertions, 17 deletions

diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc
index 06bf95ba66..6a8462e0fb 100644
--- a/plugins/StatusPlugins/resource.rc
+++ b/plugins/StatusPlugins/resource.rc
@@ -94,27 +94,28 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "after",IDC_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,83,32,8

-    EDITTEXT        IDC_AWAYTIME,51,81,26,12,ES_AUTOHSCROLL

-    LTEXT           "minutes of inactivity",IDC_LV1AFTERSTR,82,83,87,8

-    EDITTEXT        IDC_NATIME,51,114,26,12,ES_AUTOHSCROLL

-    LTEXT           "minutes of level 1 mode",IDC_SETNASTR,82,116,86,8

-    CONTROL         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,181,168,10

     LTEXT           "Account",IDC_STATIC,9,11,78,8

+    COMBOBOX        IDC_PROTOCOL,177,9,100,138,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Set",IDC_STATIC,11,41,27,8

     COMBOBOX        IDC_LV1STATUS,41,39,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    COMBOBOX        IDC_LV2STATUS,41,97,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "when full-screen mode is active",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,60,152,10

+    CONTROL         "when screen saver engages",IDC_SCREENSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,73,152,10

+    CONTROL         "when workstation is locked",IDC_ONLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,86,153,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,87,8

+    LTEXT           "Set",IDC_STATIC,11,115,27,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,86,8

+    CONTROL         "only set when inactive",IDC_LV2ONINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,143,151,10

+    CONTROL         "Monitor Miranda's activity only",IDC_MONITORMIRANDA,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,155,168,12

+    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,168,168,11

+    CONTROL         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,181,168,10

     LTEXT           "Only set if current status is",IDC_STATIC,180,42,95,8

     CONTROL         "",IDC_STATUSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,177,55,100,84

-    CONTROL         "Monitor Miranda's activity only",IDC_MONITORMIRANDA,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,152,168,10

-    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,166,168,10

-    CONTROL         "when screen saver engages",IDC_SCREENSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,55,152,10

-    LTEXT           "Set",IDC_STATIC,11,41,27,8

-    CONTROL         "after",IDC_SETNA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,116,32,8

-    LTEXT           "Set",IDC_STATIC,11,100,27,8

-    CONTROL         "only set when inactive",IDC_LV2ONINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,129,151,10

-    CONTROL         "when workstation is locked",IDC_ONLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,68,153,10

-    COMBOBOX        IDC_PROTOCOL,177,9,100,138,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

 END

 

 IDD_CMDLOPTIONS DIALOGEX 0, 0, 315, 82

@@ -374,6 +375,10 @@ BEGIN
     BEGIN

     END

 

+    IDD_OPT_AUTOAWAY, DIALOG

+    BEGIN

+    END

+

     IDD_OPT_TABS, DIALOG

     BEGIN

         BOTTOMMARGIN, 248