version info standartization

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

6 files changed, 50 insertions, 57 deletions

diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index 6f6823ab14..c4e830b1cf 100644
--- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -67,51 +67,6 @@ IDB_BITMAP_ALT          BITMAP       "Alt.bmp"
 IDB_BITMAP_CTRL         BITMAP       "Ctrl.bmp"

 IDB_BITMAP_SHIFT        BITMAP       "Shift.bmp"

 

-#ifndef _MAC

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,1,5

- PRODUCTVERSION 0,0,1,5

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "Comments", "\0"

-            VALUE "CompanyName", "\0"

-            VALUE "FileDescription", "Plugin for change keyboard layout of text (multilayout)\0"

-            VALUE "FileVersion", "0, 0, 1, 5\0"

-            VALUE "InternalName", "ChangeKeyboardLayout\0"

-            VALUE "LegalCopyright", "Copyright © 2006-2009 Mikhail Yur'ev\0"

-            VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "ChangeKeyboardLayout.dll\0"

-            VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "ChangeKeyboardLayout\0"

-            VALUE "ProductVersion", "0, 0, 1, 5\0"

-            VALUE "SpecialBuild", "\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-#endif    // !_MAC

-

 #endif    // Russian resources

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

 

@@ -194,20 +149,20 @@ BEGIN
                     WS_TABSTOP

     EDITTEXT        IDC_EDIT_SET,42,208,261,14,ES_AUTOHSCROLL

     PUSHBUTTON      "Default",IDC_BUTTON_DEFAULT,253,226,50,14

-    CONTROL         112,IDC_STATIC,"Static",SS_BITMAP,80,23,15,8

-    CONTROL         111,IDC_STATIC,"Static",SS_BITMAP,110,23,12,8

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,50,23,17,8

-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,136,23,13,8

+    CONTROL         IDB_BITMAP_CTRL,IDC_STATIC,"Static",SS_BITMAP,80,23,15,8

+    CONTROL         IDB_BITMAP_ALT,IDC_STATIC,"Static",SS_BITMAP,110,23,12,8

+    CONTROL         IDB_BITMAP_SHIFT,IDC_STATIC,"Static",SS_BITMAP,50,23,17,8

+    CONTROL         IDB_BITMAP_WIN,IDC_STATIC,"Static",SS_BITMAP,136,23,13,8

     LTEXT           "+",IDC_STATIC,153,22,8,8

-    CONTROL         112,IDC_STATIC,"Static",SS_BITMAP,80,50,15,8

-    CONTROL         111,IDC_STATIC,"Static",SS_BITMAP,110,50,12,8

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,50,50,17,8

-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,136,50,13,8

+    CONTROL         IDB_BITMAP_CTRL,IDC_STATIC,"Static",SS_BITMAP,80,50,15,8

+    CONTROL         IDB_BITMAP_ALT,IDC_STATIC,"Static",SS_BITMAP,110,50,12,8

+    CONTROL         IDB_BITMAP_SHIFT,IDC_STATIC,"Static",SS_BITMAP,50,50,17,8

+    CONTROL         IDB_BITMAP_WIN,IDC_STATIC,"Static",SS_BITMAP,136,50,13,8

     LTEXT           "+",IDC_STATIC,153,49,8,8

-    CONTROL         112,IDC_STATIC,"Static",SS_BITMAP,80,77,15,8

-    CONTROL         111,IDC_STATIC,"Static",SS_BITMAP,110,77,12,8

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,50,77,17,8

-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,136,77,13,8

+    CONTROL         IDB_BITMAP_CTRL,IDC_STATIC,"Static",SS_BITMAP,80,77,15,8

+    CONTROL         IDB_BITMAP_ALT,IDC_STATIC,"Static",SS_BITMAP,110,77,12,8

+    CONTROL         IDB_BITMAP_SHIFT,IDC_STATIC,"Static",SS_BITMAP,50,77,17,8

+    CONTROL         IDB_BITMAP_WIN,IDC_STATIC,"Static",SS_BITMAP,136,77,13,8

     LTEXT           "+",IDC_STATIC,153,76,8,8

     CONTROL         "Invert current state",IDC_RADIO_INVERTCAPS,"Button",

                     BS_AUTORADIOBUTTON,171,145,133,10

diff --git a/plugins/ChangeKeyboardLayout/res/Version.rc b/plugins/ChangeKeyboardLayout/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/ChangeKeyboardLayout/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

diff --git a/plugins/ChangeKeyboardLayout/res/alt.ico b/plugins/ChangeKeyboardLayout/res/alt.ico
deleted file mode 100644
index d9a0c3f721..0000000000
--- a/plugins/ChangeKeyboardLayout/res/alt.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/res/ctrl.ico b/plugins/ChangeKeyboardLayout/res/ctrl.ico
deleted file mode 100644
index 0f894cf2cb..0000000000
--- a/plugins/ChangeKeyboardLayout/res/ctrl.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/res/shift.ico b/plugins/ChangeKeyboardLayout/res/shift.ico
deleted file mode 100644
index 15d7d89f34..0000000000
--- a/plugins/ChangeKeyboardLayout/res/shift.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/res/win.ico b/plugins/ChangeKeyboardLayout/res/win.ico
deleted file mode 100644
index a6b4623522..0000000000
--- a/plugins/ChangeKeyboardLayout/res/win.ico
+++ /dev/null