fixes #3875 (WebView: перевод не помещается)

2 files changed, 165 insertions, 161 deletions

diff --git a/protocols/WebView/res/webview.rc b/protocols/WebView/res/webview.rc
index 1f602d580f..aef433950a 100644
--- a/protocols/WebView/res/webview.rc
+++ b/protocols/WebView/res/webview.rc
@@ -1,7 +1,16 @@
-#include <windows.h>
 // Microsoft Visual C++ generated resource script.
 //
 #include "..\src\resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+ #include <winres.h>
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
 /////////////////////////////////////////////////////////////////////////////
 // Russian (Russia) resources
 
@@ -50,25 +59,25 @@ IDI_STOP                ICON                    "stop.ico"
 // Dialog
 //
 
-IDD_OPT DIALOGEX 0, 0, 280, 231
+IDD_OPT DIALOGEX 0, 0, 296, 218
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Webview",IDC_STATIC,1,11,278,63,WS_GROUP
+    GROUPBOX        "Webview",IDC_STATIC,1,11,289,63,WS_GROUP
     LTEXT           "Update data every",IDC_STATIC,6,26,100,8
-    EDITTEXT        IDC_TIME,84,26,28,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,125,11,7,11
+    EDITTEXT        IDC_TIME,84,24,28,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,101,25,11,11
     LTEXT           "minutes",IDC_STATIC,113,26,25,8
-    LTEXT           "Delay update on start",IDC_STARTDELAYTXT,6,49,100,8
-    EDITTEXT        IDC_START_DELAY,84,49,28,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Spin2",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,125,34,7,11
+    LTEXT           "Delay update on start",IDC_STARTDELAYTXT,6,49,74,8
+    EDITTEXT        IDC_START_DELAY,84,48,28,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Spin2",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,103,48,11,11
     LTEXT           "seconds",IDC_STDELAYSECTXT,113,49,36,8
-    CONTROL         "Hide icon on status bar",IDC_HIDE_STATUS_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,20,128,8
-    CONTROL         "Load page on window open",IDC_UPDATE_ON_OPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,33,128,8
-    CONTROL         "Update data on startup",IDC_UPDATE_ONSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,47,128,8
-    CONTROL         "Only update window on alert",IDC_UPDATE_ONALERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,60,128,8
-    GROUPBOX        "Window appearance",IDC_STATIC,1,75,278,62
+    CONTROL         "Hide icon on status bar",IDC_HIDE_STATUS_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,20,135,8
+    CONTROL         "Load page on window open",IDC_UPDATE_ON_OPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,33,135,8
+    CONTROL         "Update data on startup",IDC_UPDATE_ONSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,47,135,8
+    CONTROL         "Only update window on alert",IDC_UPDATE_ONALERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,60,135,8
+    GROUPBOX        "Window appearance",IDC_STATIC,1,75,289,62
     LTEXT           "Background color:",IDC_STATIC,16,85,69,8
     CONTROL         "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,85,85,20,8
     LTEXT           "Text color:",IDC_STATIC,16,95,69,8
@@ -76,21 +85,21 @@ BEGIN
     COMBOBOX        IDC_TYPEFACE,16,105,136,182,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCRIPT,58,120,72,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FONTSIZE,16,120,40,69,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Bold",IDC_FONT_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,90,48,8
-    CONTROL         "Italic",IDC_FONT_ITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,100,48,8
-    CONTROL         "Underline",IDC_FONT_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,110,58,8
+    CONTROL         "Bold",IDC_FONT_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,88,125,8
+    CONTROL         "Italic",IDC_FONT_ITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,99,121,8
+    CONTROL         "Underline",IDC_FONT_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,175,110,111,8
     CONTROL         "Save individual window positions",IDC_SAVE_INDIVID_POS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,122,146,8
-    GROUPBOX        "Error messages",IDC_STATIC,1,137,278,25
-    CONTROL         "Suppress error messages",IDC_SUPPRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,149,113,8
+    GROUPBOX        "Error messages",IDC_STATIC,1,137,289,25
+    CONTROL         "Suppress error messages",IDC_SUPPRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,149,125,8
     CONTROL         "Display using popup or OSD plugin",IDC_ERROR_POPUP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,149,130,8
