StatusManager: Rework options to be more informative

3 files changed, 66 insertions, 72 deletions

diff --git a/plugins/StatusManager/res/resource.rc b/plugins/StatusManager/res/resource.rc
index 6b55e42b1d..3edc4bc950 100644
--- a/plugins/StatusManager/res/resource.rc
+++ b/plugins/StatusManager/res/resource.rc
@@ -24,18 +24,19 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 // Dialog
 //
 
-IDD_OPT_SUBPLUGINS DIALOGEX 0, 0, 212, 144
+IDD_OPT_SUBPLUGINS DIALOGEX 0, 0, 302, 181
 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "Enable ""Keep status"" *",IDC_ENABLE_KEEPSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,24,173,10
-    CONTROL         "Enable ""Startup status"" *",IDC_ENABLE_STARTUPSTATUS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,37,173,10
-    CONTROL         "Enable ""Advanced auto away"" *",IDC_ENABLE_ADVANCEDAUTOAWAY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,50,173,10
-    GROUPBOX        "Subplugins control",IDC_STATIC,7,7,198,89
-    LTEXT           "* requires a reboot for applying changes",IDC_STATIC,19,81,173,9
+    GROUPBOX        "Enable modules",IDC_STATIC,9,8,282,156
+    CONTROL         "Keep status",IDC_ENABLE_KEEPSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,24,262,10
+    LTEXT           "A connection checker. Automatically reconnects your accounts after protocol error or internet drop.",IDC_STATIC,40,36,241,24
+    CONTROL         "Startup status",IDC_ENABLE_STARTUPSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,64,262,10
+    LTEXT           "Allows you to define the status Miranda should set on startup, configurable per account.",IDC_STATIC,40,76,241,24
+    CONTROL         "Advanced auto away",IDC_ENABLE_ADVANCEDAUTOAWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,105,262,10
+    LTEXT           "Improved Auto Away module with some more options than the built in, configurable per account.",IDC_STATIC,40,117,241,24
+    LTEXT           "Note: Miranda NG will have to be restarted for changes to take effect.",IDC_STATIC,19,148,270,9
 END
 
 
@@ -49,6 +50,11 @@ GUIDELINES DESIGNINFO
 BEGIN
     IDD_OPT_SUBPLUGINS, DIALOG
     BEGIN
+        RIGHTMARGIN, 298
+        VERTGUIDE, 19
+        VERTGUIDE, 40
+        VERTGUIDE, 281
+        BOTTOMMARGIN, 176
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -59,9 +65,9 @@ END
 // AFX_DIALOG_LAYOUT
 //
 
-IDD_OPT_SUBPLUGINS AFX_DIALOG_LAYOUT
+IDD_OPT_SUBPLUGINS AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
 END
 
 #endif    // English resources
@@ -75,44 +81,6 @@ END
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #pragma code_page(1252)
 
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "..\\src\\resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// 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"
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -514,36 +482,72 @@ END
 // AFX_DIALOG_LAYOUT
 //
 
-IDD_OPT_KS_ADV AFX_DIALOG_LAYOUT
+IDD_OPT_KS_ADV AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
 END
 
-IDD_OPT_AUTOAWAY AFX_DIALOG_LAYOUT
+IDD_OPT_AUTOAWAY AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
 END
 
-IDD_OPT_GENAUTOAWAY AFX_DIALOG_LAYOUT
+IDD_OPT_GENAUTOAWAY AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
 END
 
-IDD_OPT_KS_BASIC AFX_DIALOG_LAYOUT
+IDD_OPT_KS_BASIC AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
 END
 
-IDD_PUOPT_KEEPSTATUS AFX_DIALOG_LAYOUT
+IDD_PUOPT_KEEPSTATUS AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
 END
 
-IDD_TRG_AAASTATECHANGE AFX_DIALOG_LAYOUT
+IDD_TRG_AAASTATECHANGE AFX_DIALOG_LAYOUT 
 BEGIN
