added detection MirOTR and New_GPG

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

6 files changed, 9 insertions, 3 deletions

diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_MirOTR.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_MirOTR.ico
new file mode 100644
index 0000000000..1d08057d6c
--- /dev/null
+++ b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_MirOTR.ico
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_NewGPG.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_NewGPG.ico
new file mode 100644
index 0000000000..2471756335
--- /dev/null
+++ b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_NewGPG.ico
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_SecureIM.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_SecureIM.ico
index 60edc00273..60edc00273 100644
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_SecureIM.ico
+++ b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_security_SecureIM.ico
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 3fd9b43bbf..84f9dc1e71 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -665,7 +665,9 @@
 	IDI_PLATFORM_X32		ICON	"overlays\\overlay_platform_x32.ico"

 	IDI_PLATFORM_X64		ICON	"overlays\\overlay_platform_x64.ico"

 

-	IDI_SECUREIM_OVERLAY	ICON	"overlays\\overlay_SecureIM.ico"

+	IDI_SECUREIM_OVERLAY	ICON	"overlays\\overlay_security_SecureIM.ico"

+	IDI_NEWGPG_OVERLAY		ICON	"overlays\\overlay_security_NewGPG.ico"

+	IDI_MIROTR_OVERLAY		ICON	"overlays\\overlay_security_MirOTR.ico"

 

 	IDI_UNICODE_CLIENT		ICON	"overlays\\overlay_Unicode.ico"

 

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 4879b8183f..ed8fe9034d 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -807,7 +807,9 @@ int DEFAULT_KN_FP_OVERLAYS3_COUNT = SIZEOF(def_kn_fp_overlays3_mask);
 //#############################################################################################################################################################################

 KN_FP_MASK def_kn_fp_overlays4_mask[] =

 {//	{"Client_IconName",			_T("|^*Mask*|*names*"),						_T("Icon caption"),					IDI_RESOURCE_ID,		CLIENT_CASE,	OVERLAY?	},

-	{"client_SecureIM_over",	_T("*Secure*IM*"),							_T("SecureIM overlay"),				IDI_SECUREIM_OVERLAY,	OVERLAYS_SECURITY_CASE	},

+	{"client_NewGPG_over",		_T("*New*GPG*"),							_T("NewGPG overlay"),				IDI_NEWGPG_OVERLAY,		OVERLAYS_PLATFORM_CASE	},

+	{"client_MirOTR_over",		_T("*Mir*OTR*"),							_T("MirOTR overlay"),				IDI_MIROTR_OVERLAY,		OVERLAYS_PLATFORM_CASE	},

+	{"client_SecureIM_over",	_T("*Secure*IM*"),							_T("SecureIM overlay"),				IDI_SECUREIM_OVERLAY,	OVERLAYS_PLATFORM_CASE	},

 };

 

 int DEFAULT_KN_FP_OVERLAYS4_COUNT = SIZEOF(def_kn_fp_overlays4_mask);
\ No newline at end of file
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index bfdc167fe6..f68e29f228 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -84,8 +84,10 @@
 #define IDI_YAHOO_OVERLAY			86

 

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

-//Secure overlays

+//Security overlays

 #define IDI_SECUREIM_OVERLAY		91

+#define IDI_NEWGPG_OVERLAY			92

+#define IDI_MIROTR_OVERLAY			93

 

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

 //Miranda packs