fixed version info

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

2 files changed, 22 insertions, 53 deletions

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 3732b6fd64..8a9beccbc4 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -7,18 +7,18 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include <winresrc.h>

-#include "..\src\hdr\modern_statusmodes.h"

+#include <winres.h>

+#include <statusmodes.h>

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

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

-// Neutral resources

+// Русский (Россия) resources

 

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

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

+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+#pragma code_page(1251)

 

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

 //

@@ -836,18 +836,6 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

-    IDD_MODERNOPTS, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_CLIST_LISTBKG, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_SKIN, DIALOG

-    BEGIN

-    END

-

     IDD_OPT_SKINEDITOR, DIALOG

     BEGIN

         TOPMARGIN, 1

@@ -861,10 +849,6 @@ BEGIN
         HORZGUIDE, 207

     END

 

-    IDD_OPT_ITEMS, DIALOG

-    BEGIN

-    END

-

     IDD_SKIN_TAB, DIALOG

     BEGIN

         RIGHTMARGIN, 298

@@ -1159,19 +1143,6 @@ BEGIN
 END

 

 

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

-//

-// Dialog Info

-//

-

-IDD_OPT_CLUI_2 DLGINIT

-BEGIN

-    IDC_HIDEMETHOD, 0x403, 9, 0

-0x6f63, 0x706d, 0x656c, 0x6574, "\000" 

-    0

-END

-

-

 #ifdef APSTUDIO_INVOKED

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

 //

@@ -1185,8 +1156,8 @@ END
 

 2 TEXTINCLUDE 

 BEGIN

-    "#include <winresrc.h>\r\n"

-    "#include ""..\\src\\hdr\\modern_statusmodes.h""\r\n"

+    "#include <winres.h>\r\n"

+    "#include <statusmodes.h>\r\n"

     "\0"

 END

 

@@ -1198,7 +1169,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Neutral resources

+#endif    // Русский (Россия) resources

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

 

 

diff --git a/plugins/Clist_modern/res/version.rc b/plugins/Clist_modern/res/version.rc
index c845b1987b..5bfbab4754 100644
--- a/plugins/Clist_modern/res/version.rc
+++ b/plugins/Clist_modern/res/version.rc
@@ -1,36 +1,34 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

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

 #endif //APSTUDIO_INVOKED

 

-#include <winresrc.h>

+#include "afxres.h"

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

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION FILE_VERSION

- PRODUCTVERSION PRODUCT_VERSION

- FILEFLAGSMASK 0x3fL

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

- FILEOS 0x40004L

- FILETYPE 0x1L

+ FILEOS 0x4L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "Comments", "Licensed under the terms of the GNU General Public License"

-            VALUE "CompanyName", " "

-            VALUE "FileDescription", "Miranda NG Contact List. Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation."

-            VALUE "FileVersion", FILE_VERSION_STR

-            VALUE "InternalName", "Modern Contact List"

-            VALUE "LegalCopyright", "Copyright © 2000-2005 Artem Shpynov, Richard Hughes, Roland Rabien, Tristan Van de Vreede, Martin Oberg, Robert Rainwater, Sam Kothari and Lyon Lim"

-            VALUE "OriginalFilename", "clist_modern.dll"

-            VALUE "ProductName", "Miranda NG Contact List. Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation."

-            VALUE "ProductVersion", PRODUCT_VERSION_STR

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

         END

     END

     BLOCK "VarFileInfo"