FingerprintNG: added detect of stable NG version

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

4 files changed, 15 insertions, 7 deletions

diff --git a/plugins/FingerprintNG/icons/miranda/MirandaNG Stable.ico b/plugins/FingerprintNG/icons/miranda/MirandaNG Stable.ico
new file mode 100644
index 0000000000..19ebe375e2
--- /dev/null
+++ b/plugins/FingerprintNG/icons/miranda/MirandaNG Stable.ico
diff --git a/plugins/FingerprintNG/res/icons_Miranda.rc b/plugins/FingerprintNG/res/icons_Miranda.rc
index f587d780a3..9771479db9 100644
--- a/plugins/FingerprintNG/res/icons_Miranda.rc
+++ b/plugins/FingerprintNG/res/icons_Miranda.rc
@@ -44,6 +44,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################

 

 	IDI_MIRANDA_NG			ICON	"..\\icons\\Miranda\\MirandaNG.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 c5dae87118..006d8c7b81 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -49,8 +49,15 @@ KN_FP_MASK def_kn_fp_mask[] =
 //###########################################################################################################################################################################################################

 //#################################		MIRANDA		#########################################################################################################################################################

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

-	{"client_Miranda_NG",		_T("|*miranda-ng.org*")

-								_T("|*nightly.miranda.im*")

+

+	{"client_Miranda_NG_st",	_T("|Miranda*NG*0.92.3.1504*")

+								_T("|Miranda*NG*0.93.1.1649*")

+								_T("|Miranda*NG*0.93.2.1746*")

+								_T("|Miranda*NG*0.93.3.2111*")

+								_T("|Miranda*NG*0.93.4.24??*") 		// waiting for upcoming stable release to put in more accurate revision :)

+								_T("|Miranda*NG*stable*"), 					_T("MirandaNG stable"),					_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_STABLE,	MIRANDA_CASE	},

+

+	{"client_Miranda_NG",		_T("|*nightly.miranda.im*")

 								_T("|*Miranda*NG*"),						_T("MirandaNG"),						_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG,			MIRANDA_CASE	},

 

 	{"client_Miranda_010xx",	_T("Miranda*IM*0.10.*"),					_T("MirandaIM v0.10.x.x"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_010X,		MIRANDA_CASE	},

@@ -619,7 +626,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{"client_Devil_pack",		_T("*6.6.6*"),						 		_T("Devil Suite"),						_T("ClientIcons_packs"),		IDI_MIRANDA_DEVIL,		MIRANDA_PACKS_CASE	},

 	{"client_E33_pack",			_T("*[E33*]*"),						 		_T("E33"),								_T("ClientIcons_packs"),		IDI_MIRANDA_E33,		MIRANDA_PACKS_CASE	},

 	{"client_FR_pack",			_T("*FR*Pack*"),					 		_T("Miranda FR"),						_T("ClientIcons_packs"),		IDI_MIRANDA_FR,			MIRANDA_PACKS_CASE	},

-	{"client_Faith_pack",		_T("*Faith*Pack*"),					 		_T("Faith"),							_T("ClientIcons_packs"),		IDI_MIRANDA_FAITH,		MIRANDA_PACKS_CASE	},

+	{"client_Faith_pack",		_T("*Faith*Pack*"),					 		_T("FaithPack"),						_T("ClientIcons_packs"),		IDI_MIRANDA_FAITH,		MIRANDA_PACKS_CASE	},

 	{"client_Final_pack",		_T("*[Final*Pack]*"),				 		_T("Final pack"),						_T("ClientIcons_packs"),		IDI_MIRANDA_FINAL,		MIRANDA_PACKS_CASE	},

 	{"client_Freize_pack",		_T("*Freize*"),						 		_T("Freize"),							_T("ClientIcons_packs"),		IDI_MIRANDA_FREIZE,		MIRANDA_PACKS_CASE	},

 	{"client_Ghost_pack",		_T("*Ghost's*"),					 		_T("Ghost's pack"),						_T("ClientIcons_packs"),		IDI_MIRANDA_GHOST,		MIRANDA_PACKS_CASE	},

@@ -732,8 +739,8 @@ KN_FP_MASK def_kn_fp_overlays2_mask[] =
 {//	IconName						Mask										Icon caption							 NULL ICON_RESOURCE_ID

 	{"client_debug_overlay",	_T("|*[*debug*]*|*test*|*тест*"),			_T("debug overlay"),					_T("ClientIcons_overlays"),		IDI_DEBUG_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

 	{"client_home_overlay",		_T("|*[*home*]*|*[*дом*]*|*[*хоме*]*"),		_T("home overlay"),						_T("ClientIcons_overlays"),		IDI_HOME_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

-	{"client_work_overlay",		_T("|*[*work*]*|*[*работа*]*|*wrk*"),		_T("[Work]"),							_T("ClientIcons_overlays"),		IDI_WORK_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

-	{"client_office_overlay",	_T("|*[*office*]*|*[*офис*]*"),				_T("[Office]"),							_T("ClientIcons_overlays"),		IDI_OFFICE_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

+	{"client_work_overlay",		_T("|*[*work*]*|*wrk*|*[*работа*]*|*ворк*"),_T("work overlay"),						_T("ClientIcons_overlays"),		IDI_WORK_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

+	{"client_office_overlay",	_T("|*[*office*]*|*[*офис*]*"),				_T("office overlay"),					_T("ClientIcons_overlays"),		IDI_OFFICE_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

 	{"client_mobile_overlay",	_T("|*[*mobile*]*|*[*pda*]*"),				_T("mobile overlay"),					_T("ClientIcons_overlays"),		IDI_MOBILE_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

 	{"client_note_overlay",		_T("|*[*note*]*|*[*laptop*]*|*[*portable*]*")

 								_T("|*[*кирпич*]*|*[*flash*]*|*[*usb*]*"),	_T("notebook overlay"),					_T("ClientIcons_overlays"),		IDI_NOTEBOOK_OVERLAY,	OVERLAYS_RESOURCE_CASE	},

@@ -745,7 +752,6 @@ KN_FP_MASK def_kn_fp_overlays2_mask[] =
 	{"client_Mir_06_over",		_T("*Miranda*0.6.*"),						_T("Miranda v0.6 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_6s,			MIRANDA_VERSION_CASE	},

 	{"client_Mir_05_over",		_T("*Miranda*0.5.*"),						_T("Miranda v0.5 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_5s,			MIRANDA_VERSION_CASE	},

 	{"client_Mir_04_over",		_T("*Miranda*0.4.*"),						_T("Miranda v0.4 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_4s,			MIRANDA_VERSION_CASE	},

-

 };

 

 int DEFAULT_KN_FP_OVERLAYS2_COUNT = SIZEOF(def_kn_fp_overlays2_mask);

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index cdee768f46..46353e55db 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -15,7 +15,8 @@
 

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

 //MirandaIM clients

-#define IDI_MIRANDA_NG        		11

+#define IDI_MIRANDA_NG        		10

+#define IDI_MIRANDA_NG_STABLE		11

 #define IDI_MIRANDA_OLD       		12

 #define IDI_MIRANDA_UNKNOWN   		13