- added miranda ng overlays

- changed SecureIM overlay
- reorganised and replaced resource/platforms overlays
- fixed miranda overlays actually weren't working
- icons moved to res folder
- version info standartization

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

7 files changed, 77 insertions, 55 deletions

diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 589003c30e..c22abf66e8 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -102,25 +102,22 @@ void RegisterIcons()
 	for (i=0; i < DEFAULT_KN_FP_MASK_COUNT; i++)

 		Prepare(&def_kn_fp_mask[i], true);

 

-	bool bEnable = db_get_b(NULL, "Finger", "Overlay1", 1) != 0;

 	for (i=0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++)

-		Prepare(&def_kn_fp_overlays_mask[i], bEnable);

+		Prepare(&def_kn_fp_overlays_mask[i], true);

 

-	bEnable = db_get_b(NULL, "Finger", "Overlay2", 1) != 0;

-	if ( db_get_b(NULL, "Finger", "ShowVersion", 0)) {

+	if ( db_get_b(NULL, "Finger", "GroupMirandaVersion", 0)) {

 		for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)

-			Prepare(&def_kn_fp_overlays2_mask[i], bEnable);

+			Prepare(&def_kn_fp_overlays2_mask[i], true);

 	}

 	else {

 		for (i=0; i < DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT; i++)

-			Prepare(&def_kn_fp_overlays2_mask[i], bEnable);

+			Prepare(&def_kn_fp_overlays2_mask[i], true);

 		for (; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)

 			Prepare(&def_kn_fp_overlays2_mask[i], false);

 	}

 

-	bEnable = db_get_b(NULL, "Finger", "Overlay3", 1) != 0;

 	for (i=0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)

-		Prepare(&def_kn_fp_overlays3_mask[i], bEnable);

