From 02aef539d126d793f6e0a24de1dcaca907edad96 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 3 Nov 2013 23:07:35 +0000 Subject: MirandaG15: proper version info, russian MirandaG15.txt is moved back grom Deprecated git-svn-id: http://svn.miranda-ng.org/main/trunk@6762 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../LCDFramework/LCDFramework_10.vcxproj | 4 - .../LCDFramework/LCDFramework_10.vcxproj.filters | 4 - .../LCDFramework/LCDFramework_11.vcxproj | 4 - .../LCDFramework/LCDFramework_11.vcxproj.filters | 4 - plugins/MirandaG15/MirandaG15_10.vcxproj | 2 + plugins/MirandaG15/MirandaG15_10.vcxproj.filters | 6 + plugins/MirandaG15/MirandaG15_11.vcxproj | 2 + plugins/MirandaG15/MirandaG15_11.vcxproj.filters | 6 + plugins/MirandaG15/res/Version.rc | 38 +++++ plugins/MirandaG15/src/Miranda.cpp | 22 +-- plugins/MirandaG15/src/StdAfx.h | 4 +- plugins/MirandaG15/src/Version.h | 14 ++ plugins/MirandaG15/src/m_metacontacts.h | 166 --------------------- 13 files changed, 81 insertions(+), 195 deletions(-) create mode 100644 plugins/MirandaG15/res/Version.rc create mode 100644 plugins/MirandaG15/src/Version.h delete mode 100644 plugins/MirandaG15/src/m_metacontacts.h (limited to 'plugins') diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj index b22f3076fd..fd65d770e4 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj @@ -167,10 +167,6 @@ - - - - diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters index 34bf8dd788..64d294b0ec 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters @@ -138,8 +138,4 @@ Header Files\LCDObjects - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj index a5afbccac8..b254e11128 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj @@ -175,10 +175,6 @@ - - - - diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters index 34bf8dd788..64d294b0ec 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters @@ -138,8 +138,4 @@ Header Files\LCDObjects - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj b/plugins/MirandaG15/MirandaG15_10.vcxproj index a0d8a757d3..1670673154 100644 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj +++ b/plugins/MirandaG15/MirandaG15_10.vcxproj @@ -245,6 +245,7 @@ + @@ -282,6 +283,7 @@ + diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters index c4fd2901b0..a50d8fb337 100644 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters +++ b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters @@ -122,6 +122,9 @@ Header Files + + Header Files + @@ -225,5 +228,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_11.vcxproj b/plugins/MirandaG15/MirandaG15_11.vcxproj index 2499ab90f4..8bd9c2f823 100644 --- a/plugins/MirandaG15/MirandaG15_11.vcxproj +++ b/plugins/MirandaG15/MirandaG15_11.vcxproj @@ -253,6 +253,7 @@ + @@ -290,6 +291,7 @@ + diff --git a/plugins/MirandaG15/MirandaG15_11.vcxproj.filters b/plugins/MirandaG15/MirandaG15_11.vcxproj.filters index c4fd2901b0..a50d8fb337 100644 --- a/plugins/MirandaG15/MirandaG15_11.vcxproj.filters +++ b/plugins/MirandaG15/MirandaG15_11.vcxproj.filters @@ -122,6 +122,9 @@ Header Files + + Header Files + @@ -225,5 +228,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/MirandaG15/res/Version.rc b/plugins/MirandaG15/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/MirandaG15/res/Version.rc @@ -0,0 +1,38 @@ +// 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" + +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/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp index 0d7d0700a4..dbe2c4da9f 100644 --- a/plugins/MirandaG15/src/Miranda.cpp +++ b/plugins/MirandaG15/src/Miranda.cpp @@ -66,18 +66,18 @@ int hLangpack; extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_G15APPLET, MIID_LAST}; -static PLUGININFOEX pluginInfo = { +PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - APP_NAME, - PLUGIN_MAKE_VERSION(0,1,2,0), - "Provides an interface to use Miranda from the LCD of various Logitech devices", - "Martin Kleinhans", - "mail@mkleinhans.de", - "© 2009 Martin Kleinhans", - "http://www.mkleinhans.de", - UNICODE_AWARE, // not transient + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, // {798221E1-E47A-4dc8-9077-1E576F9C4307} - { 0x798221e1, 0xe47a, 0x4dc8, { 0x90, 0x77, 0x1e, 0x57, 0x6f, 0x9c, 0x43, 0x7 } } + {0x798221e1, 0xe47a, 0x4dc8, {0x90, 0x77, 0x1e, 0x57, 0x6f, 0x9c, 0x43, 0x7}} }; // Function Prototypes @@ -90,7 +90,7 @@ void UnInit(); extern "C" { __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - return &pluginInfo; + return &pluginInfoEx; } // Called by Miranda to load the plugin. diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h index d55627ae74..cffc743a0c 100644 --- a/plugins/MirandaG15/src/StdAfx.h +++ b/plugins/MirandaG15/src/StdAfx.h @@ -1,8 +1,7 @@ #ifndef _STDAFX_H_ #define _STDAFX_H_ -#define APP_NAME "MirandaG15" -#define APP_SHORTNAME "MirandaG15" +#define APP_SHORTNAME __PLUGIN_NAME /* Common header files */ #include @@ -49,5 +48,6 @@ using namespace std; #include "CEvent.h" #include "resource.h" +#include "version.h" #endif \ No newline at end of file diff --git a/plugins/MirandaG15/src/Version.h b/plugins/MirandaG15/src/Version.h new file mode 100644 index 0000000000..0c30c5114a --- /dev/null +++ b/plugins/MirandaG15/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 1 +#define __RELEASE_NUM 2 +#define __BUILD_NUM 0 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "MirandaG15" +#define __FILENAME "MirandaG15.dll" +#define __DESCRIPTION "Provides an interface to use Miranda from the LCD of various Logitech devices." +#define __AUTHOR "Martin Kleinhans" +#define __AUTHOREMAIL "mail@mkleinhans.de" +#define __AUTHORWEB "http://miranda-ng.org/p/MirandaG15/" +#define __COPYRIGHT "© 2009 Martin Kleinhans" diff --git a/plugins/MirandaG15/src/m_metacontacts.h b/plugins/MirandaG15/src/m_metacontacts.h deleted file mode 100644 index 9f348bd2c6..0000000000 --- a/plugins/MirandaG15/src/m_metacontacts.h +++ /dev/null @@ -1,166 +0,0 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright © 2004 Universite Louis PASTEUR, STRASBOURG. -Copyright © 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au) - -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. -*/ - -#ifndef M_METACONTACTS_H__ -#define M_METACONTACTS_H__ 1 - -#ifndef MIID_METACONTACTS -#define MIID_METACONTACTS {0xc0325019, 0xc1a7, 0x40f5, { 0x83, 0x65, 0x4f, 0x46, 0xbe, 0x21, 0x86, 0x3e}} -#endif - -//get the handle for a contact's parent metacontact -//wParam=(HANDLE)hSubContact -//lParam=0 -//returns a handle to the parent metacontact, or null if this contact is not a subcontact -#define MS_MC_GETMETACONTACT "MetaContacts/GetMeta" - -//gets the handle for the default contact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a handle to the default contact, or null on failure -#define MS_MC_GETDEFAULTCONTACT "MetaContacts/GetDefault" - -//gets the contact number for the default contact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a DWORD contact number, or -1 on failure -#define MS_MC_GETDEFAULTCONTACTNUM "MetaContacts/GetDefaultNum" - -//gets the handle for the 'most online' contact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a handle to the 'most online' contact -#define MS_MC_GETMOSTONLINECONTACT "MetaContacts/GetMostOnline" - -//gets the number of subcontacts for a metacontact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a DWORD representing the number of subcontacts for the given metacontact -#define MS_MC_GETNUMCONTACTS "MetaContacts/GetNumContacts" - -//gets the handle of a subcontact, using the subcontact's number -//wParam=(HANDLE)hMetaContact -//lParam=(DWORD)contact number -//returns a handle to the specified subcontact -#define MS_MC_GETSUBCONTACT "MetaContacts/GetSubContact" - -//sets the default contact, using the subcontact's contact number -//wParam=(HANDLE)hMetaContact -//lParam=(DWORD)contact number -//returns 0 on success -#define MS_MC_SETDEFAULTCONTACTNUM "MetaContacts/SetDefault" - -//sets the default contact, using the subcontact's handle -//wParam=(HANDLE)hMetaContact -//lParam=(HANDLE)hSubcontact -//returns 0 on success -#define MS_MC_SETDEFAULTCONTACT "MetaContacts/SetDefaultByHandle" - -//forces the metacontact to send using a specific subcontact, using the subcontact's contact number -//wParam=(HANDLE)hMetaContact -//lParam=(DWORD)contact number -//returns 0 on success -#define MS_MC_FORCESENDCONTACTNUM "MetaContacts/ForceSendContact" - -//forces the metacontact to send using a specific subcontact, using the subcontact's handle -//wParam=(HANDLE)hMetaContact -//lParam=(HANDLE)hSubcontact -//returns 0 on success (will fail if 'force default' is in effect) -#define MS_MC_FORCESENDCONTACT "MetaContacts/ForceSendContactByHandle" - -//'unforces' the metacontact to send using a specific subcontact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns 0 on success (will fail if 'force default' is in effect) -#define MS_MC_UNFORCESENDCONTACT "MetaContacts/UnforceSendContact" - -//'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact -// overrides (and clears) 'force send' above, and will even force use of offline contacts -// will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns 1(true) or 0(false) representing new state of 'force default' -#define MS_MC_FORCEDEFAULT "MetaContacts/ForceSendDefault" - -// method to get state of 'force' for a metacontact -// wParam=(HANDLE)hMetaContact -// lParam= (DWORD)&contact_number or NULL -// -// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to, -// or if none is in force, the value (DWORD)-1 will be copied -// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above) -#define MS_MC_GETFORCESTATE "MetaContacts/GetForceState" - -// fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set) -// wParam=(HANDLE)hMetaContact -// lParam=(HANDLE)hDefaultContact -#define ME_MC_DEFAULTTCHANGED "MetaContacts/DefaultChanged" - -// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when -// contacts are reordered) - a signal to re-read metacontact data -// wParam=(HANDLE)hMetaContact -// lParam=0 -#define ME_MC_SUBCONTACTSCHANGED "MetaContacts/SubcontactsChanged" - -// fired when a metacontact is forced to send using a specific subcontact -// wParam=(HANDLE)hMetaContact -// lParam=(HANDLE)hForceContact -#define ME_MC_FORCESEND "MetaContacts/ForceSend" - -// fired when a metacontact is 'unforced' to send using a specific subcontact -// wParam=(HANDLE)hMetaContact -// lParam=0 -#define ME_MC_UNFORCESEND "MetaContacts/UnforceSend" - -// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :) -// wParam=lParam=0 -#define MS_MC_GETPROTOCOLNAME "MetaContacts/GetProtoName" - - -// added 0.9.5.0 (22/3/05) -// wParam=(HANDLE)hContact -// lParam=0 -// convert a given contact into a metacontact -#define MS_MC_CONVERTTOMETA "MetaContacts/ConvertToMetacontact" - -// added 0.9.5.0 (22/3/05) -// wParam=(HANDLE)hContact -// lParam=(HANDLE)hMeta -// add an existing contact to a metacontact -#define MS_MC_ADDTOMETA "MetaContacts/AddToMetacontact" - -// added 0.9.5.0 (22/3/05) -// wParam=0 -// lParam=(HANDLE)hContact -// remove a contact from a metacontact -#define MS_MC_REMOVEFROMMETA "MetaContacts/RemoveFromMetacontact" - - -// added 0.9.13.2 (6/10/05) -// wParam=(BOOL)disable -// lParam=0 -// enable/disable the 'hidden group hack' - for clists that support subcontact hiding using 'IsSubcontact' setting -// should be called once in the clist 'onmodulesloaded' event handler (which, since it's loaded after the db, will be called -// before the metacontact onmodulesloaded handler where the subcontact hiding is usually done) -#define MS_MC_DISABLEHIDDENGROUP "MetaContacts/DisableHiddenGroup" - -#endif -- cgit v1.2.3