From ea9d142dd9cb86bd601d03a4cf3237ef87ba35a7 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 3 Dec 2012 20:17:31 +0000 Subject: - FingerprintNG: - fixed MRIM detection and overlays - minor resources changes git-svn-id: http://svn.miranda-ng.org/main/trunk@2626 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../FingerprintNG/res/icons/Miranda/MirandaNG Stable.ico | Bin 1150 -> 0 bytes .../FingerprintNG/res/icons/Miranda/MirandaNG_Stable.ico | Bin 0 -> 1150 bytes plugins/FingerprintNG/res/icons_Miranda.rc | 2 +- plugins/FingerprintNG/src/masks.cpp | 5 +++-- 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 plugins/FingerprintNG/res/icons/Miranda/MirandaNG Stable.ico create mode 100644 plugins/FingerprintNG/res/icons/Miranda/MirandaNG_Stable.ico diff --git a/plugins/FingerprintNG/res/icons/Miranda/MirandaNG Stable.ico b/plugins/FingerprintNG/res/icons/Miranda/MirandaNG Stable.ico deleted file mode 100644 index f8688ff571..0000000000 Binary files a/plugins/FingerprintNG/res/icons/Miranda/MirandaNG Stable.ico and /dev/null differ diff --git a/plugins/FingerprintNG/res/icons/Miranda/MirandaNG_Stable.ico b/plugins/FingerprintNG/res/icons/Miranda/MirandaNG_Stable.ico new file mode 100644 index 0000000000..f8688ff571 Binary files /dev/null and b/plugins/FingerprintNG/res/icons/Miranda/MirandaNG_Stable.ico differ diff --git a/plugins/FingerprintNG/res/icons_Miranda.rc b/plugins/FingerprintNG/res/icons_Miranda.rc index 3125f29b92..eaa225a91a 100644 --- a/plugins/FingerprintNG/res/icons_Miranda.rc +++ b/plugins/FingerprintNG/res/icons_Miranda.rc @@ -43,7 +43,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //################################################### Miranda clients ########################################## //############################################################################################################## IDI_MIRANDA_NG ICON "icons\\Miranda\\MirandaNG.ico" - IDI_MIRANDA_NG_STABLE ICON "icons\\Miranda\\MirandaNG Stable.ico" + IDI_MIRANDA_NG_STABLE ICON "icons\\Miranda\\MirandaNG_Stable.ico" IDI_MIRANDA_UNKNOWN ICON "icons\\Miranda\\Miranda_unknown.ico" IDI_MIRANDA_OLD ICON "icons\\Miranda\\MirandaIM_old.ico" diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index a00287b50e..f128333a01 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -601,7 +601,7 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Pidgin", _T("|*Pidgin*|*libpurple*|Purple*"), _T("Pidgin (libpurple)"), _T("ClientIcons_multiproto"), IDI_PIDGIN, MULTI_CASE }, - {"client_Python", _T("|*Python*|Py*|*ταλιςμαη*"), _T("Python-based clients"), _T("ClientIcons_multiproto"), IDI_PYTHON, MULTI_CASE }, + {"client_Python", _T("|*Python*|Py*|*ταλιςμαη*|Mrim*"), _T("Python-based clients"), _T("ClientIcons_multiproto"), IDI_PYTHON, MULTI_CASE }, {"client_Twitter", _T("*Twitter*"), _T("Twitter"), _T("ClientIcons_Jabber"), IDI_TWITTER, OTHER_PROTOS_CASE, TRUE }, @@ -682,11 +682,12 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = {"client_JGmail_overlay", _T("*JGmail*"), _T("JGmail overlay"), _T("ClientIcons_overlays"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE }, {"client_JGTalk_overlay", _T("*JGTalk*"), _T("JGTalk overlay"), _T("ClientIcons_overlays"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE }, {"client_Jabber_overlay", _T("|^jabber*|Miranda*Jabber*|py*jabb*"), _T("Jabber overlay"), _T("ClientIcons_overlays"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE }, - {"client_MRA_overlay", _T("|^MRA*|^Mail.ru*|*MRA*|*Mail.ru*IM*"), _T("Mail.Ru Agent overlay"), _T("ClientIcons_overlays"), IDI_MAILRU_OVERLAY, OVERLAYS_PROTO_CASE }, {"client_MSN_overlay", _T("|^MSN*|*Miranda*MSN*"), _T("MSN overlay"), _T("ClientIcons_overlays"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE }, {"client_QQ_overlay", _T("|Miranda*QQ*|MIM*QQ*"), _T("QQ overlay"), _T("ClientIcons_overlays"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE }, {"client_Tlen_overlay", _T("|^tlen*|*tlen*"), _T("Tlen.pl overlay"), _T("ClientIcons_overlays"), IDI_TLEN_OVERLAY, OVERLAYS_PROTO_CASE }, {"client_Yahoo_overlay", _T("|^Yahoo*|*yahoo*"), _T("Yahoo overlay"), _T("ClientIcons_overlays"), IDI_YAHOO_OVERLAY, OVERLAYS_PROTO_CASE }, + {"client_MRA_overlay", _T("|^MRA*|^Mail.ru*") + _T("|*MRA*|*Mail.ru*IM*|Mrim*"), _T("Mail.Ru Agent overlay"), _T("ClientIcons_overlays"), IDI_MAILRU_OVERLAY, OVERLAYS_PROTO_CASE }, //######################################################################################################################################################################################################## //################################# CLIENT VERSION OVERLAYS ###################################################################################################################################### -- cgit v1.2.3