+		Prepare(&def_kn_fp_overlays3_mask[i], true);

 }

 

 /*

diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h
index 9f2ad70813..dc3b06973e 100644
--- a/plugins/FingerprintNG/src/global.h
+++ b/plugins/FingerprintNG/src/global.h
@@ -184,4 +184,5 @@ extern int DEFAULT_KN_FP_MASK_COUNT, DEFAULT_KN_FP_OVERLAYS_COUNT, DEFAULT_KN_FP
 

 #define UNKNOWN_MASK_NUMBER (DEFAULT_KN_FP_MASK_COUNT - 2)								// second from end

 #define NOTFOUND_MASK_NUMBER (DEFAULT_KN_FP_MASK_COUNT - 3)								// third from end

-#define DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT (DEFAULT_KN_FP_OVERLAYS2_COUNT - 7)

+// the last count is how many masks from 2nd layer is used as Miranda version overlays	(counting from the end)

+#define DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT (DEFAULT_KN_FP_OVERLAYS2_COUNT - 13)

diff --git a/plugins/FingerprintNG/src/main.cpp b/plugins/FingerprintNG/src/main.cpp
index 07d3c1d455..e3cb770bfa 100644
--- a/plugins/FingerprintNG/src/main.cpp
+++ b/plugins/FingerprintNG/src/main.cpp
@@ -33,7 +33,7 @@ HANDLE getClientIconA			= NULL;
 

 HANDLE compClientServW			= NULL;

 HANDLE getClientIconW			= NULL;

-LPSTR g_szClientDescription	= NULL;

+LPSTR g_szClientDescription		= NULL;

 

 HANDLE hStaticHooks[1]			= { NULL };

 

@@ -42,15 +42,16 @@ HANDLE hStaticHooks[1]			= { NULL };
 // PluginInfo & PluginInfoEx

 PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

-	__INTERNAL_NAME_STRING,

-	__VERSION_DWORD,

-	"Fingerprint NG (client version) icons module for Miranda NG",

-	"Copyright © 2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.",

-	"faith_healer@miranda.im",

-	__LEGAL_COPYRIGHT_STRING,

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	MIID_THIS_PLUGIN

+	//{687364AF-58B0-4AF2-A4EE-20F40A8D9AFB}

+	{0x687364af, 0x58b0, 0x4af2, { 0xa4, 0xee, 0x20, 0xf4, 0xa, 0x8d, 0x9a, 0xfb}}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index d34b215ae5..f0937cae8f 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -744,20 +744,35 @@ int DEFAULT_KN_FP_OVERLAYS_COUNT = SIZEOF(def_kn_fp_overlays_mask);
 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 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	},

-

-	{"client_Mir_010_over",		_T("*Miranda*0.10.*"),						_T("Miranda v0.10 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_10s,		MIRANDA_VERSION_CASE	},

-	{"client_Mir_09_over",		_T("*Miranda*0.9.*"),						_T("Miranda v0.9 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_9s,			MIRANDA_VERSION_CASE	},

-	{"client_Mir_08_over",		_T("*Miranda*0.8.*"),						_T("Miranda v0.8 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_8s,			MIRANDA_VERSION_CASE	},

-	{"client_Mir_07_over",		_T("*Miranda*0.7.*"),						_T("Miranda v0.7 #2 overlay"),			_T("ClientIcons_Miranda"),		IDI_MIRANDA_7s,			MIRANDA_VERSION_CASE	},

-	{"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	},

+	{"client_home_overlay",		_T("|*[*home*]*|*[*Π΄ΠΎΠΌ*]*|*[*Ρ…ΠΎΠΌΠ΅*]*"),		_T("home overlay"),						_T("ClientIcons_overlays"),		IDI_HOME_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

+

+	{"client_work_overlay",		_T("|*[*work*]*|*wrk*")

+								_T("|*[*Ρ€Π°Π±ΠΎΡ‚Π°*]*|*Π²ΠΎΡ€ΠΊ*"),					_T("work overlay"),						_T("ClientIcons_overlays"),		IDI_WORK_OVERLAY,		OVERLAYS_RESOURCE_CASE	},

+

+	{"client_note_overlay",		_T("|*[*note*]*|*[*laptop*]*|*Π½ΠΎΡƒΡ‚*")

+								_T("|*[*ΠΊΠΈΡ€ΠΏΠΈΡ‡*]*|*[*portable*]*")

+								_T("|*[*flash*]*|*[*usb*]*"),				_T("notebook overlay"),					_T("ClientIcons_overlays"),		IDI_NOTEBOOK_OVERLAY,	OVERLAYS_RESOURCE_CASE	},

+

+//	{"client_MirNG_09_over",	_T("*Miranda*NG*\?.\?\?.9.*"),	 			_T("MirandaNG v0.9 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V9,		MIRANDA_VERSION_CASE	},

+//	{"client_MirNG_08_over",	_T("*Miranda*NG*\?.\?\?.8.*"),	 			_T("MirandaNG v0.8 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V8,		MIRANDA_VERSION_CASE	},

+//	{"client_MirNG_07_over",	_T("*Miranda*NG*\?.\?\?.7.*"),	 			_T("MirandaNG v0.7 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V7,		MIRANDA_VERSION_CASE	},

+

+	{"client_MirNG_06_over",	_T("*Miranda*NG*\?.\?\?.6.*"),	 			_T("MirandaNG v0.6 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V6,		MIRANDA_VERSION_CASE	},

+	{"client_MirNG_05_over",	_T("*Miranda*NG*\?.\?\?.5.*"),	 			_T("MirandaNG v0.5 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V5,		MIRANDA_VERSION_CASE	},

+	{"client_MirNG_04_over",	_T("*Miranda*NG*\?.\?\?.4.*"),	 			_T("MirandaNG v0.4 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V4,		MIRANDA_VERSION_CASE	},

+	{"client_MirNG_03_over",	_T("*Miranda*NG*\?.\?\?.3.*"),	 			_T("MirandaNG v0.3 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V6,		MIRANDA_VERSION_CASE	},

+	{"client_MirNG_02_over",	_T("*Miranda*NG*\?.\?\?.2.*"),	 			_T("MirandaNG v0.2 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V5,		MIRANDA_VERSION_CASE	},

+	{"client_MirNG_01_over",	_T("*Miranda*NG*\?.\?\?.1.*"),	 			_T("MirandaNG v0.1 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_NG_V4,		MIRANDA_VERSION_CASE	},

+

+	{"client_MirIM_010_over",	_T("*Miranda*0.10.*"),						_T("MirandaIM v0.10 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V10,		MIRANDA_VERSION_CASE	},

+	{"client_MirIM_09_over",	_T("*Miranda*0.9.*"),						_T("MirandaIM v0.9 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V9,		MIRANDA_VERSION_CASE	},

+	{"client_MirIM_08_over",	_T("*Miranda*0.8.*"),						_T("MirandaIM v0.8 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V8,		MIRANDA_VERSION_CASE	},

+	{"client_MirIM_07_over",	_T("*Miranda*0.7.*"),						_T("MirandaIM v0.7 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V7,		MIRANDA_VERSION_CASE	},

+	{"client_MirIM_06_over",	_T("*Miranda*0.6.*"),						_T("MirandaIM v0.6 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V6,		MIRANDA_VERSION_CASE	},

+	{"client_MirIM_05_over",	_T("*Miranda*0.5.*"),						_T("MirandaIM v0.5 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V5,		MIRANDA_VERSION_CASE	},

+	{"client_MirIM_04_over",	_T("*Miranda*0.4.*"),						_T("MirandaIM v0.4 #2 overlay"),		_T("ClientIcons_Miranda"),		IDI_MIRANDA_IM_V4,		MIRANDA_VERSION_CASE	},

 };

 

 int DEFAULT_KN_FP_OVERLAYS2_COUNT = SIZEOF(def_kn_fp_overlays2_mask);

diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 42ff9e0b64..39a6c1a8ba 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -81,7 +81,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		{

 			TranslateDialogDefault(hwndDlg);

 			for (int i = 0; i < SIZEOF(settings); i++) {

-				if (lstrcmpA(settings[i].szSetName,	"ShowVersion") == 0)

+				if (lstrcmpA(settings[i].szSetName,	"GroupMirandaVersion") == 0)

 					LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, 0);

 				else

 					LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, 1);

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 4ed876c0ea..362b10e01a 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -28,13 +28,23 @@
 #define IDI_MIRANDA_09XX			26

 #define IDI_MIRANDA_010X			27

 

-#define IDI_MIRANDA_4s				31

-#define IDI_MIRANDA_5s				32

-#define IDI_MIRANDA_6s				33

-#define IDI_MIRANDA_7s				34

-#define IDI_MIRANDA_8s				35

-#define IDI_MIRANDA_9s				36

-#define IDI_MIRANDA_10s				37

+#define IDI_MIRANDA_IM_V4			31

+#define IDI_MIRANDA_IM_V5			32

+#define IDI_MIRANDA_IM_V6			33

+#define IDI_MIRANDA_IM_V7			34

+#define IDI_MIRANDA_IM_V8			35

+#define IDI_MIRANDA_IM_V9			36

+#define IDI_MIRANDA_IM_V10			37

+

+#define IDI_MIRANDA_NG_V1			41

+#define IDI_MIRANDA_NG_V2			42

+#define IDI_MIRANDA_NG_V3			43

+#define IDI_MIRANDA_NG_V4			44

+#define IDI_MIRANDA_NG_V5			45

+#define IDI_MIRANDA_NG_V6			46

+#define IDI_MIRANDA_NG_V7			47

+#define IDI_MIRANDA_NG_V8			48

+#define IDI_MIRANDA_NG_V9			49

 

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

 //Jabber resource overlays

diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h
index 6e8dbb8cd9..62eb7a3135 100644
--- a/plugins/FingerprintNG/src/version.h
+++ b/plugins/FingerprintNG/src/version.h
@@ -22,24 +22,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __RELEASE_NUM				0

 #define __BUILD_NUM					0

 

-#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-

-#define __STRINGIFY_IMPL(x)			#x

-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

-#define __VERSION_DWORD				PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)

-

-

-#define __INTERNAL_NAME_STRING		"Fingerprint NG"

-#define __PLUGIN_ID 4300	

-#define __PLUGIN_ID_STR				"4300"

-#define __BETA_FILE_TITLE			"fingerprint"

-

-

-#define __LEGAL_COPYRIGHT_STRING	"©2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."

+#define __FILEVERSION_STRING      __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS        __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)       #x

+#define __STRINGIFY(x)            __STRINGIFY_IMPL(x)

+#define __VERSION_STRING          __STRINGIFY(__FILEVERSION_DOTS)

+

+#define __PLUGIN_NAME             "Fingerprint NG"

+#define __INTERNAL_NAME           "Fingerprint NG"

+#define __FILENAME                "Fingerprint.dll"

+#define __DESCRIPTION             "Fingerprint NG (client version) icons module for Miranda NG."

+#define __AUTHOR                  "faith_healer, ghazan, mataes"

+#define __AUTHOREMAIL             "faith_healer@miranda.im"

+#define __AUTHORWEB               "http://miranda-ng.org/"

+#define __COPYRIGHT               "©2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."

 

 // Fingerprint interface ID. Should be the same for ALL fingerprint plugins.

 // {FFF4B77A-CE40-11DB-A5CD-06A755D89593}

 #define MIID_FINGERPRINT	{0xFFF4B77A, 0xCE40, 0x11DB, { 0xA5, 0xCD, 0x06, 0xA7, 0x55, 0xD8, 0x95, 0x93}}

-#define MIID_THIS_PLUGIN	{0x687364af, 0x58b0, 0x4af2, { 0xa4, 0xee, 0x20, 0xf4, 0xa, 0x8d, 0x9a, 0xfb}}