From 26791cc7ee10c73b00df9cc3cc38ff7ba06d8102 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Jun 2012 07:50:47 +0000 Subject: - version resource moved to the separate file - minor change for the plugin's start git-svn-id: http://svn.miranda-ng.org/main/trunk@386 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Console/Console.c | 3 +- plugins/Console/Console.vcxproj | 1 + plugins/Console/Console.vcxproj.filters | 3 ++ plugins/Console/resource.rc | 38 -------------------- plugins/Console/version.h | 13 ++----- plugins/Console/version.rc | 61 +++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 50 deletions(-) create mode 100644 plugins/Console/version.rc (limited to 'plugins') diff --git a/plugins/Console/Console.c b/plugins/Console/Console.c index eea28e711f..9d4567da11 100644 --- a/plugins/Console/Console.c +++ b/plugins/Console/Console.c @@ -724,8 +724,7 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L { SAVEWINDOWPOS swp; swp.hwnd=hwndDlg; swp.hContact=NULL; swp.szModule="Console"; swp.szNamePrefix="Console"; - CallService(MS_UTILS_RESTOREWINDOWPOSITION,RWPF_NOACTIVATE,(LPARAM)&swp); - ShowWindow(hwndDlg,SW_HIDE); + CallService(MS_UTILS_RESTOREWINDOWPOSITION, RWPF_HIDDEN, (LPARAM)&swp); } if (CallService(MS_DB_GETPROFILENAME,(WPARAM)512,(LPARAM)ProfileName)) diff --git a/plugins/Console/Console.vcxproj b/plugins/Console/Console.vcxproj index 8ac4d98ebc..f2d98ecd9b 100644 --- a/plugins/Console/Console.vcxproj +++ b/plugins/Console/Console.vcxproj @@ -198,6 +198,7 @@ + diff --git a/plugins/Console/Console.vcxproj.filters b/plugins/Console/Console.vcxproj.filters index 2a2d7cb123..cc191810d3 100644 --- a/plugins/Console/Console.vcxproj.filters +++ b/plugins/Console/Console.vcxproj.filters @@ -90,5 +90,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/Console/resource.rc b/plugins/Console/resource.rc index 55f6382d2f..c71241fa0a 100644 --- a/plugins/Console/resource.rc +++ b/plugins/Console/resource.rc @@ -116,44 +116,6 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,7,2 - PRODUCTVERSION 0,0,7,2 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "FileDescription", "Console log window for Miranda 0.8.0.3+" - VALUE "FileVersion", "0.0.7.2" - VALUE "InternalName", "Console" - VALUE "LegalCopyright", "© 2005-2009 Bio" - VALUE "OriginalFilename", "Console.dll" - VALUE "ProductName", "Console" - VALUE "ProductVersion", "0.0.7.2" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - - ///////////////////////////////////////////////////////////////////////////// // // Icon diff --git a/plugins/Console/version.h b/plugins/Console/version.h index 04aced78b9..a848f99fe5 100644 --- a/plugins/Console/version.h +++ b/plugins/Console/version.h @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __PLUGIN_DESC "Console log window for Miranda 0.8.0.3+" -#define __PLUGIN_LONGDESC __PLUGIN_DESC ". Compiled by Bio. Enjoy! 8-) [ Built "__DATE__" "__TIME__" ]" +#define __PLUGIN_LONGDESC __PLUGIN_DESC ". ["__DATE__" "__TIME__"]" #define __PLUGIN_AUTHOR "Bio" #define __PLUGIN_EMAIL "bio@msx.ru" #define __PLUGIN_RIGHTS "© 2005-2009 Bio" @@ -37,12 +37,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MIID_CONSOLE { 0x23d4f302, 0xd513, 0x45b7, { 0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11 }} // {23D4F302-D513-45b7-9027-445F29557311} -#ifdef _UNICODE - #define __PLUGIN_NAME __PLUGIN_SHORTNAME " (Unicode)" - #define __PLUGIN_URL "http://addons.miranda-im.org/details.php?action=viewfile&id=3791" -#endif - -#ifndef _UNICODE - #define __PLUGIN_NAME __PLUGIN_SHORTNAME " (ANSI)" - #define __PLUGIN_URL "http://addons.miranda-im.org/details.php?action=viewfile&id=3789" -#endif +#define __PLUGIN_NAME __PLUGIN_SHORTNAME +#define __PLUGIN_URL "http://addons.miranda-im.org/details.php?action=viewfile&id=3791" diff --git a/plugins/Console/version.rc b/plugins/Console/version.rc new file mode 100644 index 0000000000..7a4dcbb314 --- /dev/null +++ b/plugins/Console/version.rc @@ -0,0 +1,61 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __PLUGIN_DESC + VALUE "FileVersion", __VERSION_STRING + VALUE "InternalName", __PLUGIN_SHORTNAME + VALUE "LegalCopyright", __PLUGIN_RIGHTS + VALUE "OriginalFilename", __PLUGIN_FILE + VALUE "ProductName", __PLUGIN_SHORTNAME + VALUE "ProductVersion", __VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + +#endif -- cgit v1.2.3