From 761b24e09c32b49cabbebb97106da55459d112e7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 20 Oct 2012 17:20:04 +0000 Subject: version info standartization git-svn-id: http://svn.miranda-ng.org/main/trunk@2000 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ChangeKeyboardLayout/src/Version.h | 20 ++++++++++++++++++++ plugins/ChangeKeyboardLayout/src/commonheaders.h | 4 +--- plugins/ChangeKeyboardLayout/src/hook_events.cpp | 4 ++-- plugins/ChangeKeyboardLayout/src/main.cpp | 20 ++++++++++---------- plugins/ChangeKeyboardLayout/src/options.cpp | 3 +-- plugins/ChangeKeyboardLayout/src/text_operations.cpp | 2 +- 6 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 plugins/ChangeKeyboardLayout/src/Version.h (limited to 'plugins/ChangeKeyboardLayout/src') diff --git a/plugins/ChangeKeyboardLayout/src/Version.h b/plugins/ChangeKeyboardLayout/src/Version.h new file mode 100644 index 0000000000..a80b84c7fd --- /dev/null +++ b/plugins/ChangeKeyboardLayout/src/Version.h @@ -0,0 +1,20 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 5 + +#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 "Change Keyboard Layout" +#define __INTERNAL_NAME "ChangeKeyboardLayout" +#define __FILENAME "ChangeKeyboardLayout.dll" +#define __DESCRIPTION "Plugin for change keyboard layout of text (multilayout)." +#define __AUTHOR "Yasnovidyashii" +#define __AUTHOREMAIL "Yasnovidyashii@gmail.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2006-2009 Mikhail Yur'ev" diff --git a/plugins/ChangeKeyboardLayout/src/commonheaders.h b/plugins/ChangeKeyboardLayout/src/commonheaders.h index b772f9555e..27646be794 100644 --- a/plugins/ChangeKeyboardLayout/src/commonheaders.h +++ b/plugins/ChangeKeyboardLayout/src/commonheaders.h @@ -27,13 +27,11 @@ #include "options.h" #include "hook_events.h" #include "text_operations.h" +#include "version.h" - -#define VERSION PLUGIN_MAKE_VERSION(0,0,1,5) #define MaxTextSize 64000 #define ModuleName "ChangeKeyboardLayout" - // History++ API #define MS_HPP_EG_WINDOW "History++/ExtGrid/NewWindow" #define MS_HPP_EG_EVENT "History++/ExtGrid/Event" diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 5c94609252..6acadc9aea 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -1,4 +1,4 @@ -#include "hook_events.h" +#include "commonheaders.h" INT_PTR APIChangeLayout(WPARAM wParam, LPARAM lParam) { @@ -177,7 +177,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) OnIconsChanged(0, 0); RegPopupActions(); - DBWriteContactSettingDword(NULL, ModuleName, "CurrentVer", VERSION); + DBWriteContactSettingDword(NULL, ModuleName, "CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)); return 0; } diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp index d54934fe0a..e175cb5278 100644 --- a/plugins/ChangeKeyboardLayout/src/main.cpp +++ b/plugins/ChangeKeyboardLayout/src/main.cpp @@ -14,16 +14,16 @@ HANDLE hIcoLibIconsChanged; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - "Change Keyboard Layout", - VERSION, - "Plugin for change keyboard layout of text (multilayout).", - "Yasnovidyashii", - "Yasnovidyashii@gmail.com", - "© 2006-2009 Mikhail Yur'ev", - "http://miranda-ng.org/", - UNICODE_AWARE, //doesn't replace anything built-in + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, // {c5ef53a8-80d4-4ce9-b341-ec90d3ec9156} - {0xc5ef53a8, 0x80d4, 0x4ce9, { 0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56 }} + {0xc5ef53a8, 0x80d4, 0x4ce9, {0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56}} }; LPCTSTR ptszKeybEng = _T("`1234567890- = \\qwertyuiop[]asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+|QWERTYUIOP{}ASDFGHJKL:\"ZXCVBNM<>?"); @@ -34,7 +34,7 @@ LPCTSTR ptszSeparators = _T(" \t\n\r"); HANDLE hOptionsInitialize; HANDLE hModulesLoaded; -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; return TRUE; diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp index 39c678a9f3..63a811b212 100644 --- a/plugins/ChangeKeyboardLayout/src/options.cpp +++ b/plugins/ChangeKeyboardLayout/src/options.cpp @@ -1,5 +1,4 @@ -#include "options.h" - +#include "commonheaders.h" INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp index f4441ef4ae..779885a383 100644 --- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp +++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp @@ -1,4 +1,4 @@ -#include "text_operations.h" +#include "commonheaders.h" struct EditStreamData { PBYTE pbBuff; -- cgit v1.2.3