diff options
Diffstat (limited to 'plugins/FingerprintNG/src')
| -rw-r--r-- | plugins/FingerprintNG/src/finger_groups.h | 5 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/fingerprint.cpp | 12 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/global.h | 2 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/masks.cpp | 2 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/options.cpp | 7 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/resource.h | 1 |
6 files changed, 22 insertions, 7 deletions
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index e1a4fa8959..e760bc8d31 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -98,6 +98,11 @@ case OVERLAYS_PLATFORM_CASE: return _T("Client icons/Overlays/Platform");
break;
+case OVERLAYS_UNICODE_CASE:
+ if ( db_get_b(NULL, "Finger", "GroupOverlaysUnicode", 1))
+ return _T("Client icons/Overlays/Platform");
+ break;
+
case OVERLAYS_PROTO_CASE:
if ( db_get_b(NULL, "Finger", "GroupOverlaysProtos", 1))
return _T("Client icons/Overlays/Protocol");
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index a1866752be..8c92a6e6e2 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -115,8 +115,16 @@ void RegisterIcons() Prepare(&def_kn_fp_overlays2_mask[i], false);
}
- for (i = 0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
- Prepare(&def_kn_fp_overlays3_mask[i], true);
+ if ( db_get_b(NULL, "Finger", "GroupOverlaysUnicode", 1)) {
+ for (i = 0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
+ Prepare(&def_kn_fp_overlays3_mask[i], true);
+ }
+ else {
+ for (i = 0; i < DEFAULT_KN_FP_OVERLAYS3_NO_UNICODE_COUNT; i++)
+ Prepare(&def_kn_fp_overlays3_mask[i], true);
+ for (; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
+ Prepare(&def_kn_fp_overlays3_mask[i], false);
+ }
for (i = 0; i < DEFAULT_KN_FP_OVERLAYS4_COUNT; i++)
Prepare(&def_kn_fp_overlays4_mask[i], true);
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h index 9a77bd82f4..ccd1bf8782 100644 --- a/plugins/FingerprintNG/src/global.h +++ b/plugins/FingerprintNG/src/global.h @@ -119,6 +119,7 @@ typedef struct _foundInfo #define OVERLAYS_RESOURCE_CASE 3020 // resource overlays
#define OVERLAYS_PLATFORM_CASE 3021 // platforms overlays
#define OVERLAYS_PROTO_CASE 3022 // protocols overlays
+#define OVERLAYS_UNICODE_CASE 3023 // unicode overlay
//#define OVERLAYS_SECURITY_CASE 3023 // security overlays
/*
@@ -183,3 +184,4 @@ extern int DEFAULT_KN_FP_MASK_COUNT, DEFAULT_KN_FP_OVERLAYS_COUNT, DEFAULT_KN_FP #define NOTFOUND_MASK_NUMBER (DEFAULT_KN_FP_MASK_COUNT - 3) // third from end
// 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)
+#define DEFAULT_KN_FP_OVERLAYS3_NO_UNICODE_COUNT (DEFAULT_KN_FP_OVERLAYS3_COUNT - 1)
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index c9c7f698ab..e7a09036e7 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -796,7 +796,7 @@ KN_FP_MASK def_kn_fp_overlays3_mask[] = {"client_platform_x64", _T("|*x64*|*64*bit*"), _T("x64 overlay"), IDI_PLATFORM_X64, OVERLAYS_PLATFORM_CASE },
{"client_platform_x32", _T("|*x32*|*32*bit*|*x86*"), _T("x32 overlay"), IDI_PLATFORM_X32, OVERLAYS_PLATFORM_CASE },
- {"client_Unicode", _T("*unicode*"), _T("Unicode overlay"), IDI_UNICODE_CLIENT, OVERLAYS_PLATFORM_CASE },
+ {"client_Unicode", _T("*unicode*"), _T("Unicode overlay"), IDI_UNICODE_CLIENT, OVERLAYS_UNICODE_CASE },
};
int DEFAULT_KN_FP_OVERLAYS3_COUNT = SIZEOF(def_kn_fp_overlays3_mask);
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index a4978a8134..704627d9b8 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -51,6 +51,7 @@ static settings[] = {IDC_GROUP_OVERLAYS_RESOURCE, "GroupOverlaysResource"},
{IDC_GROUP_OVERLAYS_PLATFORM, "GroupOverlaysPlatform"},
+ {IDC_GROUP_OVERLAYS_UNICODE, "GroupOverlaysUnicode"},
{IDC_GROUP_OVERLAYS_PROTO, "GroupOverlaysProtos"},
// {IDC_GROUP_OVERLAYS_SECURITY, "GroupOtherProtos"}
};
@@ -79,7 +80,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, "GroupMirandaVersion") == 0)
+ if (!lstrcmpA(settings[i].szSetName, "GroupMirandaVersion"))
LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, 0);
else
LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, 1);
@@ -95,9 +96,6 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP case IDC_GROUP_MIRANDA:
case IDC_GROUP_MIRANDA_VERSION:
case IDC_GROUP_MIRANDA_PACKS:
- //OptDlgChanged(hwndDlg, true);
- //break;
-
case IDC_GROUP_MULTI:
case IDC_GROUP_AIM:
case IDC_GROUP_GG:
@@ -118,6 +116,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP case IDC_GROUP_OVERLAYS_RESOURCE:
case IDC_GROUP_OVERLAYS_PLATFORM:
case IDC_GROUP_OVERLAYS_PROTO:
+ case IDC_GROUP_OVERLAYS_UNICODE:
// case IDC_GROUP_OVERLAYS_SECURITY:
//OptDlgChanged(hwndDlg, false);
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index ae8b85ee6a..1b0e6e4cc8 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -681,6 +681,7 @@ #define IDC_GROUP_OVERLAYS_PLATFORM 10045
#define IDC_GROUP_OVERLAYS_PROTO 10046
#define IDC_GROUP_OVERLAYS_SECURITY 10047
+#define IDC_GROUP_OVERLAYS_UNICODE 10048
//#define IDC_GROUP_OVERLAYS_RESOURCE_ALT 10048
|