QIP2012 icon

git-svn-id: http://svn.miranda-ng.org/main/trunk@155 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 11 insertions, 10 deletions

diff --git a/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc b/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
index 50e1f65497..e352a022fc 100644
--- a/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
@@ -45,7 +45,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
    IDI_ADIUM               ICON    "..\\icons\\multi-protocol\\Adium.ico"

    IDI_AGILE               ICON    "..\\icons\\multi-protocol\\AgileMobile.ico"

    IDI_AYTTM               ICON    "..\\icons\\multi-protocol\\Ayttm.ico"

-   IDI_BAYANICQ            ICON    "..\\icons\\multi-protocol\\BayanICQ.ico" 

+   IDI_BAYANICQ            ICON    "..\\icons\\multi-protocol\\BayanICQ.ico"

    IDI_BITLBEE             ICON    "..\\icons\\multi-protocol\\BitlBee.ico"

    IDI_CENTERICQ           ICON    "..\\icons\\multi-protocol\\Centericq.ico"

    IDI_CITRON   		   ICON    "..\\icons\\multi-protocol\\Citronim.ico"

@@ -75,6 +75,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
    IDI_PRELUDE             ICON    "..\\icons\\multi-protocol\\Prelude.ico"

    IDI_PROTEUS             ICON    "..\\icons\\multi-protocol\\Proteus.ico"

    IDI_PYTHON              ICON    "..\\icons\\multi-protocol\\Python.ico"

+   IDI_QIP_2012            ICON    "..\\icons\\multi-protocol\\QIP 2012.ico"

    IDI_QIP_2010            ICON    "..\\icons\\multi-protocol\\QIP 2010.ico"

    IDI_QIP_INFIUM          ICON    "..\\icons\\multi-protocol\\QIP Infium.ico"

    IDI_QIP_PDA             ICON    "..\\icons\\multi-protocol\\QIP PDA.ico"

@@ -99,7 +100,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // String Table

 //

 

-STRINGTABLE 

+STRINGTABLE

 BEGIN

     IDS_IDENTIFY            "# Finger Icons #"

 END

@@ -118,4 +119,3 @@ END
 

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

-

diff --git a/plugins/FingerPrintModPlus/res/resource.h b/plugins/FingerPrintModPlus/res/resource.h
index 00d8d5e70b..1752072d86 100644
--- a/plugins/FingerPrintModPlus/res/resource.h
+++ b/plugins/FingerPrintModPlus/res/resource.h
@@ -460,6 +460,7 @@
 #define IDI_TRILLIAN_PRO				608

 #define IDI_UIM							609

 #define IDI_YAMIGO						610

+#define IDI_QIP_2012					611

 

 //##############################################################################################################

 //MirandaIM Packs

@@ -633,7 +634,7 @@
 //##############################################################################################################

 

 // Next default values for new objects

-// 

+//

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        2000

