MsgPopup adopted

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

2 files changed, 59 insertions, 32 deletions

diff --git a/plugins/MsgPopup/res/MsgPopup.rc b/plugins/MsgPopup/res/MsgPopup.rc
index 5b45a81bd2..1487857a3c 100644
--- a/plugins/MsgPopup/res/MsgPopup.rc
+++ b/plugins/MsgPopup/res/MsgPopup.rc
@@ -1,24 +1,23 @@
-//Microsoft Developer Studio generated resource script.

+// Microsoft Visual C++ generated resource script.

 //

+#include "..\src\resource.h"

+

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include "..\src\resource.h"

 #include "afxres.h"

 

 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

 

 /////////////////////////////////////////////////////////////////////////////

-// Russian resources

+// Russian (Russia) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

-#ifdef _WIN32

 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 #pragma code_page(1251)

-#endif //_WIN32

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -26,51 +25,41 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 //

 

 IDD_OPTIONS DIALOGEX 0, 0, 295, 181

-STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

 EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg"

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

 BEGIN

-    CONTROL         "",IDC_ASTERISK_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,

-                    56,16,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_ASTERISK_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,56,16,39,12,WS_EX_NOPARENTNOTIFY

     GROUPBOX        "ASTERISK style",IDC_STATIC,0,1,295,37

     LTEXT           "Background",IDC_STATIC,113,18,40,8

     LTEXT           "Foreground",IDC_STATIC,8,18,37,8

-    CONTROL         "",IDC_ASTERISK_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,

-                    161,16,39,12,WS_EX_NOPARENTNOTIFY

-    CONTROL         "",IDC_ERROR_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,56,

-                    56,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_ASTERISK_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,161,16,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_ERROR_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,56,56,39,12,WS_EX_NOPARENTNOTIFY

     GROUPBOX        "ERROR style",IDC_STATIC,0,41,295,37

     LTEXT           "Background",IDC_STATIC,113,58,40,8

     LTEXT           "Foreground",IDC_STATIC,8,58,37,8

-    CONTROL         "",IDC_ERROR_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,161,

-                    56,39,12,WS_EX_NOPARENTNOTIFY

-    CONTROL         "",IDC_EXCLAMATION_FG,"ColourPicker",WS_GROUP | 

-                    WS_TABSTOP,56,96,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_ERROR_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,161,56,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_EXCLAMATION_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,56,96,39,12,WS_EX_NOPARENTNOTIFY

     GROUPBOX        "EXCLAMATION style",IDC_STATIC,0,81,295,37

     LTEXT           "Background",IDC_STATIC,113,98,40,8

     LTEXT           "Foreground",IDC_STATIC,8,98,37,8

-    CONTROL         "",IDC_EXCLAMATION_BG,"ColourPicker",WS_GROUP | 

-                    WS_TABSTOP,161,96,39,12,WS_EX_NOPARENTNOTIFY

-    CONTROL         "",IDC_QUESTION_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,

-                    56,136,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_EXCLAMATION_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,161,96,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_QUESTION_FG,"ColourPicker",WS_GROUP | WS_TABSTOP,56,136,39,12,WS_EX_NOPARENTNOTIFY

     GROUPBOX        "QUESTION style",IDC_STATIC,0,121,295,37

     LTEXT           "Background",IDC_STATIC,113,138,40,8

     LTEXT           "Foreground",IDC_STATIC,8,138,37,8

-    CONTROL         "",IDC_QUESTION_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,

-                    161,136,39,12,WS_EX_NOPARENTNOTIFY

+    CONTROL         "",IDC_QUESTION_BG,"ColourPicker",WS_GROUP | WS_TABSTOP,161,136,39,12,WS_EX_NOPARENTNOTIFY

     PUSHBUTTON      "Preview",IDC_PREVIEW,234,162,50,14

     LTEXT           "Timeout",IDC_STATIC,213,18,26,8

     EDITTEXT        IDC_TIMEOUT1,245,15,40,14,ES_AUTOHSCROLL

-    LTEXT           "Special values of the ""Timeout"":\n -1 - infinity, 0 - use default timeout value",

-                    IDC_STATIC,17,160,137,18

+    LTEXT           "Special values of the ""Timeout"":\n -1 - infinity, 0 - use default timeout value",IDC_STATIC,17,160,137,18

     LTEXT           "Timeout",IDC_STATIC,213,58,26,8

     EDITTEXT        IDC_TIMEOUT2,245,55,40,14,ES_AUTOHSCROLL

     LTEXT           "Timeout",IDC_STATIC,213,98,26,8

     EDITTEXT        IDC_TIMEOUT3,245,95,40,14,ES_AUTOHSCROLL

     LTEXT           "Timeout",IDC_STATIC,213,138,26,8

     EDITTEXT        IDC_TIMEOUT4,245,135,40,14,ES_AUTOHSCROLL

-    CONTROL         "Emit a sound",IDC_MESSAGEBEEP,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,167,164,57,10

+    CONTROL         "Emit a sound",IDC_MESSAGEBEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,164,57,10

 END

 

 

@@ -80,18 +69,18 @@ END
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE DISCARDABLE 

+1 TEXTINCLUDE 

 BEGIN

     "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE DISCARDABLE 

+2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE DISCARDABLE 

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

@@ -106,7 +95,7 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

+GUIDELINES DESIGNINFO

 BEGIN

     IDD_OPTIONS, DIALOG

     BEGIN

@@ -116,7 +105,7 @@ BEGIN
 END

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Russian resources

+#endif    // Russian (Russia) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

diff --git a/plugins/MsgPopup/res/Version.rc b/plugins/MsgPopup/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/MsgPopup/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END