fixes #1455 completely

1 files changed, 36 insertions, 58 deletions

diff --git a/plugins/ProxySwitch/res/resource.rc b/plugins/ProxySwitch/res/resource.rc
index 470d7a75c0..e28f298e73 100644
--- a/plugins/ProxySwitch/res/resource.rc
+++ b/plugins/ProxySwitch/res/resource.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "..\src\resource.h"
 
@@ -40,7 +40,7 @@ IDI_NOTIF_0             ICON    "notif-no.ico"
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_OPTIONS, DIALOG
     BEGIN
@@ -49,6 +49,11 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 184
     END
+
+    IDD_HELP, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 163
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -59,94 +64,66 @@ END
 //
 
 IDD_OPTIONS DIALOGEX 0, 0, 302, 191
-STYLE DS_MODALFRAME | WS_CHILD
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Network addresses",IDC_STATIC,7,5,287,56,WS_GROUP
-    CONTROL         "Direct connection",IDC_STATIC,"Static",SS_SIMPLE,15,20,
-                    84,8
+    CONTROL         "Direct connection",IDC_STATIC,"Static",SS_SIMPLE,15,20,84,8
     EDITTEXT        IDC_EDIT_NOPROXY,101,17,183,14,ES_AUTOHSCROLL
     CONTROL         "Use proxy",IDC_STATIC,"Static",SS_SIMPLE,40,40,61,8
     EDITTEXT        IDC_EDIT_USEPROXY,101,37,183,14,ES_AUTOHSCROLL
     PUSHBUTTON      "?",IDC_BTN_HELP,15,39,14,12,BS_FLAT | NOT WS_TABSTOP
     GROUPBOX        "General",IDC_STATIC,7,65,144,118,WS_GROUP
-    CONTROL         "Manage Miranda NG proxy",IDC_CHECK_MIRANDA,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,78,131,10
-    CONTROL         "Manage Internet Explorer proxy",IDC_CHECK_IE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,92,132,10
-    CONTROL         "Manage Firefox proxy",IDC_CHECK_FIREFOX,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,106,132,10
-    CONTROL         "Reconnect if IP address changes",
-                    IDC_CHECK_ALWAY_RECONNECT,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,15,120,132,10
-    CONTROL         "Display 'Show my IP addresses' in menu",IDC_CHECK_SHOWMYIPMENU,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,134,130,10
-    CONTROL         "Display 'Proxy && IP' submenu",IDC_CHECK_PROXYIPMENU,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,148,131,10
+    CONTROL         "Manage Miranda NG proxy",IDC_CHECK_MIRANDA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,78,131,10
+    CONTROL         "Manage Internet Explorer proxy",IDC_CHECK_IE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,92,132,10
+    CONTROL         "Manage Firefox proxy",IDC_CHECK_FIREFOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,106,132,10
+    CONTROL         "Reconnect if IP address changes",IDC_CHECK_ALWAY_RECONNECT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,120,132,10
     LTEXT           "Hide interfaces",IDC_STATIC,15,165,62,8
     EDITTEXT        IDC_EDIT_HIDEINTF,80,161,62,14,ES_AUTOHSCROLL
     GROUPBOX        "Popup options",IDC_STATIC,160,65,134,118,WS_GROUP
-    CONTROL         "Enable popups",IDC_CHECK_POPUPS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,168,78,122,10
+    CONTROL         "Enable popups",IDC_CHECK_POPUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,78,122,10
     CONTROL         "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,168,94,39,11
     CONTROL         "Text color",IDC_STATIC,"Static",SS_SIMPLE,215,94,75,8
     CONTROL         "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,168,111,39,11
-    CONTROL         "Background color",IDC_STATIC,"Static",SS_SIMPLE,215,111,
-                    75,8
+    CONTROL         "Background color",IDC_STATIC,"Static",SS_SIMPLE,215,111,75,8
     CONTROL         "Use default popup colors",IDC_CHECK_DEFAULTCOLORS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,129,122,10
     CONTROL         "Show proxy status on change",IDC_CHECK_SHOWPROXYSTATUS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,143,123,10
-    CTEXT           "Restart of Miranda NG is required.",IDC_RESTARTREQUIRED,
-                    164,164,127,8,NOT WS_VISIBLE
-    LTEXT           "Enter semicolon (;) separated list of IP network addresses in any of the formats below:\n\tIP/bits\t(10.0.0.1/24)\t\tIP/mask\t(10.0.0.1/255.255.255.0)\n\tIP1-2\t(10.0.0.1-50)\t\tIP1-IP2\t(10.0.0.1-10.0.2.255)",
-                    IDC_HELP_1,7,66,287,32,NOT WS_VISIBLE | NOT WS_GROUP
-    LTEXT           "Any entry in the 'Use proxy' list can be prefixed by an exclamation mark (!) to increase its priority. Entries with wrong syntax will be ignored. The plugin checks the IP addresses in the following way:",
-                    IDC_HELP_2,7,98,287,27,NOT WS_VISIBLE | NOT WS_GROUP
-    LTEXT           "\t1) Use proxy if any interface has prioritized 'Use proxy' address\n\t2) Don't use proxy if any interface has 'Direct connection' address\n\t3) Use proxy if any interface has 'Use proxy' address\n\t4) Do nothing if unknown or any at all addresses found",
-                    IDC_HELP_3,7,125,287,59,NOT WS_VISIBLE | NOT WS_GROUP
+    CTEXT           "Restart of Miranda NG is required.",IDC_RESTARTREQUIRED,164,164,127,8,NOT WS_VISIBLE
 END
 
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
+IDD_HELP DIALOGEX 0, 0, 302, 167
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_PALETTEWINDOW | WS_EX_APPWINDOW
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    LTEXT           "Enter semicolon (;) separated list of IP network addresses in any of the formats below:\n\tIP/bits\t(10.0.0.1/24)\t\tIP/mask\t(10.0.0.1/255.255.255.0)\n\tIP1-2\t(10.0.0.1-50)\t\tIP1-IP2\t(10.0.0.1-10.0.2.255)",IDC_HELP_1,8,4,287,32
+    LTEXT           "Any entry in the 'Use proxy' list can be prefixed by an exclamation mark (!) to increase its priority. Entries with wrong syntax will be ignored. The plugin checks the IP addresses in the following way:",IDC_HELP_2,8,36,287,27
+    LTEXT           "\t1) Use proxy if any interface has prioritized 'Use proxy' address\n\t2) Don't use proxy if any interface has 'Direct connection' address\n\t3) Use proxy if any interface has 'Use proxy' address\n\t4) Do nothing if unknown or any at all addresses found",IDC_HELP_3,8,70,287,59
+    PUSHBUTTON      "OK",IDOK,195,149,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,250,149,50,14
+END
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Czech resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)
-#ifdef _WIN32
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
 //
-// TEXTINCLUDE
+// AFX_DIALOG_LAYOUT
 //
 
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
+IDD_HELP AFX_DIALOG_LAYOUT
 BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
+    0
 END
 
-3 TEXTINCLUDE DISCARDABLE
+IDD_OPTIONS AFX_DIALOG_LAYOUT
 BEGIN
-    "\r\n"
-    "\0"
+    0
 END
 
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Czech resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -160,3 +137,4 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+