diff options
Diffstat (limited to 'plugins/FingerprintNG')
28 files changed, 17 insertions, 56 deletions
diff --git a/plugins/FingerprintNG/iconpacks/res/Others/Discord.ico b/plugins/FingerprintNG/iconpacks/res/Others/Discord.ico Binary files differindex c2830ed132..b9ce86cd14 100644 --- a/plugins/FingerprintNG/iconpacks/res/Others/Discord.ico +++ b/plugins/FingerprintNG/iconpacks/res/Others/Discord.ico diff --git a/plugins/FingerprintNG/iconpacks/res/Others/Skype.ico b/plugins/FingerprintNG/iconpacks/res/Others/Skype.ico Binary files differdeleted file mode 100644 index 031d8afb97..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Others/Skype.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Others/Teams.ico b/plugins/FingerprintNG/iconpacks/res/Others/Teams.ico Binary files differnew file mode 100644 index 0000000000..76e8549214 --- /dev/null +++ b/plugins/FingerprintNG/iconpacks/res/Others/Teams.ico diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQ.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQ.ico Binary files differdeleted file mode 100644 index b010d62498..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Skype.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Skype.ico Binary files differdeleted file mode 100644 index 4b27b56496..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Skype.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/AccuWeather.ico b/plugins/FingerprintNG/iconpacks/res/Weather/AccuWeather.ico Binary files differdeleted file mode 100644 index 91e92daf27..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/AccuWeather.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/gismeteo.ico b/plugins/FingerprintNG/iconpacks/res/Weather/gismeteo.ico Binary files differdeleted file mode 100644 index 67fdc78d1a..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/gismeteo.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/intelli.ico b/plugins/FingerprintNG/iconpacks/res/Weather/intelli.ico Binary files differdeleted file mode 100644 index e6370e0538..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/intelli.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/meteogid.ico b/plugins/FingerprintNG/iconpacks/res/Weather/meteogid.ico Binary files differdeleted file mode 100644 index 3df898e1ca..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/meteogid.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/meteonovosti.ico b/plugins/FingerprintNG/iconpacks/res/Weather/meteonovosti.ico Binary files differdeleted file mode 100644 index a76db3d69d..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/meteonovosti.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/noaa.ico b/plugins/FingerprintNG/iconpacks/res/Weather/noaa.ico Binary files differdeleted file mode 100644 index ab9a9e2f93..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/noaa.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/realmeteo.ico b/plugins/FingerprintNG/iconpacks/res/Weather/realmeteo.ico Binary files differdeleted file mode 100644 index 55dd25d89e..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/realmeteo.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/underground.ico b/plugins/FingerprintNG/iconpacks/res/Weather/underground.ico Binary files differdeleted file mode 100644 index 1b3df3d9b7..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/underground.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/weather.ico b/plugins/FingerprintNG/iconpacks/res/Weather/weather.ico Binary files differdeleted file mode 100644 index 74045b66b3..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/weather.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/weather_cn.ico b/plugins/FingerprintNG/iconpacks/res/Weather/weather_cn.ico Binary files differdeleted file mode 100644 index 94f6a415b8..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/weather_cn.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/weatherxml.ico b/plugins/FingerprintNG/iconpacks/res/Weather/weatherxml.ico Binary files differdeleted file mode 100644 index a43f6daa0a..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/weatherxml.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/wetter.ico b/plugins/FingerprintNG/iconpacks/res/Weather/wetter.ico Binary files differdeleted file mode 100644 index 7faf7da728..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/wetter.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/yweather.ico b/plugins/FingerprintNG/iconpacks/res/Weather/yweather.ico Binary files differdeleted file mode 100644 index 08a05f0c2b..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Weather/yweather.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index f9925a8e84..473b1721af 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -447,19 +447,6 @@ IDI_GG8_OVERLAY ICON "GG\\overlay_GG_v8.ico" IDI_GG9_OVERLAY ICON "GG\\overlay_GG_v9.ico"
IDI_GG10_OVERLAY ICON "GG\\overlay_GG_v10.ico"
IDI_GG11_OVERLAY ICON "GG\\overlay_GG_v11.ico"
-IDI_ACCU ICON "Weather\\AccuWeather.ico"
-IDI_GISMETEO ICON "Weather\\gismeteo.ico"
-IDI_INTELLI ICON "Weather\\intelli.ico"
-IDI_METEOGID ICON "Weather\\meteogid.ico"
-IDI_METEONOVOSTI ICON "Weather\\meteonovosti.ico"
-IDI_NOAA ICON "Weather\\noaa.ico"
-IDI_REALMETEO ICON "Weather\\realmeteo.ico"
-IDI_UNDERGROUND ICON "Weather\\underground.ico"
-IDI_WEATHER ICON "Weather\\weather.ico"
-IDI_WEATHER_CN ICON "Weather\\weather_cn.ico"
-IDI_WEATHERXML ICON "Weather\\weatherxml.ico"
-IDI_WETTER ICON "Weather\\wetter.ico"
-IDI_YWEATHER ICON "Weather\\yweather.ico"
IDI_FACEBOOK ICON "Facebook\\Facebook.ico"
IDI_FACEBOOK_APP ICON "Facebook\\facebook_app.ico"
IDI_FACEBOOK_MESSENGER ICON "Facebook\\facebook_messenger.ico"
@@ -470,7 +457,7 @@ IDI_VK_MESSENGER ICON "VKontakte\\vkmessenger.ico" IDI_VK_PHOENIX_FULL ICON "VKontakte\\phoenix_full.ico"
IDI_VK_PHOENIX_LITE ICON "VKontakte\\phoenix_lite.ico"
IDI_DISCORD ICON "others\\Discord.ico"
-IDI_SKYPE ICON "others\\Skype.ico"
+IDI_TEAMS ICON "others\\Teams.ico"
IDI_TWITTER ICON "others\\Twitter.ico"
IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico"
IDI_STEAM ICON "others\\Steam.ico"
@@ -479,7 +466,6 @@ 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"
IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico"
-IDI_SKYPE_OVERLAY ICON "overlays\\overlay_proto_skype.ico"
IDI_DEBUG_OVERLAY ICON "overlays\\overlay_resource_debug.ico"
IDI_HOME_OVERLAY ICON "overlays\\overlay_resource_home.ico"
IDI_MOBILE_OVERLAY ICON "overlays\\overlay_resource_mobile.ico"
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 71b7f7ba98..72cf74b4f4 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -1,6 +1,6 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright © 2006-24 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-25 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/main.cpp b/plugins/FingerprintNG/src/main.cpp index 7b8231e3b0..336612f3f3 100644 --- a/plugins/FingerprintNG/src/main.cpp +++ b/plugins/FingerprintNG/src/main.cpp @@ -1,6 +1,6 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright © 2006-24 FYR, Bio, nullbie, ghazan, mataes, HierOS, faith_healer and all respective contributors.
+Copyright © 2006-25 FYR, Bio, nullbie, ghazan, mataes, HierOS, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 0f70b1a9fe..c672e00d53 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -1,6 +1,6 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright © 2006-24 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-25 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -468,19 +468,7 @@ static KN_FP_MASK def_kn_fp_mask[] = /////////////////////////////////////////////////////////////////////////////////////////
// WEATHER
- { "client_accu", L"*accuweather*", L"AccuWeather", IDI_ACCU, WEATHER_CASE, TRUE },
- { "client_gismeteo", L"*gismeteo*", L"GisMeteo", IDI_GISMETEO, WEATHER_CASE, TRUE },
- { "client_intelli", L"*intellicast*", L"Intellicast", IDI_INTELLI, WEATHER_CASE, TRUE },
- { "client_meteogid", L"|*meteo-gid*|*meteogid*", L"Meteo-Gid", IDI_METEOGID, WEATHER_CASE, TRUE },
- { "client_meteonovosti", L"*meteonovosti*", L"Meteonovosti", IDI_METEONOVOSTI, WEATHER_CASE, TRUE },
- { "client_noaa", L"*noaa*", L"NOAA Weather", IDI_NOAA, WEATHER_CASE, TRUE },
- { "client_real", L"*realmeteo*", L"RealMeteo", IDI_REALMETEO, WEATHER_CASE, TRUE },
- { "client_under", L"Weather Underground*", L"Weather Underground", IDI_UNDERGROUND, WEATHER_CASE, TRUE },
- { "client_weatherxml", L"*WeatherXML*", L"WeatherXML", IDI_WEATHERXML, WEATHER_CASE, TRUE },
- { "client_wetter", L"*wetter*", L"Wetter", IDI_WETTER, WEATHER_CASE, TRUE },
- { "client_yweather", L"*Yahoo Weather*", L"Yahoo Weather", IDI_YWEATHER, WEATHER_CASE, TRUE },
- { "client_weather_cn", L"*weather.com.cn*", L"Weather CN", IDI_WEATHER_CN, WEATHER_CASE, TRUE },
- { "client_weather", L"*weather*", L"Weather", IDI_WEATHER, WEATHER_CASE, TRUE },
+ // { "client_gismeteo", L"*gismeteo*", L"GisMeteo", IDI_GISMETEO, WEATHER_CASE, TRUE },
/////////////////////////////////////////////////////////////////////////////////////////
// RSS
@@ -526,15 +514,15 @@ static KN_FP_MASK def_kn_fp_mask[] = { "client_XMPP", L"|*XMPP*|Mrim*|*DRQZ00fz5WPn1gH+*", LPGENW("XMPP client"), IDI_XMPP, JABBER_CASE },
+ { "client_Discord", L"*Discord*", L"Discord", IDI_DISCORD, OTHER_PROTOS_CASE },
+
{ "client_Hangouts", L"messaging-*", L"Google+ Hangouts", IDI_HANGOUTS, OTHER_PROTOS_CASE, TRUE },
{ "client_Twitter", L"*Twitter*", L"Twitter", IDI_TWITTER, OTHER_PROTOS_CASE, TRUE },
- { "client_Skype", L"*Skype**", L"Skype", IDI_SKYPE, OTHER_PROTOS_CASE },
-
{ "client_Steam", L"*Steam*", L"Steam", IDI_STEAM, OTHER_PROTOS_CASE },
- { "client_Discord", L"*Discord*", L"Discord", IDI_DISCORD, OTHER_PROTOS_CASE },
+ { "client_Teams", L"*Teams**", L"Teams", IDI_TEAMS, OTHER_PROTOS_CASE },
/////////////////////////////////////////////////////////////////////////////////////////
// UNDEFINED CLIENTS
@@ -601,7 +589,6 @@ static KN_FP_MASK def_kn_fp_overlays_mask[] = { "client_JGTalk_overlay", L"*JGTalk*", LPGENW("JGTalk overlay"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_VK_overlay", L"|Miranda*VKontakte*", LPGENW("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE },
- { "client_Skype_overlay", L"|Miranda*Skype*", LPGENW("Skype overlay"), IDI_SKYPE_OVERLAY, OVERLAYS_PROTO_CASE },
/////////////////////////////////////////////////////////////////////////////////////////
// CLIENT VERSION OVERLAYS
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 3ab27cce1c..98082b0d39 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -1,7 +1,7 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright © 2006-24 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-25 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/prepare.cpp b/plugins/FingerprintNG/src/prepare.cpp index 23b096fccb..ec73d1531d 100644 --- a/plugins/FingerprintNG/src/prepare.cpp +++ b/plugins/FingerprintNG/src/prepare.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org) +Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 109a505d73..bce8cfc0e7 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -59,7 +59,6 @@ #define IDI_JABBER_OVERLAY 83
#define IDI_JGTALK_OVERLAY 84
#define IDI_VK_OVERLAY 90
-#define IDI_SKYPE_OVERLAY 91
#define IDI_SECUREIM_OVERLAY 95
#define IDI_NEWGPG_OVERLAY 96
#define IDI_MIROTR_OVERLAY 97
@@ -380,19 +379,6 @@ #define IDI_RSS09 763
#define IDI_RSS1 764
#define IDI_RSS2 765
-#define IDI_ACCU 801
-#define IDI_GISMETEO 802
-#define IDI_INTELLI 803
-#define IDI_REALMETEO 804
-#define IDI_WETTER 805
-#define IDI_UNDERGROUND 806
-#define IDI_WEATHER 807
-#define IDI_WEATHER_CN 808
-#define IDI_WEATHERXML 809
-#define IDI_METEOGID 810
-#define IDI_YWEATHER 811
-#define IDI_METEONOVOSTI 812
-#define IDI_NOAA 813
#define IDI_ADIUM 1000
#define IDI_AGILE 1001
#define IDI_APPOLO 1002
@@ -488,9 +474,11 @@ #define IDI_FACEBOOK_APP 2002
#define IDI_FACEBOOK_MESSENGER 2003
#define IDI_FACEBOOK_OTHER 2004
+
#define IDC_STATUSBAR 7001
-#define IDI_SKYPE 9002
+
#define IDI_TWITTER 9003
+#define IDI_TEAMS 9004
#define IDI_HANGOUTS 9005
#define IDI_VK 9006
#define IDI_DISCORD 9007
diff --git a/plugins/FingerprintNG/src/stdafx.cxx b/plugins/FingerprintNG/src/stdafx.cxx index 13f28e1314..f111565f38 100644 --- a/plugins/FingerprintNG/src/stdafx.cxx +++ b/plugins/FingerprintNG/src/stdafx.cxx @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index 879a74ee0a..9748fc01a2 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -1,7 +1,7 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright © 2006-24 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-25 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h index ed898d2592..a7c747362f 100644 --- a/plugins/FingerprintNG/src/version.h +++ b/plugins/FingerprintNG/src/version.h @@ -1,6 +1,6 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright © 2006-24 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-25 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -29,4 +29,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __DESCRIPTION "Fingerprint NG (client version) icons module for Miranda NG."
#define __AUTHOR "faith_healer, ghazan, Mataes"
#define __AUTHORWEB "https://miranda-ng.org/p/Fingerprint"
-#define __COPYRIGHT "© 2006-24 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
+#define __COPYRIGHT "© 2006-25 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
|