summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/FingerprintNG/res/icons/Others/_blank.icobin0 -> 1150 bytes
-rw-r--r--plugins/FingerprintNG/res/icons_Others.rc1
-rw-r--r--plugins/FingerprintNG/res/resource.rc6
-rw-r--r--plugins/FingerprintNG/src/finger_groups.h50
-rw-r--r--plugins/FingerprintNG/src/global.h2
-rw-r--r--plugins/FingerprintNG/src/masks.cpp10
-rw-r--r--plugins/FingerprintNG/src/options.cpp4
-rw-r--r--plugins/FingerprintNG/src/resource.h17
8 files changed, 49 insertions, 41 deletions
diff --git a/plugins/FingerprintNG/res/icons/Others/_blank.ico b/plugins/FingerprintNG/res/icons/Others/_blank.ico
new file mode 100644
index 0000000000..d8a5b3d80d
--- /dev/null
+++ b/plugins/FingerprintNG/res/icons/Others/_blank.ico
Binary files differ
diff --git a/plugins/FingerprintNG/res/icons_Others.rc b/plugins/FingerprintNG/res/icons_Others.rc
index 029cfb274c..5041403641 100644
--- a/plugins/FingerprintNG/res/icons_Others.rc
+++ b/plugins/FingerprintNG/res/icons_Others.rc
@@ -42,6 +42,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//##############################################################################################################
//############################################# Skype ##########################################################
//##############################################################################################################
+ IDI_BLANK ICON "icons\\others\\_blank.ico"
IDI_FACEBOOK ICON "icons\\others\\Facebook.ico"
IDI_SKYPE ICON "icons\\others\\Skype.ico"
IDI_TWITTER ICON "icons\\others\\Twitter.ico"
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index ff8a568786..157f057bad 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -66,7 +66,7 @@ BEGIN
CONTROL "Resource overlays", IDC_GROUP_OVERLAYS_RESOURCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,30,120,10
CONTROL "Platform overlays", IDC_GROUP_OVERLAYS_PLATFORM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,40,120,10
CONTROL "Protocols overlays", IDC_GROUP_OVERLAYS_PROTO, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,50,120,10
- CONTROL "Secure overlays", IDC_GROUP_OVERLAYS_SECURITY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,60,120,10
+// CONTROL "Secure overlays", IDC_GROUP_OVERLAYS_SECURITY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,60,120,10
GROUPBOX "Select protocols", IDC_STATIC,15,75,290,140
@@ -75,7 +75,7 @@ BEGIN
CONTROL "ICQ clients", IDC_GROUP_ICQ, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,110,120,10
CONTROL "IRC clients", IDC_GROUP_IRC, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10
CONTROL "Jabber clients", IDC_GROUP_JABBER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,130,120,10
- CONTROL "MRA clients", IDC_GROUP_MRA, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,140,120,10
+ CONTROL "MRA clients", IDC_GROUP_MRA, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,140,120,10
CONTROL "MSN clients", IDC_GROUP_MSN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10
CONTROL "QQ clients", IDC_GROUP_QQ, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10
@@ -87,7 +87,7 @@ BEGIN
CONTROL "Multi-protocol clients", IDC_GROUP_MULTI, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,90,120,10
CONTROL "Other (rare) protocols", IDC_GROUP_OTHER_PROTOS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,100,120,10
CONTROL "Other icons", IDC_GROUP_OTHERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,110,120,10
- LTEXT "Note: Miranda NG will have to be restarted for changes to take effect.", IDC_OPTCHANGENOTE,30,240,290,10
+// LTEXT "Note: Miranda NG will have to be restarted for changes to take effect.", IDC_OPTCHANGENOTE,30,240,290,10
END
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index c567076095..ab846e54b9 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -1,122 +1,124 @@
case MIRANDA_CASE:
if ( db_get_b(NULL, "Finger", "GroupMiranda", 1))
- return _T("Client icons/Miranda clients");
+ return _T("Client Icons/Miranda clients");
break;
case MIRANDA_VERSION_CASE:
if ( db_get_b(NULL, "Finger", "GroupMirandaVersion", 1))
- return _T("Client icons/Miranda clients");
+ return _T("Client Icons/Miranda clients");
break;
case MIRANDA_PACKS_CASE:
if ( db_get_b(NULL, "Finger", "GroupMirandaPacks", 1))
- return _T("Client icons/Miranda clients/Pack overlays");
+ return _T("Client Icons/Miranda clients/pack overlays");
break;
case MULTI_CASE:
if ( db_get_b(NULL, "Finger", "GroupMulti", 1))
- return _T("Client icons/Multi-proto clients");
+ return _T("Client Icons/multi-proto clients");
break;
case AIM_CASE:
if ( db_get_b(NULL, "Finger", "GroupAIM", 1))
- return _T("Client icons/AIM clients");
+ return _T("Client Icons/AIM clients");
break;
case GG_CASE:
if ( db_get_b(NULL, "Finger", "GroupGG", 1))
- return _T("Client icons/Gadu-Gadu clients");
+ return _T("Client Icons/Gadu-Gadu clients");
break;
break;
case ICQ_CASE:
if ( db_get_b(NULL, "Finger", "GroupICQ", 1))
- return _T("Client icons/ICQ clients");
+ return _T("Client Icons/ICQ clients");
break;
case IRC_CASE:
if ( db_get_b(NULL, "Finger", "GroupIRC", 1))
- return _T("Client icons/IRC clients");
+ return _T("Client Icons/IRC clients");
break;
case JABBER_CASE:
if ( db_get_b(NULL, "Finger", "GroupJabber", 1))
- return _T("Client icons/Jabber clients");
+ return _T("Client Icons/Jabber clients");
break;
case MRA_CASE:
if ( db_get_b(NULL, "Finger", "GroupMRA", 1))
- return _T("Client icons/MRA clients");
+ return _T("Client Icons/MRA clients");
break;
case MSN_CASE:
if ( db_get_b(NULL, "Finger", "GroupMSN", 1))
- return _T("Client icons/MSN clients");
+ return _T("Client Icons/MSN clients");
break;
case QQ_CASE:
if ( db_get_b(NULL, "Finger", "GroupQQ", 1))
- return _T("Client icons/QQ clients");
+ return _T("Client Icons/QQ clients");
break;
case RSS_CASE:
if ( db_get_b(NULL, "Finger", "GroupRSS", 1))
- return _T("Client icons/RSS clients");
+ return _T("Client Icons/RSS clients");
break;
case TLEN_CASE:
if ( db_get_b(NULL, "Finger", "GroupTlen", 1))
- return _T("Client icons/Tlen clients");
+ return _T("Client Icons/Tlen clients");
break;
case WEATHER_CASE:
if ( db_get_b(NULL, "Finger", "GroupWeather", 1))
- return _T("Client icons/Weather clients");
+ return _T("Client Icons/Weather clients");
break;
case YAHOO_CASE:
if ( db_get_b(NULL, "Finger", "GroupYahoo", 1))
- return _T("Client icons/Yahoo clients");
+ return _T("Client Icons/Yahoo clients");
break;
case OTHER_PROTOS_CASE:
if ( db_get_b(NULL, "Finger", "GroupOtherProtos", 1))
- return _T("Client icons/Other protocols");
+ return _T("Client Icons/other protocols");
break;
case OTHERS_CASE:
if ( db_get_b(NULL, "Finger", "GroupOthers", 1))
- return _T("Client icons/Other icons");
+ return _T("Client Icons/other icons");
break;
case OVERLAYS_RESOURCE_CASE:
if ( db_get_b(NULL, "Finger", "GroupOverlaysResource", 1))
- return _T("Client icons/Overlays/Resource");
+ return _T("Client Icons/overlays/resource");
break;
case OVERLAYS_PLATFORM_CASE:
if ( db_get_b(NULL, "Finger", "GroupOverlaysPlatform", 1))
- return _T("Client icons/Overlays/Platform");
+ 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");
+ return _T("Client Icons/overlays/protocol");
break;
+/*
case OVERLAYS_SECURITY_CASE:
if ( db_get_b(NULL, "Finger", "GroupOtherProtos", 1))
- return _T("Client icons/Overlays/Security");
+ return _T("Client Icons/overlays/security");
break;
+*/
/*
case OVERLAYS_RESOURCE_ALT_CASE:
if ( db_get_b(NULL, "Finger", "GroupOverlays", 1))
- return _T("Client icons/Overlays");
+ return _T("Client Icons/overlays");
break;
*/
default:
- return _T("Client icons");
+ return _T("Client Icons");
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h
index dc3b06973e..27ad0f26c8 100644
--- a/plugins/FingerprintNG/src/global.h
+++ b/plugins/FingerprintNG/src/global.h
@@ -123,7 +123,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_SECURITY_CASE 3023 // security overlays
+//#define OVERLAYS_SECURITY_CASE 3023 // security overlays
/*
#define OVERLAYS_RESOURCE_ALT_CASE 24 // alternative (old style) overlays
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 32ee2c47a5..7807918442 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -278,7 +278,7 @@ KN_FP_MASK def_kn_fp_mask[] =
{"client_JWChat", _T("*JWChat*"), _T("JWChat"), _T("ClientIcons_Jabber"), IDI_JWCHAT, JABBER_CASE, TRUE },
{"client_JWGC", _T("|*JWGC*|Jabber *Gram*"), _T("JWGC (Jabber WindowGram Client)"), _T("ClientIcons_Jabber"), IDI_JWGC, JABBER_CASE, TRUE },
{"client_Jabba", _T("*Jabba*"), _T("Jabba"), _T("ClientIcons_Jabber"), IDI_JABBA, JABBER_CASE, TRUE },
- {"client_Jabber", _T("*Jabber*client*"), _T("Jabber client"), _T("ClientIcons_Jabber"), IDI_JABBER, JABBER_CASE, TRUE },
+
{"client_JabberApplet", _T("Jabber*Applet*"), _T("JabberApplet"), _T("ClientIcons_Jabber"), IDI_JABBER_APPLET, JABBER_CASE, TRUE },
{"client_JabberBeOS", _T("Jabber*BeOS*"), _T("Jabber (BeOS)"), _T("ClientIcons_Jabber"), IDI_JABBER_BEOS, JABBER_CASE, TRUE },
{"client_JabberFoX", _T("*fox*"), _T("JabberFoX"), _T("ClientIcons_Jabber"), IDI_JABBERFOX, JABBER_CASE, TRUE },
@@ -379,7 +379,7 @@ KN_FP_MASK def_kn_fp_mask[] =
{"client_Wija", _T("*wija*"), _T("Wija"), _T("ClientIcons_Jabber"), IDI_WIJA, JABBER_CASE, TRUE },
{"client_Wildfire", _T("Wildfire*"), _T("Wildfire"), _T("ClientIcons_Jabber"), IDI_WILDFIRE, JABBER_CASE, TRUE },
{"client_WinJab", _T("*WinJab*"), _T("WinJab"), _T("ClientIcons_Jabber"), IDI_WINJAB, JABBER_CASE, TRUE },
- {"client_XMPP", _T("*XMPP*"), _T("XMPP"), _T("ClientIcons_Jabber"), IDI_XMPP, JABBER_CASE, TRUE },
+
{"client_Xiffian", _T("*Xiffian*"), _T("Xiffian"), _T("ClientIcons_Jabber"), IDI_XIFFIAN, JABBER_CASE, TRUE },
{"client_Yambi", _T("*Yambi*"), _T("Yambi"), _T("ClientIcons_Jabber"), IDI_YAMBI, JABBER_CASE, TRUE },
{"client_chat_bots", _T("*chat*bot*"), _T("chat bot"), _T("ClientIcons_Jabber"), IDI_CHAT_BOT, JABBER_CASE, TRUE },
@@ -601,7 +601,11 @@ 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*|*ταλιςμαη*|Mrim*"), _T("Python-based clients"), _T("ClientIcons_multiproto"), IDI_PYTHON, MULTI_CASE },
+ {"client_Python", _T("|*Python*|Py*|*ταλιςμαη*"), _T("Python-based clients"), _T("ClientIcons_multiproto"), IDI_PYTHON, MULTI_CASE },
+
+ {"client_Jabber", _T("*Jabber*client*"), _T("Jabber client"), _T("ClientIcons_Jabber"), IDI_JABBER, JABBER_CASE, TRUE },
+
+ {"client_XMPP", _T("|*XMPP*|Mrim*|*DRQZ00fz5WPn1gH+*"), _T("XMPP client"), _T("ClientIcons_Jabber"), IDI_XMPP, JABBER_CASE },
{"client_Twitter", _T("*Twitter*"), _T("Twitter"), _T("ClientIcons_Others"), IDI_TWITTER, OTHER_PROTOS_CASE, TRUE },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 88382ccd01..d357d7db75 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -52,7 +52,7 @@ static settings[] =
{IDC_GROUP_OVERLAYS_RESOURCE, "GroupOverlaysResource"},
{IDC_GROUP_OVERLAYS_PLATFORM, "GroupOverlaysPlatform"},
{IDC_GROUP_OVERLAYS_PROTO, "GroupOverlaysProtos"},
- {IDC_GROUP_OVERLAYS_SECURITY, "GroupOtherProtos"}
+// {IDC_GROUP_OVERLAYS_SECURITY, "GroupOtherProtos"}
};
static void OptDlgChanged(HWND hwndDlg, BOOL show)
@@ -118,7 +118,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_SECURITY:
+// case IDC_GROUP_OVERLAYS_SECURITY:
OptDlgChanged(hwndDlg, false);
break;
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 4290a28338..8e1f8b8983 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -4,16 +4,17 @@
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//##############################################################################################################
-//Other
-#define IDI_FACEBOOK 4
-#define IDI_NOTFOUND 5
-#define IDI_TWITTER 6
-#define IDI_UNDETECTED 7
-#define IDI_UNKNOWN 8
+//Other icons
+#define IDI_BLANK 1
+#define IDI_NOTFOUND 2
+#define IDI_UNDETECTED 3
+#define IDI_UNKNOWN 4
//##############################################################################################################
-//Skype clients
-#define IDI_SKYPE 9
+//Other clients
+#define IDI_FACEBOOK 7
+#define IDI_SKYPE 8
+#define IDI_TWITTER 9
//##############################################################################################################
//MirandaIM clients
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 19:06:21 +0000