diff --git a/plugins/FingerPrintModPlus/src/fingerprints.h b/plugins/FingerPrintModPlus/src/fingerprints.h
index 9950d9dd7e..49d07c966d 100644
--- a/plugins/FingerPrintModPlus/src/fingerprints.h
+++ b/plugins/FingerPrintModPlus/src/fingerprints.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 /*

 *	NOTE: Masks can contain '*' or '?' wild symbols

-*	Asterics '*' symbol covers 'empty' symbol too e.g WildCompare("Tst","T*st*"), returns TRUE 

+*	Asterics '*' symbol covers 'empty' symbol too e.g WildCompare("Tst","T*st*"), returns TRUE

 *	In order to handle situation 'at least one any sybol' use '?*' combination:

 *	e.g WildCompare("Tst","T?*st*"), returns FALSE, but both WildCompare("Test","T?*st*") and

 *	WildCompare("Teeest","T?*st*") return TRUE.

@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *	should start from '|' e.g: "|first*submask|second*mask".

 *

 *	ORDER OF RECORDS IS IMPORTANT: system search first suitable mask and returns it.

-*	e.g. if MirVer is "Miranda IM" and first mask is "*im*" and second is "Miranda *" the 

+*	e.g. if MirVer is "Miranda IM" and first mask is "*im*" and second is "Miranda *" the

 *	result will be client associated with first mask, not second!

 *	So in order to avoid such situation, place most generalised masks to latest place.

 *

@@ -125,7 +125,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{ "client_Ayttm",					_T("*Ayttm*"),									_T("Ayttm"),							_T("ClientIcons_Multiprotocols"),	IDI_AYTTM, MULTIPROTOCOL_CASE },

 	{ "client_qutIM",					_T("*qutIM*"),									_T("qutIM"),							_T("ClientIcons_Multiprotocols"),	IDI_QUTIM, MULTIPROTOCOL_CASE },

 	{ "client_YamiGo",					_T("YamiGo*"),									_T("YamiGo"),							_T("ClientIcons_Multiprotocols"),	IDI_YAMIGO, MULTIPROTOCOL_CASE },

-	{ "client_QIP_2012",				_T("|QIP 2012*|http://qip.ru/caps*"),		_T("QIP 2012"),							_T("ClientIcons_Multiprotocols"),	IDI_QIP_INFIUM, MULTIPROTOCOL_CASE },

+	{ "client_QIP_2012",				_T("|QIP 2012*|http://qip.ru/caps*"),		_T("QIP 2012"),							_T("ClientIcons_Multiprotocols"),	IDI_QIP_2012, MULTIPROTOCOL_CASE },

 	{ "client_QIP_Infium",				_T("|QIP Infium*|http://qip*"),					_T("QIP Infium"),						_T("ClientIcons_Multiprotocols"),	IDI_QIP_INFIUM, MULTIPROTOCOL_CASE },

 	{ "client_QIP_2010",				_T("|QIP 2010*|http://2010.qip.ru*"),			_T("QIP 2010"),							_T("ClientIcons_Multiprotocols"),	IDI_QIP_2010, MULTIPROTOCOL_CASE },

 	{ "client_QIP_PDA",					_T("|QIP PDA*|http://pda.qip.ru/caps*")

@@ -378,7 +378,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{ "client_LeechCraft",				_T("|http://leechcraft.org*|LeechCraft*"),		_T("LeechCraft"),						_T("ClientIcons_Jabber"),	IDI_LEECHCRAFT, JABBER_CASE },

 	{ "client_Emas",					_T("*.el*"),									_T("Emacs"),							_T("ClientIcons_Jabber"),	IDI_EMACS, JABBER_CASE },

 	{ "client_jTalk",					_T("|http://jtalk*|jTalk*"),					_T("jTalk"),							_T("ClientIcons_Jabber"),	IDI_JTALK, JABBER_CASE },

-	

+

 //#########################################################################################################################################

 //############################################################### VoIP ####################################################################

 //#########################################################################################################################################

@@ -531,7 +531,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 //#########################################################################################################################################

 	{ "client_MailRu_official",			_T("|magent*|Mail.ru Agent*official*|Mail.ru Agent*PC*")

 										_T("|http://agent.mail.ru*"),								_T("Mail.Ru Agent (official client)"),	_T("ClientIcons_MRA"),	IDI_MAIL_RU_OFFICIAL, 14 },

-	{ "client_MailRu_Mobile",			_T("|wmagent*|MobileAgent*|sagent*|Mail.ru Agent*Symbian*")										

+	{ "client_MailRu_Mobile",			_T("|wmagent*|MobileAgent*|sagent*|Mail.ru Agent*Symbian*")

 										_T("|jagent*"),												_T("Mail.Ru Mobile Agent"),				_T("ClientIcons_MRA"),	IDI_MAIL_RU_MOBILE, 14 },

 	{ "client_MailRu_web_official",		_T("Web Agent*"),											_T("Mail.Ru Web Agent"),				_T("ClientIcons_MRA"),	IDI_MAIL_RU_WEBAGENT, 14 },

 	{ "client_MailRu_unknown",			_T("Mail.ru Agent*"),										_T("Mail.Ru (unknown client)"),			_T("ClientIcons_MRA"),	IDI_MAIL_RU_UNKNOWN, 14 },

@@ -699,7 +699,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{ "client_Tlen 7",					_T("Tlen Protocol 16"),								_T("Tlen 7.x"),							_T("ClientIcons_Tlen"),	IDI_CLIENT_TLEN7, TLEN_CASE },

 

 	{ "client_weather_over",			_T("*Weather*"),									_T("Weather"),							_T("ClientIcons_Weather"),	IDI_CLIENT_WEATHER, WEATHER_CASE },

-	

+

 	{ "client_on Win32",				_T("|*Win32*|*windows*|* WM *|wmagent*|*Vista*"),	_T("on Windows"),						_T("ClientIcons_General"),	IDI_CLIENTWIN, PLATFORM_CASE },

 	{ "client_on Mac",					_T("|* Mac *|*IPhone*"),							_T("on MacOS"),							_T("ClientIcons_General"),	IDI_CLIENTMAC, PLATFORM_CASE },

 	{ "client_on Linux",				_T("*Linux*"),										_T("on Linux"),							_T("ClientIcons_General"),	IDI_CLIENTLINUX, PLATFORM_CASE },