From 8580a1f565a8c99f6c133a4e75424b0b79b5700c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 1 Dec 2012 10:54:11 +0000 Subject: weather description fix git-svn-id: http://svn.miranda-ng.org/main/trunk@2583 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Weather/res/Version.rc | 42 ++++++++++++++++++++++ plugins/Weather/res/resource.rc | 56 +----------------------------- plugins/Weather/src/version.h | 23 ++++++++++-- plugins/Weather/src/weather.cpp | 17 ++++----- plugins/Weather/weather_10.vcxproj | 1 + plugins/Weather/weather_10.vcxproj.filters | 3 ++ 6 files changed, 76 insertions(+), 66 deletions(-) create mode 100644 plugins/Weather/res/Version.rc (limited to 'plugins/Weather') diff --git a/plugins/Weather/res/Version.rc b/plugins/Weather/res/Version.rc new file mode 100644 index 0000000000..d741488c4f --- /dev/null +++ b/plugins/Weather/res/Version.rc @@ -0,0 +1,42 @@ +// 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" + +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#endif //_WIN32 + +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/Weather/res/resource.rc b/plugins/Weather/res/resource.rc index d80ef7dd1f..698d3a8401 100644 --- a/plugins/Weather/res/resource.rc +++ b/plugins/Weather/res/resource.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include -#include "..\src\version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -397,7 +396,6 @@ END 2 TEXTINCLUDE BEGIN "#include \r\n" - "#include ""..\\src\\version.h""\r\n" "\0" END @@ -409,57 +407,5 @@ END #endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION __FILEVERSION_STRING - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "borkra, noname" - VALUE "FileDescription", "Miranda Weather Protocol" - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", "Weather Protocol" - VALUE "LegalCopyright", "Copyright © 2005 - 2010 Boris Krasnovskiy All Rights Reserved" - VALUE "OriginalFilename", "weather.dll" - VALUE "ProductName", "Weather Protocol" - VALUE "ProductVersion", __VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - #endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +///////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/plugins/Weather/src/version.h b/plugins/Weather/src/version.h index c528909dd7..f36385ce1a 100644 --- a/plugins/Weather/src/version.h +++ b/plugins/Weather/src/version.h @@ -1,3 +1,20 @@ -#define __FILEVERSION_STRING 0,4,0,1 -#define __VERSION_STRING "0.4.0.1" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 4, 0, 1) +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 4 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM + +#define __STRINGIFY_IMPL(x) #x +#define __STRINGIFY(x) __STRINGIFY_IMPL(x) +#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) + +#define __PLUGIN_NAME "Weather" +#define __INTERNAL_NAME "Weather" +#define __FILENAME "Weather.dll" +#define __DESCRIPTION "Retrieves weather information and displays it in your contact list." +#define __AUTHOR "Miranda NG Team" +#define __AUTHOREMAIL "" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2002-2005 NoName, 2005-2010 Boris Krasnovskiy, 2012 Miranda NG Team" diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 92e17894e7..4d7abb15f7 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -60,15 +60,16 @@ BOOL ModuleLoaded; static const PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - "Weather Protocol", - __VERSION_DWORD, - "Retrieves weather information and displays it in your contact list.", - "Miranda NG Team", - "www.miranda-ng.org", - "(c) 2002-2005 NoName, 2005-2010 Boris Krasnovskiy, 2012 Miranda NG Team", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - MIID_WEATHER + // {6B612A34-DCF2-4e32-85CF-B6FD006B745E} + {0x6b612a34, 0xdcf2, 0x4e32, { 0x85, 0xcf, 0xb6, 0xfd, 0x0, 0x6b, 0x74, 0x5e}} }; extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/Weather/weather_10.vcxproj b/plugins/Weather/weather_10.vcxproj index d09c5d1cb1..600f5fab8c 100644 --- a/plugins/Weather/weather_10.vcxproj +++ b/plugins/Weather/weather_10.vcxproj @@ -211,6 +211,7 @@ + diff --git a/plugins/Weather/weather_10.vcxproj.filters b/plugins/Weather/weather_10.vcxproj.filters index 385b06f839..8ceac73614 100644 --- a/plugins/Weather/weather_10.vcxproj.filters +++ b/plugins/Weather/weather_10.vcxproj.filters @@ -82,5 +82,8 @@ Resource Files + + Resource Files + \ No newline at end of file -- cgit v1.2.3