-    GROUPBOX        "Expert options",IDC_ADV_GRP,142,163,137,35,WS_GROUP
-    CONTROL         "Disable download protection",IDC_NO_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,175,130,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,149,145,8
+    GROUPBOX        "Expert options",IDC_ADV_GRP,142,163,149,35,WS_GROUP
+    CONTROL         "Disable download protection",IDC_NO_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,175,138,8
     LTEXT           "(not recommended)",IDC_NOT_RECOMND_TXT,148,185,122,8
     GROUPBOX        "Display data in popup on alert",IDC_STATIC,1,164,139,34
-    CONTROL         "Display data in popup",IDC_DATAPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,177,120,8
-    LTEXT           "You may need to restart Miranda NG for this change to take effect.",IDC_RESTART,30,220,230,8,NOT WS_VISIBLE
+    CONTROL         "Display data in popup",IDC_DATAPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,180,128,8
+    LTEXT           "You may need to restart Miranda NG for this change to take effect.",IDC_RESTART,30,203,230,8,NOT WS_VISIBLE
 END
 
 IDD_DISPLAY_DATA DIALOGEX 0, 0, 212, 150
@@ -294,7 +303,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "\0"
+    " #include <winres.h>\0"
 END
 
 3 TEXTINCLUDE 
diff --git a/protocols/WebView/src/resource.h b/protocols/WebView/src/resource.h
index 96a41d2ff9..046b1188bb 100644
--- a/protocols/WebView/src/resource.h
+++ b/protocols/WebView/src/resource.h
@@ -1,138 +1,133 @@
-#define UNI 1
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by W:\miranda-ng\protocols\WebView\res\webview.rc
+//
+#define UNI                             1
+#define IDI_SITE                        101
+#define IDI_STICK                       102
+#define IDI_UNSTICK                     103
+#define IDI_URL                         104
+#define IDI_OPTIONS                     105
+#define IDI_UPDATE                      106
+#define IDI_SHOW_HIDE                   107
+#define IDI_FIND                        108
+#define IDI_ALERT                       110
+#define IDI_FOLDER                      111
+#define IDI_UPDATEALL                   112
+#define IDI_MARKALLREAD                 113
+#define IDI_PING                        114
+#define IDI_STOP                        115
+#define IDC_UPDATE_ONSTART              300
+#define IDC_DBLE_WEB                    301
+#define IDC_DBLE_WIN                    302
+#define IDC_UPDATE_ON_OPEN              303
+#define IDC_UPDATE_ONALERT              304
+#define IDD_OPT                         443
+#define IDC_OPEN_WEBPAGE                447
+#define IDC_TIME                        450
+#define IDC_BGCOLOR                     451
+#define IDC_TXTCOLOR                    452
+#define IDC_RESTART                     453
+#define IDC_CLEAN                       457
+#define IDC_SUPPRESS                    458
+#define IDC_SPIN1                       461
+#define IDC_HIDE_STATUS_ICON            464
+#define IDC_RWSPACE                     465
+#define IDC_RWSPC_TEXT                  466
+#define IDC_TYPEFACE                    467
+#define IDC_FONT_BOLD                   468
+#define IDC_FONT_ITALIC                 469
+#define IDC_FONT_UNDERLINE              470
+#define IDC_FONTSIZE                    471
+#define IDC_U_SE_STRINGS                475
+#define IDC_U_ALLSITE                   476
+#define IDC_ERROR_POPUP                 477
+#define IDC_START_DELAY                 480
+#define IDC_SPIN2                       481
+#define IDC_STARTDELAYTXT               482
+#define IDC_STDELAYSECTXT               483
+#define IDC_SAVE_INDIVID_POS            484
+#define IDC_ADV_GRP                     485
+#define IDC_NO_PROTECT                  486
+#define IDC_NOT_RECOMND_TXT             487
+#define IDC_SCRIPT                      488
+#define IDC_DATAPOPUP                   489
+#define IDR_CONTEXT                     500
+#define IDM_CUT                         501
+#define IDM_PASTE                       502
+#define IDM_DELETE                      503
+#define IDM_CLEAR_ALL                   504
+#define IDM_COPY                        505
+#define IDM_COPYALL                     506
+#define IDM_SELECTALL                   507
+#define IDC_SITE_NAME                   551
+#define IDC_ERR_CHK                     552
+#define IDC_APPEND                      554
+#define IDC_FILENAME                    555
+#define IDC_BROWSE                      556
+#define IDC_SAVE_AS_RAW                 557
+#define IDD_DISPLAY_DATA                600
+#define IDC_OPEN_URL                    601
+#define IDC_DATA                        602
+#define IDC_UPDATE_BUTTON               603
+#define IDC_STICK_BUTTON                604
+#define IDC_FIND_BUTTON                 605
+#define IDC_STATUSBAR                   606
+#define IDC_OPTIONS_BUTTON              607
+#define IDC_ALERT_BUTTON                608
+#define IDC_STOP                        609
+#define IDC_ERRORMSG                    620
+#define IDD_CONTACT_OPT                 700
+#define IDC_END                         701
+#define IDC_START                       702
+#define IDC_URL                         703
+#define IDC_OPT_CANCEL                  704
+#define IDC_OPT_APPLY                   705
+#define IDC_CPY_STRINGS                 706
+#define IDD_FIND                        750
+#define IDC_FINDWHAT                    751
+#define IDC_OK                          752
+#define IDC_CANCEL                      753
+#define IDC_SEARCH_COMPLETE             754
+#define IDD_ALRT_OPT                    801
+#define IDC_ENABLE_ALERTS               802
+#define IDC_OK2                         803
+#define IDC_ALERT_STRING                804
+#define IDC_ALERT_TYPE                  807
+#define IDC_EVENT_TYPE                  808
+#define IDC_ALERT_CANCEL                809
+#define IDC_ALERT_APPLY                 810
+#define IDC_START2                      811
+#define IDC_END2                        812
+#define IDC_ADD_DATE_NAME               813
+#define IDC_DELAY                       814
+#define IDC_PREFIX                      815
+#define IDC_SUFFIX                      816
+#define IDC_24_HOUR                     817
+#define IDC_ALWAYS_LOG                  818
+#define IDD_POPUP                       850
+#define IDC_POP_BGCOLOUR                851
+#define IDC_POP_TEXTCOLOUR              852
+#define IDC_PD1                         853
+#define IDC_PD2                         854
+#define IDC_PREVIEW                     856
+#define IDC_POP_USEWINCOLORS            857
+#define IDC_POP_USESAMECOLORS           858
+#define IDC_POP_USECUSTCOLORS           859
+#define IDC_LCLK_WINDOW                 860
+#define IDC_LCLK_WEB_PGE                861
+#define IDC_LCLK_DISMISS                862
+#define IDC_RCLK_WINDOW                 863
+#define IDC_RCLK_WEB_PGE                864
+#define IDC_RCLK_DISMISS                865
 
