added version info

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

8 files changed, 24 insertions, 43 deletions

diff --git a/plugins/Clist_nicer/res/blank.ico b/plugins/Clist_nicer/res/blank.ico
deleted file mode 100644
index d8a5b3d80d..0000000000
--- a/plugins/Clist_nicer/res/blank.ico
+++ /dev/null
diff --git a/plugins/Clist_nicer/res/dragcopy.cur b/plugins/Clist_nicer/res/dragcopy.cur
deleted file mode 100644
index 89c7c960d5..0000000000
--- a/plugins/Clist_nicer/res/dragcopy.cur
+++ /dev/null
diff --git a/plugins/Clist_nicer/res/dropuser.cur b/plugins/Clist_nicer/res/dropuser.cur
deleted file mode 100644
index a84b19e28b..0000000000
--- a/plugins/Clist_nicer/res/dropuser.cur
+++ /dev/null
diff --git a/plugins/Clist_nicer/res/hyperlin.cur b/plugins/Clist_nicer/res/hyperlin.cur
deleted file mode 100644
index f0f548c828..0000000000
--- a/plugins/Clist_nicer/res/hyperlin.cur
+++ /dev/null
diff --git a/plugins/Clist_nicer/res/notick.ico b/plugins/Clist_nicer/res/notick.ico
deleted file mode 100644
index 7f93490642..0000000000
--- a/plugins/Clist_nicer/res/notick.ico
+++ /dev/null
diff --git a/plugins/Clist_nicer/res/notick1.ico b/plugins/Clist_nicer/res/notick1.ico
deleted file mode 100644
index 609504d614..0000000000
--- a/plugins/Clist_nicer/res/notick1.ico
+++ /dev/null
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 817aaed264..31eda32eba 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -7,7 +7,6 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include <windows.h>

 #include <winres.h>

 #include <statusmodes.h>

 

@@ -15,11 +14,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS

 

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

-// English (United States) resources

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

 

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

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

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

+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+#pragma code_page(1251)

 

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

 //

@@ -567,7 +566,6 @@ END
 

 2 TEXTINCLUDE 

 BEGIN

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

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

     "#include <statusmodes.h>\r\0"

 END

@@ -588,13 +586,13 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_NOTICK              ICON                    "notick.ico"

-IDI_TICK                ICON                    "notick1.ico"

+IDI_NOTICK              ICON                    "..\\..\\..\\src\\res\\check_off.ico"

+IDI_TICK                ICON                    "..\\..\\..\\src\\res\\check_on.ico"

 IDI_RENAME              ICON                    "rename.ico"

 IDI_DELETE              ICON                    "delete.ico"

 IDI_CLVM_OPTIONS        ICON                    "options_clvm.ico"

 IDI_CLVM_SELECT         ICON                    "arrow-down.ico"

-IDI_BLANK               ICON                    "blank.ico"

+IDI_BLANK               ICON                    "..\\..\\..\\src\\res\\_blank.ico"

 IDI_OVL_OFFLINE         ICON                    "overlay/offline.ico"

 IDI_OVL_ONLINE          ICON                    "overlay/online.ico"

 IDI_OVL_AWAY            ICON                    "overlay/away.ico"

@@ -622,9 +620,9 @@ IDI_TBACCOUNTS          ICON                    "accounts.ico"
 // Cursor

 //

 

-IDC_HYPERLINKHAND       CURSOR                  "hyperlin.cur"

-IDC_DROP                CURSOR                  "DRAGCOPY.CUR"

-IDC_DROPUSER            CURSOR                  "dropuser.cur"

+IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\res\\cursor_hyperlink.cur"

+IDC_DROP                CURSOR                  "..\\..\\..\\src\\res\\cursor_drag_copy.cur"

+IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\res\\cursor_drop_user.cur"

 

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

 //

@@ -706,15 +704,7 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

-    IDD_OPT_DSPGROUPS, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_DSPITEMS, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_DSPADVANCED, DIALOG

+    IDD_CLNABOUT, DIALOG

     BEGIN

     END

 

@@ -734,7 +724,7 @@ BEGIN
 END

 #endif    // APSTUDIO_INVOKED

 

-#endif    // English (United States) resources

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

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

 

 

diff --git a/plugins/Clist_nicer/res/version.rc b/plugins/Clist_nicer/res/version.rc
index 661991ce75..126eb53280 100644
--- a/plugins/Clist_nicer/res/version.rc
+++ b/plugins/Clist_nicer/res/version.rc
@@ -1,20 +1,15 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

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

 #endif //APSTUDIO_INVOKED

 

-#include "winres.h"

-

-#define VERSION_STRING "0.11.0.1"

-#define VER_MAJOR 0

-#define VER_MINOR 11

-#define VER_REVISION 0

-#define VER_BUILD 1

-

-#define RES_FILE_DESC "Clist_Nicer+"

+#include "afxres.h"

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

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION VER_MAJOR,VER_MINOR,VER_REVISION,VER_BUILD

- PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_REVISION,VER_BUILD

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

  FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

  FILEFLAGS 0x1L

@@ -22,22 +17,18 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

- FILETYPE 0x2L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "CompanyName", "Miranda NG project"

-            VALUE "FileDescription", RES_FILE_DESC

-            VALUE "FileVersion", VERSION_STRING

-            VALUE "InternalName", "clist_nicer"

-            VALUE "LegalCopyright", "Copyright (C) 2004-2010"

-            VALUE "LegalTrademarks", "Licensed under the Gnu general public license V2 or any later version."

-            VALUE "OriginalFilename", "clist_nicer.dll"

-            VALUE "ProductName", "Contact list plugin for Miranda NG"

-            VALUE "ProductVersion", VERSION_STRING

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

         END

     END

     BLOCK "VarFileInfo"