-    0
+    0x0000
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
 END
 
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// 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/resource.h b/plugins/StatusManager/src/resource.h
index c0e9db35e6..fe80e01f93 100644
--- a/plugins/StatusManager/src/resource.h
+++ b/plugins/StatusManager/src/resource.h
@@ -2,7 +2,6 @@
 // Microsoft Visual C++ generated include file.
 // Used by E:\Projects\C++\miranda-ng\plugins\StatusManager\res\resource.rc
 //
-#define IDD_OPT_KEEPSTATUS              101
 #define IDD_OPT_KS_BASIC                101
 #define IDD_CONFIRMDIALOG               102
 #define IDD_OPT_AUTOAWAY                104
@@ -15,7 +14,6 @@
 #define IDD_OPT_KS_ACTION               120
 #define IDD_SETSTSMSGDIALOG             121
 #define IDD_OPT_STATUSPROFILES          123
-#define IDD_OPT_AAATABS                 126
 #define IDD_OPT_TABS                    126
 #define IDD_OPT_KS_ADV                  127
 #define IDD_TRG_AAASTATECHANGE          128
@@ -27,11 +25,8 @@
 #define IDC_PROFILE                     1002
 #define IDC_STARTUPLIST                 1008
 #define IDC_STATUSMSG                   1008
-#define IDC_SETSTATUSONSTARTUP          1010
 #define IDC_SETPROFILE                  1010
-#define IDC_SETWINDOW                   1011
 #define IDC_SETWINSTATE                 1011
-#define IDC_WINDOW                      1012
 #define IDC_WINSTATE                    1012
 #define IDC_CLOSE                       1013
 #define IDC_SHOWDIALOG                  1014
@@ -45,7 +40,6 @@
 #define IDC_CHECKCONNECTION             1025
 #define IDC_MAXRETRIES                  1026
 #define IDC_INITDELAY                   1027
-#define IDC_SETSTATUSDELAY              1027
 #define IDC_SETPROFILEDELAY             1027
 #define IDC_DOCKED                      1028
 #define IDC_SETDOCKED                   1029
@@ -62,12 +56,10 @@
 #define IDC_DELPROFILE                  1042
 #define IDC_PROFILENAME                 1043
 #define IDC_CANCEL                      1044
-#define IDC_DEFAULTPROFILE              1045
 #define IDC_MONITORMIRANDA              1045
 #define IDC_WINCOLORS                   1045
 #define IDC_CHKINET                     1045
 #define IDC_IGNLOCK                     1045
-#define IDC_CREATETTBBUTTONS            1046
 #define IDC_CREATETTB                   1046
 #define IDC_PERPROTOCOLSETTINGS         1050
 #define IDC_SAMESETTINGS                1051
@@ -146,14 +138,12 @@
 #define IDC_BECOMEACTIVE                1138
 #define IDC_ENABLE_KEEPSTATUS           1141
 #define IDC_ENABLE_STARTUPSTATUS        1142
-#define IDC_ENABLEADVANCEDAUTOAWAY      1143
 #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_SCREENSAVE2                 1150
 #define IDC_FULLSCREEN                  1150
 #define IDC_RADUSEMIRANDA               1210
 #define IDC_RADUSECUSTOM                1212
diff --git a/plugins/StatusManager/src/version.h b/plugins/StatusManager/src/version.h
index 9653b36900..d4e2982f74 100644
--- a/plugins/StatusManager/src/version.h
+++ b/plugins/StatusManager/src/version.h
@@ -1,7 +1,7 @@
 // plugin version part
 #define __MAJOR_VERSION          0
 #define __MINOR_VERSION          11
-#define __RELEASE_NUM            1
+#define __RELEASE_NUM            2
 #define __BUILD_NUM              0
 
 // other stuff for Version resource
@@ -14,4 +14,4 @@
 #define __AUTHOR                "P Boon"
 #define __AUTHOREMAIL           "unregistered@users.sourceforge.net"
 #define __AUTHORWEB             "http://miranda-ng.org/p/StatusManager/"
-#define __COPYRIGHT             "© 2003-08 P. Boon, 2008-17 George Hazan"
+#define __COPYRIGHT             "� 2003-08 P. Boon, 2008-17 George Hazan"