-#define IDC_STATIC -1
-
-#define IDI_SITE 101
-#define IDI_STICK  102
-#define IDI_UNSTICK         103
-#define IDI_URL  104
-#define IDI_OPTIONS         105
-#define IDI_UPDATE 106
-#define IDI_SHOW_HIDE       107
-#define IDI_FIND 108
-#define IDI_ALERT  110
-#define IDI_FOLDER 111
-#define IDI_UPDATEALL       112
-#define IDI_MARKALLREAD     113
-#define IDI_PING 114
-#define IDI_STOP 115
-
-
-#define IDC_UPDATE_ONSTART  300
-#define IDC_DBLE_WEB        301
-#define IDC_DBLE_WIN        302
-#define IDC_UPDATE_ON_OPEN  303
-#define IDC_UPDATE_ONALERT  304
-
-#define IDD_OPT  443
-#define IDC_OPEN_WEBPAGE    447
-#define IDC_TIME 450
-
-#define IDC_BGCOLOR         451
-#define IDC_TXTCOLOR        452
-#define IDC_RESTART         453
-#define IDC_CLEAN  457
-#define IDC_SUPPRESS        458
-#define IDC_SPIN1  461
-#define IDC_HIDE_STATUS_ICON 464
-#define IDC_RWSPACE         465
-#define IDC_RWSPC_TEXT      466
-#define IDC_TYPEFACE        467
-#define IDC_FONT_BOLD       468
-#define IDC_FONT_ITALIC     469
-#define IDC_FONT_UNDERLINE  470
-#define IDC_FONTSIZE        471
-#define IDC_U_SE_STRINGS    475
-#define IDC_U_ALLSITE       476
-#define IDC_ERROR_POPUP     477
-#define IDC_START_DELAY     480
-#define IDC_SPIN2  481
-#define IDC_STARTDELAYTXT   482
-#define IDC_STDELAYSECTXT   483
-#define IDC_SAVE_INDIVID_POS 484
-#define IDC_ADV_GRP         485
-#define IDC_NO_PROTECT      486
-#define IDC_NOT_RECOMND_TXT 487
-#define IDC_SCRIPT 488
-#define IDC_DATAPOPUP       489
-
-#define IDR_CONTEXT         500
-#define IDM_CUT  501
-#define IDM_PASTE  502
-#define IDM_DELETE 503
-#define IDM_CLEAR_ALL       504
-#define IDM_COPY 505
-#define IDM_COPYALL         506
-#define IDM_SELECTALL       507
-
-#define IDC_SITE_NAME       551
-#define IDC_ERR_CHK         552
-#define IDC_APPEND 554
-#define IDC_FILENAME        555
-#define IDC_BROWSE 556
-#define IDC_SAVE_AS_RAW     557
-//#define IDC_AGENT  557//temp
-
-#define IDD_DISPLAY_DATA    600
-#define IDC_OPEN_URL        601
-#define IDC_DATA 602
-#define IDC_UPDATE_BUTTON   603
-#define IDC_STICK_BUTTON    604
-#define IDC_FIND_BUTTON     605
-#define IDC_STATUSBAR       606
-#define IDC_OPTIONS_BUTTON  607
-#define IDC_ALERT_BUTTON    608
-//#define IDC_HIDDEN_URL      609
-#define IDC_STOP 609
-
-#define IDC_ERRORMSG        620
-
-#define IDD_CONTACT_OPT     700
-#define IDC_END  701
-#define IDC_START  702
-#define IDC_URL  703
-#define IDC_OPT_CANCEL      704
-#define IDC_OPT_APPLY       705
-#define IDC_CPY_STRINGS     706
-
-
-#define IDD_FIND 750
-#define IDC_FINDWHAT        751
-#define IDC_OK  752
-#define IDC_CANCEL 753
-#define IDC_SEARCH_COMPLETE 754
-
-#define IDD_ALRT_OPT        801
-#define IDC_ENABLE_ALERTS   802
-#define IDC_OK2  803
-#define IDC_ALERT_STRING    804
-#define IDC_ALERT_TYPE      807
-#define IDC_EVENT_TYPE      808
-#define IDC_ALERT_CANCEL    809
-#define IDC_ALERT_APPLY     810
-#define IDC_START2 811
-#define IDC_END2 812
-#define IDC_ADD_DATE_NAME   813
-#define IDC_DELAY  814
-#define IDC_PREFIX 815
-#define IDC_SUFFIX 816
-#define IDC_24_HOUR         817
-#define IDC_ALWAYS_LOG      818
-
-#define  IDD_POPUP 850
-#define  IDC_POP_BGCOLOUR   851
-#define  IDC_POP_TEXTCOLOUR 852
-#define  IDC_PD1 853
-#define  IDC_PD2 854
-//#define  IDC_PD3 855
-#define  IDC_PREVIEW        856
-#define  IDC_POP_USEWINCOLORS  857
-#define  IDC_POP_USESAMECOLORS 858
-#define  IDC_POP_USECUSTCOLORS 859
-#define  IDC_LCLK_WINDOW    860
-#define  IDC_LCLK_WEB_PGE   861
-#define  IDC_LCLK_DISMISS   862
-#define  IDC_RCLK_WINDOW    863
-#define  IDC_RCLK_WEB_PGE   864
-#define  IDC_RCLK_DISMISS   865
-//#define  IDC_PUALERT        866
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif