diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-11-22 09:38:28 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-11-22 09:38:28 +0000 |
| commit | c08349da29fd43d6603c19909ef25160c1b3c971 (patch) | |
| tree | c141cea7d9904cb9ed7a83497f75a52e6a99d526 /plugins/FingerprintNG/src | |
| parent | 784fd9772696a78479e93a3bbbe2a0c19998e2e7 (diff) | |
- fixed and extended ICQ detection (and v5.x detection returned).
- added ZNC, iroffer and iroffer dinoex detection.
- restored Openfire detection.
- minor fixes and typos.
- more tabs and spaces cleaning.
git-svn-id: http://svn.miranda-ng.org/main/trunk@2430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FingerprintNG/src')
| -rw-r--r-- | plugins/FingerprintNG/src/fingerprint.cpp | 4 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/global.h | 42 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/main.cpp | 8 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/masks.cpp | 127 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/options.cpp | 56 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/resource.h | 76 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/stdafx.cpp | 2 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/utilities.cpp | 6 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/utilities.h | 4 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/version.h | 20 |
10 files changed, 179 insertions, 166 deletions
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 04e554f533..589003c30e 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -9,12 +9,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//Start of header
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h index 7d64191320..9f2ad70813 100644 --- a/plugins/FingerprintNG/src/global.h +++ b/plugins/FingerprintNG/src/global.h @@ -10,12 +10,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Modify the following defines if you have to target a platform prior to the ones specified below.
@@ -81,16 +81,16 @@ typedef struct { struct KN_FP_MASK
{
- LPSTR szIconName;
- LPTSTR szMask;
- LPTSTR szClientDescription;
- LPTSTR szIconFileName;
- int iIconIndex;
- int iSectionFlag;
- BOOL fNotUseOverlay;
-
- HANDLE hIcolibItem;
- LPTSTR szMaskUpper;
+ LPSTR szIconName;
+ LPTSTR szMask;
+ LPTSTR szClientDescription;
+ LPTSTR szIconFileName;
+ int iIconIndex;
+ int iSectionFlag;
+ BOOL fNotUseOverlay;
+
+ HANDLE hIcolibItem;
+ LPTSTR szMaskUpper;
};
typedef struct _foundInfo
@@ -99,15 +99,15 @@ typedef struct _foundInfo HANDLE hRegisteredImage;
} FOUNDINFO;
-#define MIRANDA_CASE 3001 // Miranda clients
-#define MIRANDA_VERSION_CASE 3002 // Miranda version overlays
-#define MIRANDA_PACKS_CASE 3003 // Miranda packs overlays
+#define MIRANDA_CASE 3001 // Miranda clients
+#define MIRANDA_VERSION_CASE 3002 // Miranda version overlays
+#define MIRANDA_PACKS_CASE 3003 // Miranda packs overlays
-#define MULTI_CASE 3004 // multi-protocol clients
-#define AIM_CASE 3005 // AIM clients
-#define GG_CASE 3006 // Gadu-Gadu clients
-#define ICQ_CASE 3008 // ICQ clients
-#define IRC_CASE 3009 // IRC clients
+#define MULTI_CASE 3004 // multi-protocol clients
+#define AIM_CASE 3005 // AIM 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 MRA_CASE 3011 // Mail.Ru Agent clients
#define MSN_CASE 3012 // MSN clients
@@ -126,7 +126,7 @@ typedef struct _foundInfo #define OVERLAYS_SECURITY_CASE 3023 // security overlays
/*
-#define OVERLAYS_RESOURCE_ALT_CASE 24 // alternative (old style) overlays
+#define OVERLAYS_RESOURCE_ALT_CASE 24 // alternative (old style) overlays
*/
#define PtrIsValid(p) (((p)!=0)&&(((HANDLE)(p))!=INVALID_HANDLE_VALUE))
diff --git a/plugins/FingerprintNG/src/main.cpp b/plugins/FingerprintNG/src/main.cpp index 5834cac369..07d3c1d455 100644 --- a/plugins/FingerprintNG/src/main.cpp +++ b/plugins/FingerprintNG/src/main.cpp @@ -9,12 +9,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//Start of header
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define LIB_USE 3
HINSTANCE g_hInst;
-int hLangpack;
+int hLangpack;
HANDLE hHeap = NULL;
@@ -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 };
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 006d8c7b81..9f1bfb6dbb 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -82,7 +82,7 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_1&1", _T("|*Pocket*Web*|*1&1*|*1*?nd*1"), _T("1&1"), _T("ClientIcons_multiproto"), IDI_1UND1, MULTI_CASE, TRUE },
{"client_Asia", _T("*Asia*"), _T("Asia"), _T("ClientIcons_multiproto"), IDI_ASIA, MULTI_CASE, TRUE },
{"client_Adium", _T("|*Adium*")
- _T("|*VUFD6HcFmUT2NxJkBGCiKlZnS3M=*") // Gabble client?
+ _T("|*VUFD6HcFmUT2NxJkBGCiKlZnS3M=*") // Gabble client?
_T("|*DdnydQG7RGhP9E3k9Sf+b+bF0zo=*"), _T("Adium"), _T("ClientIcons_multiproto"), IDI_ADIUM, MULTI_CASE, TRUE },
{"client_AgileMessenger", _T("*Agile Messenger*"), _T("Agile Messenger"), _T("ClientIcons_multiproto"), IDI_AGILE, MULTI_CASE, TRUE },
@@ -201,7 +201,7 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Licq", _T("Licq*"), _T("Licq"), _T("ClientIcons_ICQ"), IDI_LICQ, ICQ_CASE, TRUE },
{"client_LocID", _T("LocID*"), _T("LocID"), _T("ClientIcons_ICQ"), IDI_LOCID, ICQ_CASE, TRUE },
{"client_QIP_2005", _T("QIP*2005*"), _T("QIP 2005"), _T("ClientIcons_ICQ"), IDI_QIP_2005, ICQ_CASE, TRUE },
- {"client_R&Q", _T("R&Q*"), _T("R&Q"), _T("ClientIcons_ICQ"), IDI_RANDQ, ICQ_CASE, TRUE },
+ {"client_R&Q", _T("|R&Q*|&RQ*"), _T("R&Q"), _T("ClientIcons_ICQ"), IDI_RANDQ, ICQ_CASE, TRUE },
{"client_SmartICQ", _T("Smart*ICQ*"), _T("SmartICQ"), _T("ClientIcons_ICQ"), IDI_SMARTICQ, ICQ_CASE, TRUE },
{"client_StrICQ", _T("StrICQ*"), _T("StrICQ"), _T("ClientIcons_ICQ"), IDI_STRICQ, ICQ_CASE, TRUE },
@@ -209,7 +209,7 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_libicq2k", _T("libicq*"), _T("LibICQ/JIT"), _T("ClientIcons_ICQ"), IDI_LIBICQ2000, ICQ_CASE, TRUE },
{"client_TICQClient", _T("*TICQ*Client*"), _T("TICQClient (Delphi lib)"), _T("ClientIcons_ICQ"), IDI_TICQ, ICQ_CASE, TRUE },
- {"client_ICQ_all", _T("|ICQ *|ICQ2*"), _T("ICQ official client"), _T("ClientIcons_ICQ"), IDI_ICQ, ICQ_CASE },
+ {"client_ICQ_all", _T("|ICQ?|ICQ?.?|ICQ *|ICQ2*|ICQ"), _T("ICQ client"), _T("ClientIcons_ICQ"), IDI_ICQ, ICQ_CASE },
// AIM detection in ICQ protocol clutch, actually are mobile clients
// {"client_AIM", _T("AIM"), _T("AIM-based client"), _T("ClientIcons_ICQ"), IDI_AIM_7, ICQ_CASE, TRUE },
@@ -252,7 +252,6 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Emacs", _T("|*Jabber.el*|*Emacs*"), _T("Emacs (Jabber.el)"), _T("ClientIcons_Jabber"), IDI_EMACS, JABBER_CASE, TRUE },
{"client_Exodus", _T("*Exodus*"), _T("Exodus"), _T("ClientIcons_Jabber"), IDI_EXODUS, JABBER_CASE, TRUE },
{"client_Facebook", _T("*Facebook*"), _T("Facebook"), _T("ClientIcons_Jabber"), IDI_FACEBOOK, JABBER_CASE, TRUE },
- {"client_Fire", _T("Fire*"), _T("Fire"), _T("ClientIcons_Jabber"), IDI_FIRE, JABBER_CASE, TRUE },
{"client_GCN", _T("*GCN*"), _T("GCN"), _T("ClientIcons_Jabber"), IDI_GCN, JABBER_CASE, TRUE },
{"client_GMail", _T("|*gmail.*|GMail*"), _T("GMail"), _T("ClientIcons_Jabber"), IDI_GMAIL, JABBER_CASE, TRUE },
{"client_GOIM", _T("*GOIM*"), _T("GOIM"), _T("ClientIcons_Jabber"), IDI_GOIM, JABBER_CASE, TRUE },
@@ -274,7 +273,7 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Importal", _T("*Importal*"), _T("Importal"), _T("ClientIcons_Jabber"), IDI_IMPORTAL, JABBER_CASE, TRUE },
{"client_InstanT", _T("*Instan-t*"), _T("Instan-t"), _T("ClientIcons_Jabber"), IDI_INSTANT, JABBER_CASE, TRUE },
{"client_Interaction", _T("*Interaction*"), _T("Interaction"), _T("ClientIcons_Jabber"), IDI_INTERACTION, JABBER_CASE, TRUE },
- {"client_Iruka", _T("*Iruka*"), _T("Iruka"), _T("ClientIcons_Jabber"), IDI_IRUKA, JABBER_CASE, TRUE },
+ {"client_iruka", _T("*Iruka*"), _T("Iruka"), _T("ClientIcons_Jabber"), IDI_IRUKA, JABBER_CASE, TRUE },
{"client_J2J_Transport", _T("*J2J*Transport*"), _T("J2J Transport"), _T("ClientIcons_Jabber"), IDI_J2J_TRANSPORT, JABBER_CASE, TRUE },
{"client_Jamm", _T("*Jamm*"), _T("Jamm"), _T("ClientIcons_Jabber"), IDI_JAMM, JABBER_CASE, TRUE },
{"client_JClaim", _T("*JClaim*"), _T("JClaim"), _T("ClientIcons_Jabber"), IDI_JCLAIM, JABBER_CASE, TRUE },
@@ -318,6 +317,8 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_OM", _T("OM*"), _T("OM aka Online Messenger"), _T("ClientIcons_Jabber"), IDI_OM, JABBER_CASE, TRUE },
{"client_OctroTalk", _T("*Octro*"), _T("OctroTalk"), _T("ClientIcons_Jabber"), IDI_OCTROTALK, JABBER_CASE, TRUE },
{"client_OneTeam", _T("*OneTeam*"), _T("OneTeam"), _T("ClientIcons_Jabber"), IDI_ONETEAM, JABBER_CASE, TRUE },
+ {"client_Openfire", _T("*Openfire*"), _T("Openfire"), _T("ClientIcons_Jabber"), IDI_OPENFIRE, JABBER_CASE, TRUE },
+ {"client_Fire", _T("Fire*"), _T("Fire"), _T("ClientIcons_Jabber"), IDI_FIRE, JABBER_CASE, TRUE },
{"client_Paltalk", _T("*Paltalk*"), _T("Paltalk"), _T("ClientIcons_Jabber"), IDI_PALTALK, JABBER_CASE, TRUE },
{"client_Pandion", _T("|*Pandion*|*Пандион*"), _T("Pandion"), _T("ClientIcons_Jabber"), IDI_PANDION, JABBER_CASE, TRUE },
{"client_Papla", _T("*Papla*"), _T("Papla"), _T("ClientIcons_Jabber"), IDI_PAPLA, JABBER_CASE, TRUE },
@@ -465,6 +466,9 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_cbirc", _T("*cbirc*"), _T("cbirc"), _T("ClientIcons_IRC"), IDI_CBIRC, IRC_CASE, TRUE },
{"client_dIRC", _T("*dIRC*"), _T("dIRC"), _T("ClientIcons_IRC"), IDI_DIRC, IRC_CASE, TRUE },
+ {"client_iroffer_dinoex", _T("*iroffer*dinoex*"), _T("iroffer dinoex"), _T("ClientIcons_IRC"), IDI_IROFFER_DINOEX, IRC_CASE, TRUE },
+ {"client_iroffer", _T("*iroffer*"), _T("iroffer"), _T("ClientIcons_IRC"), IDI_IROFFER, IRC_CASE, TRUE },
+
{"client_ircle", _T("*ircle*"), _T("ircle"), _T("ClientIcons_IRC"), IDI_IRCLE, IRC_CASE, TRUE },
{"client_jircii", _T("*jircii*"), _T("jircii"), _T("ClientIcons_IRC"), IDI_JIRCII, IRC_CASE, TRUE },
{"client_jmIrc", _T("*jmIrc*"), _T("jmIrc"), _T("ClientIcons_IRC"), IDI_JMIRC, IRC_CASE, TRUE },
@@ -478,6 +482,8 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_xChat", _T("*xChat*"), _T("xChat"), _T("ClientIcons_IRC"), IDI_XCHAT, IRC_CASE, TRUE },
{"client_zsIRC", _T("*zsIRC*"), _T("zsIRC"), _T("ClientIcons_IRC"), IDI_ZSIRC, IRC_CASE, TRUE },
+ {"client_ZNC", _T("*ZNC*"), _T("ZNC"), _T("ClientIcons_IRC"), IDI_ZNC, IRC_CASE, TRUE },
+
{"client_aMule", _T("*aMule*"), _T("aMule"), _T("ClientIcons_IRC"), IDI_AMULE, IRC_CASE, TRUE },
{"client_eMuleMorphXT", _T("eMule*MorphXT*"), _T("eMule MorphXT"), _T("ClientIcons_IRC"), IDI_EMULE_MORPHXT, IRC_CASE, TRUE },
{"client_eMuleNeo", _T("eMule*Neo*"), _T("eMule Neo"), _T("ClientIcons_IRC"), IDI_EMULE_NEO, IRC_CASE, TRUE },
@@ -490,16 +496,16 @@ KN_FP_MASK def_kn_fp_mask[] = //###########################################################################################################################################################################################################
//################################# AIM #############################################################################################################################################################
//###########################################################################################################################################################################################################
- {"client_Aim7", _T("AIM*7.*"), _T("AIM v7.x"), _T("ClientIcons_AIM"), IDI_AIM_7, AIM_CASE, TRUE },
- {"client_Aim6", _T("AIM*6.*"), _T("AIM v6.x"), _T("ClientIcons_AIM"), IDI_AIM_6, AIM_CASE, TRUE },
+ {"client_Aim7", _T("AIM*7.*"), _T("AIM v7.x"), _T("ClientIcons_AIM"), IDI_AIM_7, AIM_CASE, TRUE },
+ {"client_Aim6", _T("AIM*6.*"), _T("AIM v6.x"), _T("ClientIcons_AIM"), IDI_AIM_6, AIM_CASE, TRUE },
- {"client_AIM_Triton", _T("*AIM*Triton*"), _T("AIM Triton"), _T("ClientIcons_AIM"), IDI_AIM_TRITON, AIM_CASE, TRUE },
- {"client_AimMac", _T("AIM*Mac*"), _T("AIM for MacOS"), _T("ClientIcons_AIM"), IDI_AIM_MAC, AIM_CASE, TRUE },
- {"client_AimMobile", _T("|AIM*Mobile*|AIM*gprs*|Aim*sms*"), _T("AIM Mobile"), _T("ClientIcons_AIM"), IDI_AIM_MOBILE, AIM_CASE, TRUE },
- {"client_Naim", _T("*naim*"), _T("Naim"), _T("ClientIcons_AIM"), IDI_NAIM, AIM_CASE, TRUE },
- {"client_miniaim", _T("*miniaim*"), _T("miniaim"), _T("ClientIcons_AIM"), IDI_MINIAIM, AIM_CASE, TRUE },
- {"client_TerraIM", _T("*Terra*"), _T("TerraIM"), _T("ClientIcons_AIM"), IDI_TERRAIM, AIM_CASE, TRUE },
- {"client_AIM", _T("AIM*"), _T("AIM"), _T("ClientIcons_AIM"), IDI_AIM_7, AIM_CASE, TRUE },
+ {"client_AIM_Triton", _T("*AIM*Triton*"), _T("AIM Triton"), _T("ClientIcons_AIM"), IDI_AIM_TRITON, AIM_CASE, TRUE },
+ {"client_AimMac", _T("AIM*Mac*"), _T("AIM for MacOS"), _T("ClientIcons_AIM"), IDI_AIM_MAC, AIM_CASE, TRUE },
+ {"client_AimMobile", _T("|AIM*Mobile*|AIM*gprs*|Aim*sms*"), _T("AIM Mobile"), _T("ClientIcons_AIM"), IDI_AIM_MOBILE, AIM_CASE, TRUE },
+ {"client_Naim", _T("*naim*"), _T("Naim"), _T("ClientIcons_AIM"), IDI_NAIM, AIM_CASE, TRUE },
+ {"client_miniaim", _T("*miniaim*"), _T("miniaim"), _T("ClientIcons_AIM"), IDI_MINIAIM, AIM_CASE, TRUE },
+ {"client_TerraIM", _T("*Terra*"), _T("TerraIM"), _T("ClientIcons_AIM"), IDI_TERRAIM, AIM_CASE, TRUE },
+ {"client_AIM", _T("AIM*"), _T("AIM"), _T("ClientIcons_AIM"), IDI_AIM_7, AIM_CASE, TRUE },
//###########################################################################################################################################################################################################
//################################# MSN #############################################################################################################################################################
@@ -521,12 +527,12 @@ KN_FP_MASK def_kn_fp_mask[] = //###########################################################################################################################################################################################################
{"client_MRA_official", _T("|magent*|Mail.ru Agent*official*")
_T("|Mail.ru Agent*PC*")
- _T("|http://agent.mail.ru*"), _T("Mail.Ru Agent (official)"), _T("ClientIcons_MRA"), IDI_MAIL_RU_OFFICIAL, MRA_CASE, TRUE },
+ _T("|http://agent.mail.ru*"), _T("Mail.Ru Agent (official)"), _T("ClientIcons_MRA"), IDI_MAIL_RU_OFFICIAL, MRA_CASE, TRUE },
{"client_MRA_Mobile", _T("|wmagent*|MobileAgent*")
_T("|sagent*|Mail.ru Agent*Symbian*")
- _T("|jagent*"), _T("Mail.Ru Mobile Agent"), _T("ClientIcons_MRA"), IDI_MAIL_RU_MOBILE, MRA_CASE, TRUE },
- {"client_MRA_web", _T("Web Agent*"), _T("Mail.Ru Web Agent"), _T("ClientIcons_MRA"), IDI_MAIL_RU_WEBAGENT, MRA_CASE, TRUE },
- {"client_MRA_unknown", _T("Mail.ru Agent*"), _T("Mail.Ru (unknown client)"), _T("ClientIcons_MRA"), IDI_MAIL_RU_UNKNOWN, MRA_CASE, TRUE },
+ _T("|jagent*"), _T("Mail.Ru Mobile Agent"), _T("ClientIcons_MRA"), IDI_MAIL_RU_MOBILE, MRA_CASE, TRUE },
+ {"client_MRA_web", _T("Web Agent*"), _T("Mail.Ru Web Agent"), _T("ClientIcons_MRA"), IDI_MAIL_RU_WEBAGENT, MRA_CASE, TRUE },
+ {"client_MRA_unknown", _T("Mail.ru Agent*"), _T("Mail.Ru (unknown client)"), _T("ClientIcons_MRA"), IDI_MAIL_RU_UNKNOWN, MRA_CASE, TRUE },
//###########################################################################################################################################################################################################
//################################# YAHOO #############################################################################################################################################################
@@ -619,53 +625,53 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = //###########################################################################################################################################################################################################
//################################# MIRANDA PACKS OVERLAYS #########################################################################################################################################
//###########################################################################################################################################################################################################
- {"client_AF_pack", _T("*AF*Pack*"), _T("AF"), _T("ClientIcons_packs"), IDI_MIRANDA_AF, MIRANDA_PACKS_CASE },
- {"client_AlfaMaR_pack", _T("*AlfaMaR*"), _T("AlfaMaR"), _T("ClientIcons_packs"), IDI_MIRANDA_ALFAMAR, MIRANDA_PACKS_CASE },
- {"client_Amatory_pack", _T("*Amatory*"), _T("Amatory"), _T("ClientIcons_packs"), IDI_MIRANDA_AMATORY, MIRANDA_PACKS_CASE },
- {"client_BRI_pack", _T("*bri*edition*"), _T("Bri edition"), _T("ClientIcons_packs"), IDI_MIRANDA_BRI, MIRANDA_PACKS_CASE },
- {"client_Devil_pack", _T("*6.6.6*"), _T("Devil Suite"), _T("ClientIcons_packs"), IDI_MIRANDA_DEVIL, MIRANDA_PACKS_CASE },
- {"client_E33_pack", _T("*[E33*]*"), _T("E33"), _T("ClientIcons_packs"), IDI_MIRANDA_E33, MIRANDA_PACKS_CASE },
- {"client_FR_pack", _T("*FR*Pack*"), _T("Miranda FR"), _T("ClientIcons_packs"), IDI_MIRANDA_FR, MIRANDA_PACKS_CASE },
- {"client_Faith_pack", _T("*Faith*Pack*"), _T("FaithPack"), _T("ClientIcons_packs"), IDI_MIRANDA_FAITH, MIRANDA_PACKS_CASE },
- {"client_Final_pack", _T("*[Final*Pack]*"), _T("Final pack"), _T("ClientIcons_packs"), IDI_MIRANDA_FINAL, MIRANDA_PACKS_CASE },
- {"client_Freize_pack", _T("*Freize*"), _T("Freize"), _T("ClientIcons_packs"), IDI_MIRANDA_FREIZE, MIRANDA_PACKS_CASE },
- {"client_Ghost_pack", _T("*Ghost's*"), _T("Ghost's pack"), _T("ClientIcons_packs"), IDI_MIRANDA_GHOST, MIRANDA_PACKS_CASE },
- {"client_HCoffee_pack", _T("*[HotCoffee]*"), _T("HotCoffee"), _T("ClientIcons_packs"), IDI_MIRANDA_CAPPUCCINO, MIRANDA_PACKS_CASE },
- {"client_HierOS_pack", _T("*HierOS*"), _T("HierOS"), _T("ClientIcons_packs"), IDI_MIRANDA_HIEROS, MIRANDA_PACKS_CASE },
+ {"client_AF_pack", _T("*AF*Pack*"), _T("AF"), _T("ClientIcons_packs"), IDI_MIRANDA_AF, MIRANDA_PACKS_CASE },
+ {"client_AlfaMaR_pack", _T("*AlfaMaR*"), _T("AlfaMaR"), _T("ClientIcons_packs"), IDI_MIRANDA_ALFAMAR, MIRANDA_PACKS_CASE },
+ {"client_Amatory_pack", _T("*Amatory*"), _T("Amatory"), _T("ClientIcons_packs"), IDI_MIRANDA_AMATORY, MIRANDA_PACKS_CASE },
+ {"client_BRI_pack", _T("*bri*edition*"), _T("Bri edition"), _T("ClientIcons_packs"), IDI_MIRANDA_BRI, MIRANDA_PACKS_CASE },
+ {"client_Devil_pack", _T("*6.6.6*"), _T("Devil Suite"), _T("ClientIcons_packs"), IDI_MIRANDA_DEVIL, MIRANDA_PACKS_CASE },
+ {"client_E33_pack", _T("*[E33*]*"), _T("E33"), _T("ClientIcons_packs"), IDI_MIRANDA_E33, MIRANDA_PACKS_CASE },
+ {"client_FR_pack", _T("*FR*Pack*"), _T("Miranda FR"), _T("ClientIcons_packs"), IDI_MIRANDA_FR, MIRANDA_PACKS_CASE },
+ {"client_Faith_pack", _T("*Faith*Pack*"), _T("FaithPack"), _T("ClientIcons_packs"), IDI_MIRANDA_FAITH, MIRANDA_PACKS_CASE },
+ {"client_Final_pack", _T("*[Final*Pack]*"), _T("Final pack"), _T("ClientIcons_packs"), IDI_MIRANDA_FINAL, MIRANDA_PACKS_CASE },
+ {"client_Freize_pack", _T("*Freize*"), _T("Freize"), _T("ClientIcons_packs"), IDI_MIRANDA_FREIZE, MIRANDA_PACKS_CASE },
+ {"client_Ghost_pack", _T("*Ghost's*"), _T("Ghost's pack"), _T("ClientIcons_packs"), IDI_MIRANDA_GHOST, MIRANDA_PACKS_CASE },
+ {"client_HCoffee_pack", _T("*[HotCoffee]*"), _T("HotCoffee"), _T("ClientIcons_packs"), IDI_MIRANDA_CAPPUCCINO, MIRANDA_PACKS_CASE },
+ {"client_HierOS_pack", _T("*HierOS*"), _T("HierOS"), _T("ClientIcons_packs"), IDI_MIRANDA_HIEROS, MIRANDA_PACKS_CASE },
{"client_ICE_pack", _T("|*miranda*[ice*]|*induction*"), _T("iCE / Induction"), _T("ClientIcons_packs"), IDI_MIRANDA_INDUCTION, MIRANDA_PACKS_CASE },
- {"client_KDL_pack", _T("|*KDL*|*КДЛ*"), _T("KDL"), _T("ClientIcons_packs"), IDI_MIRANDA_KDL, MIRANDA_PACKS_CASE },
- {"client_Kolich_pack", _T("*Kolich*"), _T("Kolich"), _T("ClientIcons_packs"), IDI_MIRANDA_KOLICH, MIRANDA_PACKS_CASE },
- {"client_Kuzzman_pack", _T("*kuzzman*"), _T("Kuzzman"), _T("ClientIcons_packs"), IDI_MIRANDA_KUZZMAN, MIRANDA_PACKS_CASE },
- {"client_Lenin_pack", _T("*[Lenin*]*"), _T("Lenin pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LENINPACK, MIRANDA_PACKS_CASE },
- {"client_Lestat_pack", _T("*[Lpack*]*"), _T("Lestat pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LESTAT, MIRANDA_PACKS_CASE },
- {"client_LexSys_pack", _T("|*Miranda*LS*|*LexSys*"), _T("LexSys"), _T("ClientIcons_packs"), IDI_MIRANDA_LEXSYS, MIRANDA_PACKS_CASE },
- {"client_MD_pack", _T("*MDpack*"), _T("MDpack"), _T("ClientIcons_packs"), IDI_MIRANDA_MD, MIRANDA_PACKS_CASE },
- {"client_Mataes_pack", _T("*Mataes*"), _T("Mataes pack"), _T("ClientIcons_packs"), IDI_MIRANDA_MATAES, MIRANDA_PACKS_CASE },
- {"client_Mir_ME_pack", _T("*[Miranda*ME]*"), _T("Miranda ME"), _T("ClientIcons_packs"), IDI_MIRANDA_ME, MIRANDA_PACKS_CASE },
- {"client_Native_pack", _T("*Native*"), _T("Native"), _T("ClientIcons_packs"), IDI_MIRANDA_NATIVE, MIRANDA_PACKS_CASE },
- {"client_New_Style_pack", _T("*New*Style*"), _T("New Style"), _T("ClientIcons_packs"), IDI_MIRANDA_NEW_STYLE, MIRANDA_PACKS_CASE },
- {"client_Pilot_pack", _T("*Pilot*"), _T("Pilot"), _T("ClientIcons_packs"), IDI_MIRANDA_PILOT, MIRANDA_PACKS_CASE },
- {"client_Razunter_pack", _T("*Razunter*"), _T("Razunter's Pk"), _T("ClientIcons_packs"), IDI_MIRANDA_RAZUNTER, MIRANDA_PACKS_CASE },
- {"client_Robyer_pack", _T("*Robyer*Pack*"), _T("Robyer pack"), _T("ClientIcons_packs"), IDI_MIRANDA_ROBYER, MIRANDA_PACKS_CASE },
- {"client_SSS_pack", _T("*sss*pack*"), _T("SSS build"), _T("ClientIcons_packs"), IDI_MIRANDA_SSS_MOD, MIRANDA_PACKS_CASE },
- {"client_Se7ven_pack", _T("|^*sss*|*[S7*pack]*|*[*S7*]*"), _T("Se7ven"), _T("ClientIcons_packs"), IDI_MIRANDA_SE7VEN, MIRANDA_PACKS_CASE },
- {"client_SpellhowleR_pack", _T("*Spellhowler*"), _T("xSpellhowleRx pack"), _T("ClientIcons_packs"), IDI_MIRANDA_SPELLHOWLER,MIRANDA_PACKS_CASE },
- {"client_Stalker_pack", _T("*Stalker*"), _T("Stalker"), _T("ClientIcons_packs"), IDI_MIRANDA_STALKER, MIRANDA_PACKS_CASE },
- {"client_Tweety_pack", _T("*tweety*"), _T("Tweety"), _T("ClientIcons_packs"), IDI_MIRANDA_TWEETY, MIRANDA_PACKS_CASE },
- {"client_Umedon_pack", _T("*Miranda*Umedon*"), _T("Umedon"), _T("ClientIcons_packs"), IDI_MIRANDA_UMEDON, MIRANDA_PACKS_CASE },
- {"client_ValeraVi_pack", _T("*Valera*Vi*"), _T("ValeraVi"), _T("ClientIcons_packs"), IDI_MIRANDA_VALERAVI, MIRANDA_PACKS_CASE },
- {"client_Watcher_pack", _T("*Watcher*"), _T("Watcher pack"), _T("ClientIcons_packs"), IDI_MIRANDA_WATCHER, MIRANDA_PACKS_CASE },
- {"client_YAOL_pack", _T("*yaol*"), _T("YAOL"), _T("ClientIcons_packs"), IDI_MIRANDA_YAOL, MIRANDA_PACKS_CASE },
- {"client_dar_veter_pack", _T("*Dar*veter*"), _T("Dar_veter pack"), _T("ClientIcons_packs"), IDI_MIRANDA_DAR, MIRANDA_PACKS_CASE },
- {"client_dmikos_pack", _T("*dmikos*"), _T("Dmikos"), _T("ClientIcons_packs"), IDI_MIRANDA_DMIKOS, MIRANDA_PACKS_CASE },
- {"client_zeleboba_pack", _T("*zeleboba*"), _T("zeleboba's"), _T("ClientIcons_packs"), IDI_MIRANDA_ZELEBOBA, MIRANDA_PACKS_CASE },
+ {"client_KDL_pack", _T("|*KDL*|*КДЛ*"), _T("KDL"), _T("ClientIcons_packs"), IDI_MIRANDA_KDL, MIRANDA_PACKS_CASE },
+ {"client_Kolich_pack", _T("*Kolich*"), _T("Kolich"), _T("ClientIcons_packs"), IDI_MIRANDA_KOLICH, MIRANDA_PACKS_CASE },
+ {"client_Kuzzman_pack", _T("*kuzzman*"), _T("Kuzzman"), _T("ClientIcons_packs"), IDI_MIRANDA_KUZZMAN, MIRANDA_PACKS_CASE },
+ {"client_Lenin_pack", _T("*[Lenin*]*"), _T("Lenin pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LENINPACK, MIRANDA_PACKS_CASE },
+ {"client_Lestat_pack", _T("*[Lpack*]*"), _T("Lestat pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LESTAT, MIRANDA_PACKS_CASE },
+ {"client_LexSys_pack", _T("|*Miranda*LS*|*LexSys*"), _T("LexSys"), _T("ClientIcons_packs"), IDI_MIRANDA_LEXSYS, MIRANDA_PACKS_CASE },
+ {"client_MD_pack", _T("*MDpack*"), _T("MDpack"), _T("ClientIcons_packs"), IDI_MIRANDA_MD, MIRANDA_PACKS_CASE },
+ {"client_Mataes_pack", _T("*Mataes*"), _T("Mataes pack"), _T("ClientIcons_packs"), IDI_MIRANDA_MATAES, MIRANDA_PACKS_CASE },
+ {"client_Mir_ME_pack", _T("*[Miranda*ME]*"), _T("Miranda ME"), _T("ClientIcons_packs"), IDI_MIRANDA_ME, MIRANDA_PACKS_CASE },
+ {"client_Native_pack", _T("*Native*"), _T("Native"), _T("ClientIcons_packs"), IDI_MIRANDA_NATIVE, MIRANDA_PACKS_CASE },
+ {"client_New_Style_pack", _T("*New*Style*"), _T("New Style"), _T("ClientIcons_packs"), IDI_MIRANDA_NEW_STYLE, MIRANDA_PACKS_CASE },
+ {"client_Pilot_pack", _T("*Pilot*"), _T("Pilot"), _T("ClientIcons_packs"), IDI_MIRANDA_PILOT, MIRANDA_PACKS_CASE },
+ {"client_Razunter_pack", _T("*Razunter*"), _T("Razunter's Pk"), _T("ClientIcons_packs"), IDI_MIRANDA_RAZUNTER, MIRANDA_PACKS_CASE },
+ {"client_Robyer_pack", _T("*Robyer*Pack*"), _T("Robyer pack"), _T("ClientIcons_packs"), IDI_MIRANDA_ROBYER, MIRANDA_PACKS_CASE },
+ {"client_SSS_pack", _T("*sss*pack*"), _T("SSS build"), _T("ClientIcons_packs"), IDI_MIRANDA_SSS_MOD, MIRANDA_PACKS_CASE },
+ {"client_Se7ven_pack", _T("|^*sss*|*[S7*pack]*|*[*S7*]*"), _T("Se7ven"), _T("ClientIcons_packs"), IDI_MIRANDA_SE7VEN, MIRANDA_PACKS_CASE },
+ {"client_SpellhowleR_pack", _T("*Spellhowler*"), _T("xSpellhowleRx pack"), _T("ClientIcons_packs"), IDI_MIRANDA_SPELLHOWLER,MIRANDA_PACKS_CASE },
+ {"client_Stalker_pack", _T("*Stalker*"), _T("Stalker"), _T("ClientIcons_packs"), IDI_MIRANDA_STALKER, MIRANDA_PACKS_CASE },
+ {"client_Tweety_pack", _T("*tweety*"), _T("Tweety"), _T("ClientIcons_packs"), IDI_MIRANDA_TWEETY, MIRANDA_PACKS_CASE },
+ {"client_Umedon_pack", _T("*Miranda*Umedon*"), _T("Umedon"), _T("ClientIcons_packs"), IDI_MIRANDA_UMEDON, MIRANDA_PACKS_CASE },
+ {"client_ValeraVi_pack", _T("*Valera*Vi*"), _T("ValeraVi"), _T("ClientIcons_packs"), IDI_MIRANDA_VALERAVI, MIRANDA_PACKS_CASE },
+ {"client_Watcher_pack", _T("*Watcher*"), _T("Watcher pack"), _T("ClientIcons_packs"), IDI_MIRANDA_WATCHER, MIRANDA_PACKS_CASE },
+ {"client_YAOL_pack", _T("*yaol*"), _T("YAOL"), _T("ClientIcons_packs"), IDI_MIRANDA_YAOL, MIRANDA_PACKS_CASE },
+ {"client_dar_veter_pack", _T("*Dar*veter*"), _T("Dar_veter pack"), _T("ClientIcons_packs"), IDI_MIRANDA_DAR, MIRANDA_PACKS_CASE },
+ {"client_dmikos_pack", _T("*dmikos*"), _T("Dmikos"), _T("ClientIcons_packs"), IDI_MIRANDA_DMIKOS, MIRANDA_PACKS_CASE },
+ {"client_zeleboba_pack", _T("*zeleboba*"), _T("zeleboba's"), _T("ClientIcons_packs"), IDI_MIRANDA_ZELEBOBA, MIRANDA_PACKS_CASE },
//###########################################################################################################################################################################################################
//################################# PROTO OVERLAYS #################################################################################################################################################
//###########################################################################################################################################################################################################
{"client_AIM_overlay", _T("|^AIM*|*AIM*"), _T("AIM overlay"), _T("ClientIcons_overlays"), IDI_AIM_OVERLAY, OVERLAYS_PROTO_CASE }, //FIX
- {"client_ICQJ_Plus_over", _T("|^ICQ*|*ICQ*Plus*"), _T("ICQJ Plus Mod overlay"), _T("ClientIcons_overlays"), IDI_ICQJ_PLUS_OVERLAY, OVERLAYS_PROTO_CASE },
- {"client_ICQJ_overlay", _T("|^ICQ*|*ICQ*"), _T("ICQJ overlay"), _T("ClientIcons_overlays"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE },
+ {"client_ICQJ_Plus_over", _T("|^ICQ|^ICQ*|*ICQ*Plus*"), _T("ICQJ Plus Mod overlay"), _T("ClientIcons_overlays"), IDI_ICQJ_PLUS_OVERLAY, OVERLAYS_PROTO_CASE },
+ {"client_ICQJ_overlay", _T("|^ICQ|^ICQ*|*ICQ*"), _T("ICQJ overlay"), _T("ClientIcons_overlays"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_IRC_overlay", _T("|^IRC*|Miranda*IRC*"), _T("IRC overlay"), _T("ClientIcons_overlays"), IDI_IRC_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_JGmail_overlay", _T("*JGmail*"), _T("JGmail overlay"), _T("ClientIcons_overlays"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_JGTalk_overlay", _T("*JGTalk*"), _T("JGTalk overlay"), _T("ClientIcons_overlays"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE },
@@ -679,6 +685,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = //###########################################################################################################################################################################################################
//################################# CLIENT VERSION OVERLAYS #########################################################################################################################################
//###########################################################################################################################################################################################################
+ {"client_ICQ5_over", _T("|ICQ*5*|icq5*"), _T("ICQ v5.x overlay"), _T("ClientIcons_ICQ"), IDI_ICQ5_OVERLAY, ICQ_CASE },
{"client_ICQ6_over", _T("ICQ*6*"), _T("ICQ v6.x overlay"), _T("ClientIcons_ICQ"), IDI_ICQ6_OVERLAY, ICQ_CASE },
{"client_ICQ7_over", _T("ICQ*7*"), _T("ICQ v7.x overlay"), _T("ClientIcons_ICQ"), IDI_ICQ7_OVERLAY, ICQ_CASE },
{"client_ICQ8_over", _T("ICQ*8*"), _T("ICQ v8.x overlay"), _T("ClientIcons_ICQ"), IDI_ICQ8_OVERLAY, ICQ_CASE },
@@ -736,7 +743,7 @@ 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
+{// 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 },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 76dff9ebea..42ff9e0b64 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -10,12 +10,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//Start of header
@@ -28,32 +28,32 @@ struct _settingsInfo }
static settings [] =
{
- {IDC_GROUP_MIRANDA, "GroupMiranda"},
- {IDC_GROUP_MIRANDA_VERSION, "GroupMirandaVersion"},
- {IDC_GROUP_MIRANDA_PACKS, "GroupMirandaPacks"},
+ {IDC_GROUP_MIRANDA, "GroupMiranda"},
+ {IDC_GROUP_MIRANDA_VERSION, "GroupMirandaVersion"},
+ {IDC_GROUP_MIRANDA_PACKS, "GroupMirandaPacks"},
- {IDC_GROUP_MULTI, "GroupMulti"},
- {IDC_GROUP_AIM, "GroupAIM"},
- {IDC_GROUP_GG, "GroupGG"},
- {IDC_GROUP_ICQ, "GroupICQ"},
- {IDC_GROUP_IRC, "GroupIRC"},
- {IDC_GROUP_JABBER, "GroupJabber"},
- {IDC_GROUP_MRA, "GroupMRA"},
- {IDC_GROUP_MSN, "GroupMSN"},
- {IDC_GROUP_QQ, "GroupQQ"},
- {IDC_GROUP_RSS, "GroupRSS"},
- {IDC_GROUP_TLEN, "GroupTlen"},
- {IDC_GROUP_WEATHER, "GroupWeather"},
- {IDC_GROUP_YAHOO, "GroupYahoo"},
+ {IDC_GROUP_MULTI, "GroupMulti"},
+ {IDC_GROUP_AIM, "GroupAIM"},
+ {IDC_GROUP_GG, "GroupGG"},
+ {IDC_GROUP_ICQ, "GroupICQ"},
+ {IDC_GROUP_IRC, "GroupIRC"},
+ {IDC_GROUP_JABBER, "GroupJabber"},
+ {IDC_GROUP_MRA, "GroupMRA"},
+ {IDC_GROUP_MSN, "GroupMSN"},
+ {IDC_GROUP_QQ, "GroupQQ"},
+ {IDC_GROUP_RSS, "GroupRSS"},
+ {IDC_GROUP_TLEN, "GroupTlen"},
+ {IDC_GROUP_WEATHER, "GroupWeather"},
+ {IDC_GROUP_YAHOO, "GroupYahoo"},
- {IDC_GROUP_OTHER_PROTOS, "GroupOtherProtos"},
- {IDC_GROUP_OTHERS, "GroupOthers"},
+ {IDC_GROUP_OTHER_PROTOS, "GroupOtherProtos"},
+ {IDC_GROUP_OTHERS, "GroupOthers"},
- {IDC_GROUP_OVERLAYS_RESOURCE, "GroupOverlaysResource"},
- {IDC_GROUP_OVERLAYS_PLATFORM, "GroupOverlaysPlatform"},
- {IDC_GROUP_OVERLAYS_PROTO, "GroupOverlaysProtos"},
- {IDC_GROUP_OVERLAYS_SECURITY, "GroupOtherProtos"},
-// {IDC_GROUP_OVERLAYS_RESOURCE_ALT, "GroupOverlays"},
+ {IDC_GROUP_OVERLAYS_RESOURCE, "GroupOverlaysResource"},
+ {IDC_GROUP_OVERLAYS_PLATFORM, "GroupOverlaysPlatform"},
+ {IDC_GROUP_OVERLAYS_PROTO, "GroupOverlaysProtos"},
+ {IDC_GROUP_OVERLAYS_SECURITY, "GroupOtherProtos"},
+// {IDC_GROUP_OVERLAYS_RESOURCE_ALT, "GroupOverlays"},
};
@@ -66,12 +66,12 @@ static void OptDlgChanged(HWND hwndDlg, BOOL show) static void LoadDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting, BYTE bDef)
{
- CheckDlgButton(hwndDlg, idCtrl, db_get_b(NULL, "Finger", szSetting, bDef));
+ CheckDlgButton(hwndDlg, idCtrl, db_get_b(NULL, "Finger", szSetting, bDef));
}
static void StoreDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting)
{
- db_set_b(NULL, "Finger", szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl));
+ db_set_b(NULL, "Finger", szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl));
}
static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -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, "ShowVersion") == 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 4c21c97cb7..c7cd30c177 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -130,6 +130,7 @@ //##############################################################################################################
//Official ICQ overlays
+#define IDI_ICQ5_OVERLAY 195
#define IDI_ICQ6_OVERLAY 196
#define IDI_ICQ7_OVERLAY 197
#define IDI_ICQ8_OVERLAY 198
@@ -213,6 +214,10 @@ #define IDI_XIRCON 357
#define IDI_ZSIRC 359
#define IDI_POCKET_IRC 360
+#define IDI_OPENFIRE 361
+#define IDI_IROFFER_DINOEX 362
+#define IDI_IROFFER 363
+#define IDI_ZNC 364
//##############################################################################################################
//Jabber clients
@@ -416,7 +421,8 @@ #define IDI_XMPP 606
#define IDI_YAMBI 607
#define IDI_YAONLINE 608
-#define IDI_YAXIM 609
+#define IDI_YAXIM 609
+#define IDI_OPENFIRE 610
//##############################################################################################################
//Mail.Ru Agent clients
@@ -587,7 +593,7 @@ #define IDI_JIMM 1043
#define IDI_JIMMY 1044
#define IDI_JIMM_ASPRO 1045
-#define IDI_KMESS 1046
+#define IDI_KMESS 1046
#define IDI_KOOLIM 1047
#define IDI_KOPETE 1048
#define IDI_LEECHCRAFT 1049
@@ -636,40 +642,40 @@ //##############################################################################################################
//resources
-#define IDD_DIALOG 10000
-
-#define IDC_GROUP_MIRANDA 10025
-#define IDC_GROUP_MIRANDA_VERSION 10026
-#define IDC_GROUP_MIRANDA_PACKS 10027
-
-#define IDC_GROUP_MULTI 10028
-#define IDC_GROUP_AIM 10029
-#define IDC_GROUP_GG 10030
-#define IDC_GROUP_ICQ 10032
-#define IDC_GROUP_IRC 10033
-#define IDC_GROUP_JABBER 10034
-#define IDC_GROUP_MSN 10035
-#define IDC_GROUP_MRA 10036
-#define IDC_GROUP_QQ 10037
-#define IDC_GROUP_RSS 10038
-#define IDC_GROUP_TLEN 10039
-#define IDC_GROUP_WEATHER 10040
-#define IDC_GROUP_YAHOO 10041
-
-#define IDC_GROUP_OTHER_PROTOS 10042
-#define IDC_GROUP_OTHERS 10043
-
-#define IDC_GROUP_OVERLAYS_RESOURCE 10044
-#define IDC_GROUP_OVERLAYS_PLATFORM 10045
-#define IDC_GROUP_OVERLAYS_PROTO 10046
-#define IDC_GROUP_OVERLAYS_SECURITY 10047
+#define IDD_DIALOG 10000
+
+#define IDC_GROUP_MIRANDA 10025
+#define IDC_GROUP_MIRANDA_VERSION 10026
+#define IDC_GROUP_MIRANDA_PACKS 10027
+
+#define IDC_GROUP_MULTI 10028
+#define IDC_GROUP_AIM 10029
+#define IDC_GROUP_GG 10030
+#define IDC_GROUP_ICQ 10032
+#define IDC_GROUP_IRC 10033
+#define IDC_GROUP_JABBER 10034
+#define IDC_GROUP_MSN 10035
+#define IDC_GROUP_MRA 10036
+#define IDC_GROUP_QQ 10037
+#define IDC_GROUP_RSS 10038
+#define IDC_GROUP_TLEN 10039
+#define IDC_GROUP_WEATHER 10040
+#define IDC_GROUP_YAHOO 10041
+
+#define IDC_GROUP_OTHER_PROTOS 10042
+#define IDC_GROUP_OTHERS 10043
+
+#define IDC_GROUP_OVERLAYS_RESOURCE 10044
+#define IDC_GROUP_OVERLAYS_PLATFORM 10045
+#define IDC_GROUP_OVERLAYS_PROTO 10046
+#define IDC_GROUP_OVERLAYS_SECURITY 10047
/*
#define IDC_GROUP_OVERLAYS_RESOURCE_ALT 10048
*/
-#define IDS_IDENTIFY 11001
-#define IDC_OPTCHANGENOTE 11002
+#define IDS_IDENTIFY 11001
+#define IDC_OPTCHANGENOTE 11002
//##############################################################################################################
@@ -677,9 +683,9 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 2000
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 7001
-#define _APS_NEXT_SYMED_VALUE 7000
+#define _APS_NEXT_RESOURCE_VALUE 2000
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 7001
+#define _APS_NEXT_SYMED_VALUE 7000
#endif
#endif
diff --git a/plugins/FingerprintNG/src/stdafx.cpp b/plugins/FingerprintNG/src/stdafx.cpp index b09d93b85a..9010924152 100644 --- a/plugins/FingerprintNG/src/stdafx.cpp +++ b/plugins/FingerprintNG/src/stdafx.cpp @@ -8,7 +8,7 @@ of the License. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/utilities.cpp b/plugins/FingerprintNG/src/utilities.cpp index 4b904c1b4d..bea14c0d6a 100644 --- a/plugins/FingerprintNG/src/utilities.cpp +++ b/plugins/FingerprintNG/src/utilities.cpp @@ -9,12 +9,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//Start of header
@@ -265,7 +265,7 @@ int utf8_decode_static(LPCSTR from, LPSTR to, int to_size) {
size_t chars = strlennull(from) + 1;
LPWSTR unicode = (LPWSTR)_alloca(chars * sizeof(WCHAR));
-
+
make_unicode_string_static(from, unicode, chars);
WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, unicode, -1, to, to_size, NULL, NULL);
diff --git a/plugins/FingerprintNG/src/utilities.h b/plugins/FingerprintNG/src/utilities.h index 21904ae85b..d603a29686 100644 --- a/plugins/FingerprintNG/src/utilities.h +++ b/plugins/FingerprintNG/src/utilities.h @@ -9,12 +9,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
static LRESULT ControlAddStringUtf(HWND ctrl, DWORD msg, const char* szString);
diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h index a2fb55ce70..6e8dbb8cd9 100644 --- a/plugins/FingerprintNG/src/version.h +++ b/plugins/FingerprintNG/src/version.h @@ -9,12 +9,12 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define __MAJOR_VERSION 0
@@ -22,24 +22,24 @@ 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_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 __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 __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 __LEGAL_COPYRIGHT_STRING "©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}}
+#define MIID_THIS_PLUGIN {0x687364af, 0x58b0, 0x4af2, { 0xa4, 0xee, 0x20, 0xf4, 0xa, 0x8d, 0x9a, 0xfb}}
|