summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/FingerprintNG/iconpacks/res/ICQ/ICQ.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/ICQ/Mandarin_IM.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/ICQ/R&Q.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v8.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/fp_icons.rc5
-rw-r--r--plugins/FingerprintNG/res/resource.rc21
-rw-r--r--plugins/FingerprintNG/src/masks.cpp15
-rw-r--r--plugins/FingerprintNG/src/options.cpp4
-rw-r--r--plugins/FingerprintNG/src/prepare.cpp5
-rw-r--r--plugins/FingerprintNG/src/resource.h6
-rw-r--r--plugins/FingerprintNG/src/stdafx.h3
11 files changed, 14 insertions, 45 deletions
diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/ICQ.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/ICQ.ico
deleted file mode 100644
index 63f408b9b4..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/ICQ/ICQ.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/Mandarin_IM.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/Mandarin_IM.ico
deleted file mode 100644
index 8734264ea4..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/ICQ/Mandarin_IM.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/R&Q.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/R&Q.ico
deleted file mode 100644
index 22425c6bab..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/ICQ/R&Q.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v8.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v8.ico
deleted file mode 100644
index 963843737e..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v8.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 98b7e8f89f..f9925a8e84 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -376,10 +376,6 @@ IDI_XMPP ICON "Jabber\\XMPP.ico"
IDI_YAMBI ICON "Jabber\\Yambi.ico"
IDI_YAONLINE ICON "Jabber\\yaonline.ico"
IDI_YAXIM ICON "Jabber\\yaxim.ico"
-IDI_MANDARIN ICON "ICQ\\Mandarin_IM.ico"
-IDI_RANDQ ICON "ICQ\\R&Q.ico"
-IDI_ICQ ICON "ICQ\\ICQ.ico"
-IDI_ICQ8_OVERLAY ICON "ICQ\\overlay_ICQ_v8.ico"
IDI_AMIRC ICON "IRC\\AmIRC.ico"
IDI_AMULE ICON "IRC\\aMule.ico"
IDI_BABBEL ICON "IRC\\Babbel.ico"
@@ -479,7 +475,6 @@ IDI_TWITTER ICON "others\\Twitter.ico"
IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico"
IDI_STEAM ICON "others\\Steam.ico"
IDI_GMAIL_OVERLAY ICON "overlays\\overlay_proto_Gmail.ico"
-IDI_ICQ_OVERLAY ICON "overlays\\overlay_proto_ICQ.ico"
IDI_IRC_OVERLAY ICON "overlays\\overlay_proto_IRC.ico"
IDI_JABBER_OVERLAY ICON "overlays\\overlay_proto_Jabber.ico"
IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.ico"
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index 3f69011730..ee47c134d4 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -76,19 +76,18 @@ BEGIN
CONTROL "Protocols overlays",IDC_GROUP_OVERLAYS_PROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,50,120,10
CONTROL "Unicode overlay",IDC_GROUP_OVERLAYS_UNICODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,60,120,10
CONTROL "Secure overlays",IDC_GROUP_OVERLAYS_SECURITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,50,140,10
- GROUPBOX "Select protocols",IDC_STATIC,15,75,290,140
+ GROUPBOX "Select protocols",IDC_STATIC,15,75,290,120
CONTROL "Facebook clients",IDC_GROUP_FACEBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,90,120,10
CONTROL "Gadu-Gadu clients",IDC_GROUP_GG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,100,120,10
- 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 "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,140,120,10
- CONTROL "VKontakte clients",IDC_GROUP_VK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10
- CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10
- CONTROL "Multi-protocol clients",IDC_GROUP_MULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
- CONTROL "Other (rare) protocols",IDC_GROUP_OTHER_PROTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10
- CONTROL "Other icons",IDC_GROUP_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10
- CONTROL "Show client icon in message window status bar",IDC_STATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,220,236,10
+ CONTROL "IRC clients",IDC_GROUP_IRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,110,120,10
+ CONTROL "Jabber clients",IDC_GROUP_JABBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10
+ CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,130,120,10
+ CONTROL "VKontakte clients",IDC_GROUP_VK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,140,120,10
+ CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10
+ CONTROL "Multi-protocol clients",IDC_GROUP_MULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10
+ CONTROL "Other (rare) protocols",IDC_GROUP_OTHER_PROTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
+ CONTROL "Other icons",IDC_GROUP_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10
+ CONTROL "Show client icon in message window status bar",IDC_STATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,200,236,10
END
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 8ea391e5d7..0f70b1a9fe 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -189,14 +189,6 @@ static KN_FP_MASK def_kn_fp_mask[] =
{ "client_Yoono", L"*Yoono*", L"Yoono", IDI_YOONO, MULTI_CASE, TRUE },
/////////////////////////////////////////////////////////////////////////////////////////
- // ICQ
-
- { "client_Mandarin_IM", L"Mandarin IM*", L"Mandarin IM", IDI_MANDARIN_IM, ICQ_CASE, TRUE },
- { "client_R&Q", L"|R&Q*|&RQ*", L"R&Q", IDI_RANDQ, ICQ_CASE, TRUE },
-
- { "client_ICQ_all", L"|ICQ?|ICQ?.?|ICQ *|ICQ2*|ICQ", L"ICQ client", IDI_ICQ, ICQ_CASE },
-
- /////////////////////////////////////////////////////////////////////////////////////////
// JABBER
{ "client_Akeni", L"*Akeni*", L"Akeni", IDI_AKENI, JABBER_CASE, TRUE },
@@ -604,7 +596,6 @@ static KN_FP_MASK def_kn_fp_overlays_mask[] =
/////////////////////////////////////////////////////////////////////////////////////////
// PROTO OVERLAYS
- { "client_ICQ_overlay", L"|^ICQ|^ICQ*|*ICQ*", LPGENW("ICQ overlay"), IDI_ICQ_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_IRC_overlay", L"|^IRC*|Miranda*IRC*", LPGENW("IRC overlay"), IDI_IRC_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_JGmail_overlay", L"*JGmail*", LPGENW("JGmail overlay"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_JGTalk_overlay", L"*JGTalk*", LPGENW("JGTalk overlay"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE },
@@ -615,8 +606,6 @@ static KN_FP_MASK def_kn_fp_overlays_mask[] =
/////////////////////////////////////////////////////////////////////////////////////////
// CLIENT VERSION OVERLAYS
- { "client_ICQ8_over", L"ICQ*8*", LPGENW("ICQ v8.x overlay"), IDI_ICQ8_OVERLAY, ICQ_CASE },
-
{ "client_GG_11", L"|Gadu-Gadu*11*|GG*11*", LPGENW("Gadu-Gadu v11 client"), IDI_GG11_OVERLAY, GG_CASE },
{ "client_GG_10", L"|Gadu-Gadu*10*|GG*10", LPGENW("Gadu-Gadu v10 client"), IDI_GG10_OVERLAY, GG_CASE },
{ "client_GG_9", L"|Gadu-Gadu*9*|GG*9*", LPGENW("Gadu-Gadu v9 client"), IDI_GG9_OVERLAY, GG_CASE },
@@ -629,8 +618,8 @@ static KN_FP_MASK def_kn_fp_overlays_mask[] =
{ "client_on_iOS", L"|*ipad*|*iphone*|*iOS*", LPGENW("iOS overlay (iPhone/iPad)"), IDI_PLATFORM_IOS, OVERLAYS_PLATFORM_CASE },
{ "client_on_Mac", L"|^*smack*|* Mac *|*mac*|*OSX*", LPGENW("MacOS overlay"), IDI_PLATFORM_MAC, OVERLAYS_PLATFORM_CASE },
{ "client_on_Linux", L"*Linux*", LPGENW("Linux overlay"), IDI_PLATFORM_LINUX, OVERLAYS_PLATFORM_CASE },
- { "client_on_Flash", L"|*Flash*|*Web*ICQ*", LPGENW("Flash overlay"), IDI_PLATFORM_FLASH, OVERLAYS_PLATFORM_CASE },
- { "client_on_Java", L"|*Java*|jagent*|ICQ2Go!*", LPGENW("Java overlay"), IDI_PLATFORM_JAVA, OVERLAYS_PLATFORM_CASE },
+ { "client_on_Flash", L"*Flash*", LPGENW("Flash overlay"), IDI_PLATFORM_FLASH, OVERLAYS_PLATFORM_CASE },
+ { "client_on_Java", L"|*Java*|jagent*", LPGENW("Java overlay"), IDI_PLATFORM_JAVA, OVERLAYS_PLATFORM_CASE },
{ "client_on_Symbian", L"|*Symbian*|sagent*", LPGENW("Symbian overlay"), IDI_PLATFORM_SYMBIAN, OVERLAYS_PLATFORM_CASE },
{ "client_on_Amiga", L"*Amiga*", LPGENW("Amiga overlay"), IDI_PLATFORM_AMIGA, OVERLAYS_PLATFORM_CASE },
{ "client_on_Android", L"|*Android*|*(android)*", LPGENW("Android overlay"), IDI_PLATFORM_ANDROID, OVERLAYS_PLATFORM_CASE },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 6cde2061ff..3ab27cce1c 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -34,7 +34,6 @@ static settings[] =
{ IDC_GROUP_MULTI, TRUE, "GroupMulti" },
{ IDC_GROUP_GG, TRUE, "GroupGG" },
- { IDC_GROUP_ICQ, TRUE, "GroupICQ" },
{ IDC_GROUP_IRC, TRUE, "GroupIRC" },
{ IDC_GROUP_JABBER, TRUE, "GroupJabber" },
{ IDC_GROUP_RSS, TRUE, "GroupRSS" },
@@ -56,7 +55,7 @@ static settings[] =
class COptDialog : public CDlgBase
{
CCtrlCheck m_chkMiranda, m_chkMirandaPacks, m_chkMirandaVer, m_chkOverRes, m_chkOverPlatf, m_chkOverProto, m_chkOverUnicode, m_chkOverSecur,
- m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto,
+ m_chkFacebbok, m_chkGG, m_chkIRC, m_chkJabber, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto,
m_chkOthers, m_chkStatusBar;
void LoadDBCheckState(int idCtrl, LPCSTR szSetting, uint8_t bDef)
@@ -84,7 +83,6 @@ public:
m_chkOverSecur(this, IDC_GROUP_OVERLAYS_SECURITY),
m_chkFacebbok(this, IDC_GROUP_FACEBOOK),
m_chkGG(this, IDC_GROUP_GG),
- m_chkICQ(this, IDC_GROUP_ICQ),
m_chkIRC(this, IDC_GROUP_IRC),
m_chkJabber(this, IDC_GROUP_JABBER),
m_chkRSS(this, IDC_GROUP_RSS),
diff --git a/plugins/FingerprintNG/src/prepare.cpp b/plugins/FingerprintNG/src/prepare.cpp
index 54c0089371..23b096fccb 100644
--- a/plugins/FingerprintNG/src/prepare.cpp
+++ b/plugins/FingerprintNG/src/prepare.cpp
@@ -52,11 +52,6 @@ static wchar_t *getSectionName(int flag)
return LPGENW("Client icons") L"/" LPGENW("Gadu-Gadu clients");
break;
- case ICQ_CASE:
- if (g_plugin.getByte("GroupICQ", 1))
- return LPGENW("Client icons") L"/" LPGENW("ICQ clients");
- break;
-
case IRC_CASE:
if (g_plugin.getByte("GroupIRC", 1))
return LPGENW("Client icons") L"/" LPGENW("IRC clients");
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 12a7001568..109a505d73 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -55,7 +55,6 @@
#define IDI_PLATFORM_X32 76
#define IDI_PLATFORM_X64 77
#define IDI_GMAIL_OVERLAY 79
-#define IDI_ICQ_OVERLAY 80
#define IDI_IRC_OVERLAY 82
#define IDI_JABBER_OVERLAY 83
#define IDI_JGTALK_OVERLAY 84
@@ -105,11 +104,7 @@
#define IDI_MIRANDA_WATCHER 139
#define IDI_MIRANDA_YAOL 140
#define IDI_MIRANDA_ZELEBOBA 141
-#define IDI_ICQ 190
-#define IDI_ICQ8_OVERLAY 198
#define IDI_ASIA 202
-#define IDI_MANDARIN_IM 219
-#define IDI_RANDQ 220
#define IDI_IRC 300
#define IDI_AMIRC 301
#define IDI_AMULE 302
@@ -511,7 +506,6 @@
#define IDC_GROUP_MIRANDA_PACKS 10027
#define IDC_GROUP_MULTI 10028
#define IDC_GROUP_GG 10030
-#define IDC_GROUP_ICQ 10032
#define IDC_GROUP_IRC 10033
#define IDC_GROUP_JABBER 10034
#define IDC_GROUP_RSS 10038
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index 77f6ca66ad..ad305e713b 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -1,4 +1,4 @@
-/*
+а/*
Fingerprint NG (client version) icons module for Miranda NG
Copyright © 2006-24 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
@@ -82,7 +82,6 @@ struct FOUNDINFO
#define MULTI_CASE 3004 // multi-protocol clients
#define GG_CASE 3006 // Gadu-Gadu clients
-#define ICQ_CASE 3008 // ICQ clients
#define IRC_CASE 3009 // IRC clients
#define JABBER_CASE 3010 // Jabber clients
#define RSS_CASE 3014 // RSS clients
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:20:48 +0000