From 8eea7c202baeffa73f6e2e6b6d56f610cd43e1ee Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 30 Mar 2015 22:23:57 +0000 Subject: a bit of standardization git-svn-id: http://svn.miranda-ng.org/main/trunk@12568 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HwHotKeys/HwHotKeys_10.vcxproj | 6 ++-- plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters | 6 ++-- plugins/HwHotKeys/HwHotKeys_12.vcxproj | 6 ++-- plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters | 6 ++-- plugins/HwHotKeys/res/HwHotKeys.rc | 2 +- plugins/HwHotKeys/res/HwHotKeys_version.rc | 38 ------------------------ plugins/HwHotKeys/res/Version.rc | 38 ++++++++++++++++++++++++ plugins/HwHotKeys/src/HwHotKeys.h | 4 +-- plugins/HwHotKeys/src/HwHotKeys_resource.h | 27 ----------------- plugins/HwHotKeys/src/HwHotKeys_version.h | 41 -------------------------- plugins/HwHotKeys/src/Version.h | 41 ++++++++++++++++++++++++++ plugins/HwHotKeys/src/resource.h | 27 +++++++++++++++++ 12 files changed, 121 insertions(+), 121 deletions(-) delete mode 100644 plugins/HwHotKeys/res/HwHotKeys_version.rc create mode 100644 plugins/HwHotKeys/res/Version.rc delete mode 100644 plugins/HwHotKeys/src/HwHotKeys_resource.h delete mode 100644 plugins/HwHotKeys/src/HwHotKeys_version.h create mode 100644 plugins/HwHotKeys/src/Version.h create mode 100644 plugins/HwHotKeys/src/resource.h diff --git a/plugins/HwHotKeys/HwHotKeys_10.vcxproj b/plugins/HwHotKeys/HwHotKeys_10.vcxproj index effa6ac14d..dbea58307a 100644 --- a/plugins/HwHotKeys/HwHotKeys_10.vcxproj +++ b/plugins/HwHotKeys/HwHotKeys_10.vcxproj @@ -183,8 +183,8 @@ - - + + @@ -197,7 +197,7 @@ - + diff --git a/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters b/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters index 0dc01c54f3..2c2e2f7b70 100644 --- a/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters +++ b/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters @@ -18,10 +18,10 @@ Header Files - + Header Files - + Header Files @@ -49,7 +49,7 @@ Resource Files - + Resource Files diff --git a/plugins/HwHotKeys/HwHotKeys_12.vcxproj b/plugins/HwHotKeys/HwHotKeys_12.vcxproj index cad3f6c7e4..d58dcdff4c 100644 --- a/plugins/HwHotKeys/HwHotKeys_12.vcxproj +++ b/plugins/HwHotKeys/HwHotKeys_12.vcxproj @@ -186,8 +186,8 @@ - - + + @@ -200,7 +200,7 @@ - + diff --git a/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters b/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters index 0dc01c54f3..2c2e2f7b70 100644 --- a/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters +++ b/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters @@ -18,10 +18,10 @@ Header Files - + Header Files - + Header Files @@ -49,7 +49,7 @@ Resource Files - + Resource Files diff --git a/plugins/HwHotKeys/res/HwHotKeys.rc b/plugins/HwHotKeys/res/HwHotKeys.rc index 693266bbe8..d91ad2fc5a 100644 --- a/plugins/HwHotKeys/res/HwHotKeys.rc +++ b/plugins/HwHotKeys/res/HwHotKeys.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\src\HwHotKeys_resource.h" +#include "..\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/HwHotKeys/res/HwHotKeys_version.rc b/plugins/HwHotKeys/res/HwHotKeys_version.rc deleted file mode 100644 index e2a0e7b639..0000000000 --- a/plugins/HwHotKeys/res/HwHotKeys_version.rc +++ /dev/null @@ -1,38 +0,0 @@ - - -#include "afxres.h" -#include "..\src\HwHotKeys_version.h" - -// https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx - -VS_VERSION_INFO VERSIONINFO -FILEVERSION __FILEVERSION_STRING -PRODUCTVERSION __FILEVERSION_STRING -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "04090000" - BEGIN - VALUE "FileDescription", __DESCRIPTION_DLL - VALUE "FileVersion", __VERSION_STRING_DOTS - VALUE "InternalName", __PLUGIN_NAME - VALUE "LegalCopyright", __COPYRIGHT - VALUE "CompanyName", __AUTHORWEB - VALUE "OriginalFilename", __FILENAME - VALUE "ProductName", __PLUGIN_NAME - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 0 - END -END diff --git a/plugins/HwHotKeys/res/Version.rc b/plugins/HwHotKeys/res/Version.rc new file mode 100644 index 0000000000..46d811b4ac --- /dev/null +++ b/plugins/HwHotKeys/res/Version.rc @@ -0,0 +1,38 @@ + + +#include "afxres.h" +#include "..\src\Version.h" + +// https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx + +VS_VERSION_INFO VERSIONINFO +FILEVERSION __FILEVERSION_STRING +PRODUCTVERSION __FILEVERSION_STRING +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "04090000" + BEGIN + VALUE "FileDescription", __DESCRIPTION_DLL + VALUE "FileVersion", __VERSION_STRING_DOTS + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "CompanyName", __AUTHORWEB + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 0 + END +END diff --git a/plugins/HwHotKeys/src/HwHotKeys.h b/plugins/HwHotKeys/src/HwHotKeys.h index 82b3a7bb61..114451a9d7 100644 --- a/plugins/HwHotKeys/src/HwHotKeys.h +++ b/plugins/HwHotKeys/src/HwHotKeys.h @@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. #include -#include "HwHotKeys_resource.h" -#include "HwHotKeys_version.h" +#include "resource.h" +#include "Version.h" int initializeOptions(WPARAM, LPARAM); INT_PTR CALLBACK OptDlgProc(HWND, UINT, WPARAM, LPARAM); diff --git a/plugins/HwHotKeys/src/HwHotKeys_resource.h b/plugins/HwHotKeys/src/HwHotKeys_resource.h deleted file mode 100644 index 3cc2ad8f81..0000000000 --- a/plugins/HwHotKeys/src/HwHotKeys_resource.h +++ /dev/null @@ -1,27 +0,0 @@ - - -#define dlg_options 100 -#define dlg_close_edit 111 -#define dlg_close_set 112 -#define dlg_close_clear 113 -#define dlg_hide_edit 121 -#define dlg_hide_set 122 -#define dlg_hide_clear 123 -#define dlg_read_edit 131 -#define dlg_read_set 132 -#define dlg_read_clear 133 -#define dlg_scancode_edit 190 -#define dlg_combine 191 -#define dlg_keyname_edit 192 - - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/plugins/HwHotKeys/src/HwHotKeys_version.h b/plugins/HwHotKeys/src/HwHotKeys_version.h deleted file mode 100644 index e4d52b0082..0000000000 --- a/plugins/HwHotKeys/src/HwHotKeys_version.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ============================================================================ -Hardware HotKeys plugin for Miranda NG. -Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112 - -This program is free software; you can redistribute it and / or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. -============================================================================ */ - -// история версий: -// 1.0.0.6 - первая версия Hardware HotKeys для Miranda NG (более ранние версии были для Miranda IM), исправление старых ошибок. - - -#define __MAJOR_VERSION 1 -#define __MINOR_VERSION 0 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 6 - -#include - -#define __PLUGIN_NAME "Hardware HotKeys" // dll-fileinfo "FileVersion" и "ProductName", меню в настройках миранды, название плагина в миранде. Нелокализуемое! -#define __FILENAME "HwHotKeys.dll" // dll-fileinfo "OriginalFilename" -#define __DESCRIPTION_MIR "Hardware HotKeys plugin for Miranda NG\r\nAllows to assign expanded multimedia keys (only for PS/2-keyboards)." // описание плагина в миранде (локализуемое) -#define __DESCRIPTION_DLL "Hardware HotKeys plugin for Miranda NG." // описание плагина в dll-fileinfo "FileDescription" (там многострочные строки - не работают). Нелокализуемое! -#define __AUTHOR "Eugene f2065" // описание плагина в миранде -#define __AUTHOREMAIL "f2065@mail.ru" // описание плагина в миранде -#define __AUTHORWEB "http://f2065.narod.ru/" // описание плагина в dll-fileinfo "CompanyName", описание плагина в миранде -#define __COPYRIGHT "© 2010-2015 Eugene f2065" // описание плагина в dll-fileinfo "LegalCopyright", описание плагина в миранде - -#define __DbModName "HwHotKeys" // имя раздела настроек плагина в БД миранды - diff --git a/plugins/HwHotKeys/src/Version.h b/plugins/HwHotKeys/src/Version.h new file mode 100644 index 0000000000..e4d52b0082 --- /dev/null +++ b/plugins/HwHotKeys/src/Version.h @@ -0,0 +1,41 @@ +/* ============================================================================ +Hardware HotKeys plugin for Miranda NG. +Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112 + +This program is free software; you can redistribute it and / or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. +============================================================================ */ + +// история версий: +// 1.0.0.6 - первая версия Hardware HotKeys для Miranda NG (более ранние версии были для Miranda IM), исправление старых ошибок. + + +#define __MAJOR_VERSION 1 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 6 + +#include + +#define __PLUGIN_NAME "Hardware HotKeys" // dll-fileinfo "FileVersion" и "ProductName", меню в настройках миранды, название плагина в миранде. Нелокализуемое! +#define __FILENAME "HwHotKeys.dll" // dll-fileinfo "OriginalFilename" +#define __DESCRIPTION_MIR "Hardware HotKeys plugin for Miranda NG\r\nAllows to assign expanded multimedia keys (only for PS/2-keyboards)." // описание плагина в миранде (локализуемое) +#define __DESCRIPTION_DLL "Hardware HotKeys plugin for Miranda NG." // описание плагина в dll-fileinfo "FileDescription" (там многострочные строки - не работают). Нелокализуемое! +#define __AUTHOR "Eugene f2065" // описание плагина в миранде +#define __AUTHOREMAIL "f2065@mail.ru" // описание плагина в миранде +#define __AUTHORWEB "http://f2065.narod.ru/" // описание плагина в dll-fileinfo "CompanyName", описание плагина в миранде +#define __COPYRIGHT "© 2010-2015 Eugene f2065" // описание плагина в dll-fileinfo "LegalCopyright", описание плагина в миранде + +#define __DbModName "HwHotKeys" // имя раздела настроек плагина в БД миранды + diff --git a/plugins/HwHotKeys/src/resource.h b/plugins/HwHotKeys/src/resource.h new file mode 100644 index 0000000000..3cc2ad8f81 --- /dev/null +++ b/plugins/HwHotKeys/src/resource.h @@ -0,0 +1,27 @@ + + +#define dlg_options 100 +#define dlg_close_edit 111 +#define dlg_close_set 112 +#define dlg_close_clear 113 +#define dlg_hide_edit 121 +#define dlg_hide_set 122 +#define dlg_hide_clear 123 +#define dlg_read_edit 131 +#define dlg_read_set 132 +#define dlg_read_clear 133 +#define dlg_scancode_edit 190 +#define dlg_combine 191 +#define dlg_keyname_edit 192 + + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif -- cgit v1.2.3