diff options
| -rw-r--r-- | include/m_message.h | 2 | ||||
| -rw-r--r-- | plugins/FingerprintNG/res/resource.rc | 115 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/finger_groups.h | 46 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/fingerprint.cpp | 55 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/global.h | 3 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/main.cpp | 40 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/options.cpp | 74 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/resource.h | 1301 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/commonheaders.h | 5 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/functions.h | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/modplus.cpp | 41 |
11 files changed, 786 insertions, 900 deletions
diff --git a/include/m_message.h b/include/m_message.h index 3dba79d16e..8dbb18d79e 100644 --- a/include/m_message.h +++ b/include/m_message.h @@ -131,6 +131,8 @@ typedef struct { #define MBF_DISABLED 0x01
#define MBF_HIDDEN 0x02
+/* State of icon with such flag will not be saved, and you must set it manually */
+#define MBF_OWNERSTATE 0x04
typedef struct {
int cbSize;
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc index 0674778240..e1a44e4e1c 100644 --- a/plugins/FingerprintNG/res/resource.rc +++ b/plugins/FingerprintNG/res/resource.rc @@ -13,18 +13,23 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
+// Russian (Russia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+
+/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
+
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-//##############################################################################################################
-//########################################### Other ############################################################
-//##############################################################################################################
- IDI_BLANK ICON "_blank.ico"
- IDI_NOTFOUND ICON "notfound.ico"
- IDI_UNDETECTED ICON "undetected.ico"
- IDI_UNKNOWN ICON "unknown.ico"
+IDI_BLANK ICON "_blank.ico"
+IDI_NOTFOUND ICON "notfound.ico"
+IDI_UNDETECTED ICON "undetected.ico"
+IDI_UNKNOWN ICON "unknown.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -34,22 +39,22 @@ 1 TEXTINCLUDE
BEGIN
- "..\\src\\resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
+ "#include ""afxres.h""\r\n"
+ "\0"
END
3 TEXTINCLUDE
BEGIN
- "\r\n"
- "\0"
+ "\r\n"
+ "\0"
END
-#endif // APSTUDIO_INVOKED
+#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -62,39 +67,33 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
-
- GROUPBOX "Fingerprint overlays icons", IDC_STATIC,15,15,290,60
-
- CONTROL "Miranda clients", IDC_GROUP_MIRANDA, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,30,140,10
- CONTROL "Miranda packs overlays", IDC_GROUP_MIRANDA_PACKS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,40,140,10
-// CONTROL "Use alternative (old style) overlays", IDC_GROUP_OVERLAYS_RESOURCE_ALT,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,20,50,140,10
- CONTROL "Show Miranda version at Overlay#2", IDC_GROUP_MIRANDA_VERSION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,60,140,10
-
- 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 "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
-
- CONTROL "AIM clients", IDC_GROUP_AIM, "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 "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
- CONTROL "RSS clients", IDC_GROUP_RSS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
- CONTROL "Tlen clients", IDC_GROUP_TLEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10
- CONTROL "Weather clients", IDC_GROUP_WEATHER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10
- CONTROL "Yahoo clients", IDC_GROUP_YAHOO, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,200,120,10
-
- 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
+ GROUPBOX "Fingerprint overlays icons",IDC_STATIC,15,15,290,60
+ CONTROL "Miranda clients",IDC_GROUP_MIRANDA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,30,140,10
+ CONTROL "Miranda packs overlays",IDC_GROUP_MIRANDA_PACKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,40,140,10
+ CONTROL "Show Miranda version at Overlay#2",IDC_GROUP_MIRANDA_VERSION,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,60,140,10
+ 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 "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
+ CONTROL "AIM clients",IDC_GROUP_AIM,"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 "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
+ CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
+ CONTROL "Tlen clients",IDC_GROUP_TLEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10
+ CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10
+ CONTROL "Yahoo clients",IDC_GROUP_YAHOO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,200,120,10
+ 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
+ CONTROL "Show client icon in status bar",IDC_STATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,220,226,10
END
@@ -106,15 +105,20 @@ END #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
- IDD_DIALOG, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 307
- TOPMARGIN, 7
- BOTTOMMARGIN, 233
- END
+ IDD_DIALOG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 307
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 249
+ END
END
-#endif // APSTUDIO_INVOKED
+#endif // APSTUDIO_INVOKED
+
+#endif // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -124,4 +128,5 @@ END /////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
\ No newline at end of file +#endif // not APSTUDIO_INVOKED
+
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index b55295a843..69f3aa8919 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -1,115 +1,115 @@ case MIRANDA_CASE:
- if ( db_get_b(NULL, "Finger", "GroupMiranda", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupMiranda", 1))
return LPGENT("Client icons")_T("/")LPGENT("Miranda clients");
break;
case MIRANDA_VERSION_CASE:
- if ( db_get_b(NULL, "Finger", "GroupMirandaVersion", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 1))
return LPGENT("Client icons")_T("/")LPGENT("Miranda clients");
break;
case MIRANDA_PACKS_CASE:
- if ( db_get_b(NULL, "Finger", "GroupMirandaPacks", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupMirandaPacks", 1))
return LPGENT("Client icons")_T("/")LPGENT("Miranda clients")_T("/")LPGENT("Pack overlays");
break;
case MULTI_CASE:
- if ( db_get_b(NULL, "Finger", "GroupMulti", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupMulti", 1))
return LPGENT("Client icons")_T("/")LPGENT("Multi-proto clients");
break;
case AIM_CASE:
- if ( db_get_b(NULL, "Finger", "GroupAIM", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupAIM", 1))
return LPGENT("Client icons")_T("/")LPGENT("AIM clients");
break;
case GG_CASE:
- if ( db_get_b(NULL, "Finger", "GroupGG", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupGG", 1))
return LPGENT("Client icons")_T("/")LPGENT("Gadu-Gadu clients");
break;
case ICQ_CASE:
- if ( db_get_b(NULL, "Finger", "GroupICQ", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupICQ", 1))
return LPGENT("Client icons")_T("/")LPGENT("ICQ clients");
break;
case IRC_CASE:
- if ( db_get_b(NULL, "Finger", "GroupIRC", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupIRC", 1))
return LPGENT("Client icons")_T("/")LPGENT("IRC clients");
break;
case JABBER_CASE:
- if ( db_get_b(NULL, "Finger", "GroupJabber", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupJabber", 1))
return LPGENT("Client icons")_T("/")LPGENT("Jabber clients");
break;
case MRA_CASE:
- if ( db_get_b(NULL, "Finger", "GroupMRA", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupMRA", 1))
return LPGENT("Client icons")_T("/")LPGENT("MRA clients");
break;
case MSN_CASE:
- if ( db_get_b(NULL, "Finger", "GroupMSN", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupMSN", 1))
return LPGENT("Client icons")_T("/")LPGENT("MSN clients");
break;
case QQ_CASE:
- if ( db_get_b(NULL, "Finger", "GroupQQ", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupQQ", 1))
return LPGENT("Client icons")_T("/")LPGENT("QQ clients");
break;
case RSS_CASE:
- if ( db_get_b(NULL, "Finger", "GroupRSS", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupRSS", 1))
return LPGENT("Client icons")_T("/")LPGENT("RSS clients");
break;
case TLEN_CASE:
- if ( db_get_b(NULL, "Finger", "GroupTlen", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupTlen", 1))
return LPGENT("Client icons")_T("/")LPGENT("Tlen clients");
break;
case WEATHER_CASE:
- if ( db_get_b(NULL, "Finger", "GroupWeather", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupWeather", 1))
return LPGENT("Client icons")_T("/")LPGENT("Weather clients");
break;
case YAHOO_CASE:
- if ( db_get_b(NULL, "Finger", "GroupYahoo", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupYahoo", 1))
return LPGENT("Client icons")_T("/")LPGENT("Yahoo clients");
break;
case OTHER_PROTOS_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOtherProtos", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOtherProtos", 1))
return LPGENT("Client icons")_T("/")LPGENT("Other protocols");
break;
case OTHERS_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOthers", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOthers", 1))
return LPGENT("Client icons")_T("/")LPGENT("Other icons");
break;
case OVERLAYS_RESOURCE_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOverlaysResource", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOverlaysResource", 1))
return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Resource");
break;
case OVERLAYS_PLATFORM_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOverlaysPlatform", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOverlaysPlatform", 1))
return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Platform");
break;
case OVERLAYS_UNICODE_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOverlaysUnicode", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1))
return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Platform");
break;
case OVERLAYS_SECURITY_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOverlaysSecurity", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOverlaysSecurity", 1))
return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Security");
break;
case OVERLAYS_PROTO_CASE:
- if ( db_get_b(NULL, "Finger", "GroupOverlaysProtos", 1))
+ if ( db_get_b(NULL, MODULENAME, "GroupOverlaysProtos", 1))
return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Protocol");
break;
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 6c502acfca..7395e4c33d 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -104,7 +104,7 @@ void RegisterIcons() for (i = 0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++)
Prepare(&def_kn_fp_overlays_mask[i], true);
- if ( db_get_b(NULL, "Finger", "GroupMirandaVersion", 0)) {
+ if ( db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 0)) {
for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)
Prepare(&def_kn_fp_overlays2_mask[i], true);
}
@@ -115,7 +115,7 @@ void RegisterIcons() Prepare(&def_kn_fp_overlays2_mask[i], false);
}
- if ( db_get_b(NULL, "Finger", "GroupOverlaysUnicode", 1)) {
+ if ( db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1)) {
for (i = 0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
Prepare(&def_kn_fp_overlays3_mask[i], true);
}
@@ -130,6 +130,37 @@ void RegisterIcons() Prepare(&def_kn_fp_overlays4_mask[i], true);
}
+static int OnSrmmWindowEvent(WPARAM wParam, LPARAM lParam)
+{
+ if ( !db_get_b(NULL, MODULENAME, "StatusBarIcon", 1))
+ return 0;
+
+ MessageWindowEventData *event = (MessageWindowEventData *)lParam;
+ if (event == NULL || event->cbSize < sizeof(MessageWindowEventData))
+ return 0;
+
+ if (event->uType == MSG_WINDOW_EVT_OPEN) {
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODULENAME;
+ sid.dwId = 1;
+ sid.flags = MBF_OWNERSTATE;
+ sid.szTooltip = LPGEN("Client icon");
+
+ char *szProto = GetContactProto(event->hContact);
+ if (szProto != NULL) {
+ mir_ptr<TCHAR> ptszMirVer( db_get_tsa(event->hContact, szProto, "MirVer"));
+ if ( lstrlen(ptszMirVer))
+ sid.hIcon = sid.hIconDisabled = (HICON)ServiceGetClientIconW((WPARAM)ptszMirVer, TRUE);
+ else
+ sid.flags |= MBF_HIDDEN;
+ }
+ else sid.flags |= MBF_HIDDEN;
+ CallService(MS_MSG_MODIFYICON, (WPARAM)event->hContact, (LPARAM)&sid);
+ }
+
+ return 0;
+}
+
/*
* OnModulesLoaded
* Hook necessary events here
@@ -142,14 +173,23 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) HookEvent(ME_SKIN2_ICONSCHANGED, OnIconsChanged);
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged);
HookEvent(ME_OPT_INITIALISE, OnOptInitialise);
+ HookEvent(ME_MSG_WINDOWEVENT, OnSrmmWindowEvent);
PathToAbsoluteT(DEFAULT_SKIN_FOLDER, g_szSkinLib);
RegisterIcons();
- hExtraIcon = ExtraIcon_Register("Client",LPGEN("Fingerprint"),"client_Miranda_Unknown",
+ hExtraIcon = ExtraIcon_Register("Client", LPGEN("Fingerprint"), "client_Miranda_Unknown",
OnExtraIconListRebuild,OnExtraImageApply,OnExtraIconClick);
+ if (db_get_b(NULL, MODULENAME, "StatusBarIcon", 1) && ServiceExists(MS_MSG_ADDICON)) {
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODULENAME;
+ sid.flags = MBF_OWNERSTATE | MBF_HIDDEN;
+ sid.dwId = 1;
+ CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
+ }
+
return 0;
}
@@ -812,15 +852,10 @@ HBITMAP __fastcall CreateBitmap32Point(int cx, int cy, LPVOID* bits) bmpi.bmiHeader.biWidth = cx;
bmpi.bmiHeader.biHeight = cy;
bmpi.bmiHeader.biPlanes = 1;
-// bmpi.bmiHeader.biCompression = BI_RGB;
bmpi.bmiHeader.biBitCount = 32;
+ DirectBitmap = CreateDIBSection(NULL, &bmpi, DIB_RGB_COLORS, &ptPixels, NULL, 0);
- DirectBitmap = CreateDIBSection(NULL,
- &bmpi,
- DIB_RGB_COLORS,
- &ptPixels,
- NULL, 0);
- GdiFlush();
+ GdiFlush();
if (ptPixels) memset(ptPixels, 0, cx * cy * 4);
if (bits != NULL) *bits = ptPixels;
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h index 5212741a27..acd086ae6f 100644 --- a/plugins/FingerprintNG/src/global.h +++ b/plugins/FingerprintNG/src/global.h @@ -52,6 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_protocols.h>
#include <m_userinfo.h>
#include <m_extraicons.h>
+#include <m_message.h>
#include <m_fingerprint.h>
@@ -123,6 +124,8 @@ typedef struct _foundInfo #define LIB_REG 2
#define LIB_USE 3
+#define MODULENAME "Finger"
+
#define DEFAULT_SKIN_FOLDER _T("Icons\\Fp_icons.dll")
void ClearFI();
diff --git a/plugins/FingerprintNG/src/main.cpp b/plugins/FingerprintNG/src/main.cpp index 0bf08fb1e6..3d62e30240 100644 --- a/plugins/FingerprintNG/src/main.cpp +++ b/plugins/FingerprintNG/src/main.cpp @@ -26,16 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HINSTANCE g_hInst;
int hLangpack;
-HANDLE hHeap = NULL;
+HANDLE hHeap = NULL;
-HANDLE compClientServA = NULL;
-HANDLE getClientIconA = NULL;
-
-HANDLE compClientServW = NULL;
-HANDLE getClientIconW = NULL;
-LPSTR g_szClientDescription = NULL;
-
-HANDLE hStaticHooks[1] = { NULL };
+LPSTR g_szClientDescription = NULL;
//End of header
@@ -67,11 +60,12 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda static int OnPreShutdown(WPARAM wParam, LPARAM lParam)
{
- DestroyServiceFunction(compClientServA);
- DestroyServiceFunction(getClientIconA);
- DestroyServiceFunction(compClientServW);
- DestroyServiceFunction(getClientIconW);
-
+ if (ServiceExists(MS_MSG_REMOVEICON)) { + StatusIconData sid = { sizeof(sid) }; + sid.szModule = MODULENAME; + CallService(MS_MSG_REMOVEICON, 0, (LPARAM)&sid); + } + return 0;
}
@@ -79,13 +73,13 @@ extern "C" int __declspec(dllexport) Load(void) {
mir_getLP(&pluginInfoEx);
- hStaticHooks[0] = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
+ HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);
- compClientServA = CreateServiceFunction(MS_FP_SAMECLIENTS, ServiceSameClientsA);
- getClientIconA = CreateServiceFunction(MS_FP_GETCLIENTICON, ServiceGetClientIconA);
-
- compClientServW = CreateServiceFunction(MS_FP_SAMECLIENTSW, ServiceSameClientsW);
- getClientIconW = CreateServiceFunction(MS_FP_GETCLIENTICONW, ServiceGetClientIconW);
+
+ CreateServiceFunction(MS_FP_SAMECLIENTS, ServiceSameClientsA);
+ CreateServiceFunction(MS_FP_GETCLIENTICON, ServiceGetClientIconA);
+ CreateServiceFunction(MS_FP_SAMECLIENTSW, ServiceSameClientsW);
+ CreateServiceFunction(MS_FP_GETCLIENTICONW, ServiceGetClientIconW);
return 0;
}
@@ -98,11 +92,5 @@ extern "C" int __declspec(dllexport) Unload() HeapDestroy(hHeap);
ClearFI();
-
- for (size_t i = 0; i < SIZEOF(hStaticHooks); i++)
- {
- UnhookEvent(hStaticHooks[i]);
- hStaticHooks[i] = NULL;
- }
return 0;
}
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 82caec4b3e..1a51e300b7 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -23,37 +23,38 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct
{
- int idCtrl;
+ int idCtrl, defValue;
LPCSTR szSetName;
}
static settings[] =
{
- {IDC_GROUP_MIRANDA, "GroupMiranda"},
- {IDC_GROUP_MIRANDA_VERSION, "GroupMirandaVersion"},
- {IDC_GROUP_MIRANDA_PACKS, "GroupMirandaPacks"},
+ {IDC_GROUP_MIRANDA, TRUE, "GroupMiranda"},
+ {IDC_GROUP_MIRANDA_VERSION, FALSE, "GroupMirandaVersion"},
+ {IDC_GROUP_MIRANDA_PACKS, TRUE, "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, TRUE, "GroupMulti"},
+ {IDC_GROUP_AIM, TRUE, "GroupAIM"},
+ {IDC_GROUP_GG, TRUE, "GroupGG"},
+ {IDC_GROUP_ICQ, TRUE, "GroupICQ"},
+ {IDC_GROUP_IRC, TRUE, "GroupIRC"},
+ {IDC_GROUP_JABBER, TRUE, "GroupJabber"},
+ {IDC_GROUP_MRA, TRUE, "GroupMRA"},
+ {IDC_GROUP_MSN, TRUE, "GroupMSN"},
+ {IDC_GROUP_QQ, TRUE, "GroupQQ"},
+ {IDC_GROUP_RSS, TRUE, "GroupRSS"},
+ {IDC_GROUP_TLEN, TRUE, "GroupTlen"},
+ {IDC_GROUP_WEATHER, TRUE, "GroupWeather"},
+ {IDC_GROUP_YAHOO, TRUE, "GroupYahoo"},
- {IDC_GROUP_OTHER_PROTOS, "GroupOtherProtos"},
- {IDC_GROUP_OTHERS, "GroupOthers"},
-
- {IDC_GROUP_OVERLAYS_RESOURCE, "GroupOverlaysResource"},
- {IDC_GROUP_OVERLAYS_PLATFORM, "GroupOverlaysPlatform"},
- {IDC_GROUP_OVERLAYS_UNICODE, "GroupOverlaysUnicode"},
- {IDC_GROUP_OVERLAYS_PROTO, "GroupOverlaysProtos"},
- {IDC_GROUP_OVERLAYS_SECURITY, "GroupOverlaysSecurity"}
+ {IDC_GROUP_OTHER_PROTOS, TRUE, "GroupOtherProtos"},
+ {IDC_GROUP_OTHERS, TRUE, "GroupOthers"},
+
+ {IDC_GROUP_OVERLAYS_RESOURCE, TRUE, "GroupOverlaysResource"},
+ {IDC_GROUP_OVERLAYS_PLATFORM, TRUE, "GroupOverlaysPlatform"},
+ {IDC_GROUP_OVERLAYS_UNICODE, TRUE, "GroupOverlaysUnicode"},
+ {IDC_GROUP_OVERLAYS_PROTO, TRUE, "GroupOverlaysProtos"},
+ {IDC_GROUP_OVERLAYS_SECURITY, TRUE, "GroupOverlaysSecurity"},
+ {IDC_STATUSBAR, TRUE, "StatusBarIcon"}
};
/*static void OptDlgChanged(HWND hwndDlg, BOOL show)
@@ -65,12 +66,12 @@ static settings[] = 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, MODULENAME, 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, MODULENAME, szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl));
}
static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -79,20 +80,13 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
{
- for (int i = 0; i < SIZEOF(settings); i++) {
- 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);
- }
-
- //ShowWindow(GetDlgItem(hwndDlg, IDC_OPTCHANGENOTE), SW_HIDE);
+ for (int i = 0; i < SIZEOF(settings); i++)
+ LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, settings[i].defValue);
}
break;
case WM_COMMAND:
switch(LOWORD(wParam)) {
-
case IDC_GROUP_MIRANDA:
case IDC_GROUP_MIRANDA_VERSION:
case IDC_GROUP_MIRANDA_PACKS:
@@ -118,11 +112,8 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP case IDC_GROUP_OVERLAYS_PROTO:
case IDC_GROUP_OVERLAYS_UNICODE:
case IDC_GROUP_OVERLAYS_SECURITY:
+ case IDC_STATUSBAR:
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
-
- default:
- return 0;
}
break;
@@ -145,8 +136,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP int OnOptInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { 0 };
- odp.cbSize = sizeof(odp);
+ OPTIONSDIALOGPAGE odp = { sizeof(odp) };
odp.hInstance = g_hInst;
odp.ptszGroup = LPGENT("Icons");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG);
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 41d88eb74d..203b76f31e 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -1,703 +1,614 @@ -#include "version.h"
-
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-//###############################################
-//Other icons
-#define IDI_BLANK 1
-#define IDI_NOTFOUND 2
-#define IDI_UNDETECTED 3
-#define IDI_UNKNOWN 4
-
-//###############################################
-//MirandaIM clients
-#define IDI_MIRANDA_NG 10
-#define IDI_MIRANDA_NG_STABLE 11
-#define IDI_MIRANDA_OLD 12
-#define IDI_MIRANDA_UNKNOWN 13
-
-#define IDI_MIRANDA_04XX 21
-#define IDI_MIRANDA_05XX 22
-#define IDI_MIRANDA_06XX 23
-#define IDI_MIRANDA_07XX 24
-#define IDI_MIRANDA_08XX 25
-#define IDI_MIRANDA_09XX 26
-#define IDI_MIRANDA_010X 27
-
-#define IDI_MIRANDA_IM_V4 31
-#define IDI_MIRANDA_IM_V5 32
-#define IDI_MIRANDA_IM_V6 33
-#define IDI_MIRANDA_IM_V7 34
-#define IDI_MIRANDA_IM_V8 35
-#define IDI_MIRANDA_IM_V9 36
-#define IDI_MIRANDA_IM_V10 37
-
-#define IDI_MIRANDA_NG_V1 41
-#define IDI_MIRANDA_NG_V2 42
-#define IDI_MIRANDA_NG_V3 43
-#define IDI_MIRANDA_NG_V4 44
-#define IDI_MIRANDA_NG_V5 45
-#define IDI_MIRANDA_NG_V6 46
-#define IDI_MIRANDA_NG_V7 47
-#define IDI_MIRANDA_NG_V8 48
-#define IDI_MIRANDA_NG_V9 49
-
-//###############################################
-//Jabber resource overlays
-#define IDI_DEBUG_OVERLAY 51
-#define IDI_HOME_OVERLAY 52
-#define IDI_MOBILE_OVERLAY 53
-#define IDI_NOTEBOOK_OVERLAY 54
-#define IDI_OFFICE_OVERLAY 55
-#define IDI_WORK_OVERLAY 56
-
-//###############################################
-//Platform
-#define IDI_PLATFORM_AMIGA 61
-#define IDI_PLATFORM_ANDROID 62
-#define IDI_PLATFORM_FLASH 63
-#define IDI_PLATFORM_IOS 64
-#define IDI_PLATFORM_JAVA 65
-#define IDI_PLATFORM_LINUX 66
-#define IDI_PLATFORM_MAC 67
-#define IDI_PLATFORM_SYMBIAN 68
-#define IDI_PLATFORM_WIN 69
-
-#define IDI_UNICODE_CLIENT 71
-#define IDI_PLATFORM_X32 72
-#define IDI_PLATFORM_X64 73
-
-//###############################################
-//Clients overlays
-#define IDI_AIM_OVERLAY 75
-#define IDI_GMAIL_OVERLAY 76
-#define IDI_ICQJ_OVERLAY 77
-#define IDI_ICQJ_PLUS_OVERLAY 78
-#define IDI_IRC_OVERLAY 79
-#define IDI_JABBER_OVERLAY 80
-#define IDI_JGTALK_OVERLAY 81
-#define IDI_MAILRU_OVERLAY 82
-#define IDI_MSN_OVERLAY 83
-#define IDI_QQ_OVERLAY 84
-#define IDI_TLEN_OVERLAY 85
-#define IDI_YAHOO_OVERLAY 86
-
-//###############################################
-//Security overlays
-#define IDI_SECUREIM_OVERLAY 91
-#define IDI_NEWGPG_OVERLAY 92
-#define IDI_MIROTR_OVERLAY 93
-
-//###############################################
-//Miranda packs
-#define IDI_MIRANDA_A0X 101
-#define IDI_MIRANDA_AF 102
-#define IDI_MIRANDA_ALFAMAR 103
-#define IDI_MIRANDA_AMATORY 104
-#define IDI_MIRANDA_BRI 105
-#define IDI_MIRANDA_CAPPUCCINO 106
-#define IDI_MIRANDA_DAR 107
-#define IDI_MIRANDA_DEVIL 108
-#define IDI_MIRANDA_DMIKOS 109
-#define IDI_MIRANDA_E33 110
-#define IDI_MIRANDA_FAITH 111
-#define IDI_MIRANDA_FINAL 112
-#define IDI_MIRANDA_FR 113
-#define IDI_MIRANDA_FREIZE 114
-#define IDI_MIRANDA_GHOST 115
-#define IDI_MIRANDA_HIEROS 116
-#define IDI_MIRANDA_INDUCTION 117
-#define IDI_MIRANDA_KDL 118
-#define IDI_MIRANDA_KOLICH 119
-#define IDI_MIRANDA_KUZZMAN 120
-#define IDI_MIRANDA_LENINPACK 121
-#define IDI_MIRANDA_LESTAT 122
-#define IDI_MIRANDA_LEXSYS 123
-#define IDI_MIRANDA_MATAES 124
-#define IDI_MIRANDA_MD 125
-#define IDI_MIRANDA_ME 126
-#define IDI_MIRANDA_NATIVE 127
-#define IDI_MIRANDA_NEW_STYLE 128
-#define IDI_MIRANDA_PILOT 129
-#define IDI_MIRANDA_RAZUNTER 130
-#define IDI_MIRANDA_ROBYER 131
-#define IDI_MIRANDA_SE7VEN 132
-#define IDI_MIRANDA_SPELLHOWLER 133
-#define IDI_MIRANDA_SSS_MOD 134
-#define IDI_MIRANDA_STALKER 135
-#define IDI_MIRANDA_TWEETY 136
-#define IDI_MIRANDA_UMEDON 137
-#define IDI_MIRANDA_VALERAVI 138
-#define IDI_MIRANDA_WATCHER 139
-#define IDI_MIRANDA_YAOL 140
-#define IDI_MIRANDA_ZELEBOBA 141
-
-//###############################################
-//Official ICQ clients
-#define IDI_ICQ 190
-
-//###############################################
-//Official ICQ overlays
-#define IDI_ICQ3_OVERLAY 193
-#define IDI_ICQ4_OVERLAY 194
-#define IDI_ICQ5_OVERLAY 195
-#define IDI_ICQ6_OVERLAY 196
-#define IDI_ICQ7_OVERLAY 197
-#define IDI_ICQ8_OVERLAY 198
-
-//###############################################
-//Unofficial ICQ clients
-#define IDI_ASIA 202
-#define IDI_DICHAT 203
-#define IDI_GNOMEICU 214
-#define IDI_ICY_JUICE 215
-#define IDI_LIBICQ2000 216
-#define IDI_LICQ 217
-#define IDI_LOCID 218
-#define IDI_QIP_2005 219
-#define IDI_RANDQ 220
-#define IDI_SMARTICQ 221
-#define IDI_SPAM 222
-#define IDI_STRICQ 223
-#define IDI_TICQ 234
-
-//###############################################
-//IRC
-#define IDI_IRC 300
-#define IDI_AMIRC 301
-#define IDI_AMULE 302
-#define IDI_BABBEL 303
-#define IDI_BERSIRC 304
-#define IDI_CBIRC 305
-#define IDI_CHATZILLA 306
-#define IDI_CONVERSATION 307
-#define IDI_DIRC 308
-#define IDI_EGGDROP 309
-#define IDI_EGGDROP_RACBOT 310
-#define IDI_EMULE 311
-#define IDI_EMULE_MORPHXT 312
-#define IDI_EMULE_NEO 313
-#define IDI_EMULE_PLUS 314
-#define IDI_EMULE_XTREME 315
-#define IDI_FCHAT 316
-#define IDI_GDPCHAT 317
-#define IDI_GOPOWERTOOLS 318
-#define IDI_HYDRA_IRC 319
-#define IDI_ICECHAT 320
-#define IDI_IRC_UNKNOWN 321
-#define IDI_IRCLE 322
-#define IDI_IRCXPRO 323
-#define IDI_JIRCII 324
-#define IDI_JMIRC 325
-#define IDI_KLIENT 326
-#define IDI_KONVERSATION 327
-#define IDI_KSIRC 328
-#define IDI_KVIRC 329
-#define IDI_MIRC 330
-#define IDI_MP3_SCRIPT 331
-#define IDI_NEORATRION 332
-#define IDI_NETTALK 333
-#define IDI_NONAME_SCRIPT 334
-#define IDI_OPERA 335
-#define IDI_PIORUN 336
-#define IDI_PIRC 337
-#define IDI_PIRCH 338
-#define IDI_PJIRC 339
-#define IDI_PROCHAT 340
-#define IDI_PSYBNC 341
-#define IDI_SAVIRC 342
-#define IDI_SMART_IRC 343
-#define IDI_SNAK 344
-#define IDI_SYSRESET 345
-#define IDI_VIRCAIRC 346
-#define IDI_VISIONIRC 347
-#define IDI_VISUALIRC 348
-#define IDI_VORTECIRC 349
-#define IDI_WEECHAT 350
-#define IDI_WLIRC 351
-#define IDI_WMIRC 352
-#define IDI_XCHATAQUA 353
-#define IDI_XBITCH 354
-#define IDI_XCHAT 355
-#define IDI_XIRC 356
-#define IDI_XIRCON 357
-#define IDI_ZSIRC 359
-#define IDI_POCKET_IRC 360
-#define IDI_IROFFER_DINOEX 361
-#define IDI_IROFFER 362
-#define IDI_ZNC 363
-
-//###############################################
-//Jabber clients
-#define IDI_AKENI 400
-#define IDI_AMBROSIA 401
-#define IDI_ANDROID 402
-#define IDI_ANOTHRSSBOT 403
-#define IDI_AQQ 404
-#define IDI_BARNOWL 405
-#define IDI_BEEJIVE 406
-#define IDI_BEEM 407
-#define IDI_BELLSOUTH 408
-#define IDI_BITWISE 409
-#define IDI_BOMBUS 410
-#define IDI_BOMBUS_MOD 411
-#define IDI_BOMBUS_NG 412
-#define IDI_BOMBUS_QD 413
-#define IDI_BOWLINE 414
-#define IDI_BUDDYSPACE 415
-#define IDI_CANDY 416
-#define IDI_CARRIER 417
-#define IDI_CHATOPUS 418
-#define IDI_CHAT_BOT 419
-#define IDI_CHIKKA 420
-#define IDI_CHITCHAT 421
-#define IDI_CJC 422
-#define IDI_CLAROS_CHAT 423
-#define IDI_COCCINELLA 424
-#define IDI_COLIBRY 425
-#define IDI_COLLOQUY 426
-#define IDI_COMMUNIGATE 427
-#define IDI_CONFERENCE 428
-#define IDI_CROOM 429
-#define IDI_CROSSTALK 430
-#define IDI_CUDUMAR 431
-#define IDI_CYCLOPS_CHAT 432
-#define IDI_DESYR 433
-#define IDI_DZIOBBER 434
-#define IDI_EJABBERD 435
-#define IDI_ELMER 436
-#define IDI_EMACS 437
-#define IDI_EMESS 438
-#define IDI_EMITE 439
-#define IDI_EMPATHY 440
-#define IDI_EXODUS 441
-#define IDI_FIRE 443
-#define IDI_GABBER 444
-#define IDI_GAJIM 445
-#define IDI_GCN 446
-#define IDI_GIBBERBOT 447
-#define IDI_GLU 448
-#define IDI_GMAIL 449
-#define IDI_GNOME 450
-#define IDI_GOIM 452
-#define IDI_GOSSIP 453
-#define IDI_GOTALKMOBILE 454
-#define IDI_GREENTHUMB 455
-#define IDI_GTALK 456
-#define IDI_GTALK_GADGET 457
-#define IDI_GUSH 458
-#define IDI_GYABER 459
-#define IDI_IGOOGLE 460
-#define IDI_IJAB 461
-#define IDI_IMCOM 462
-#define IDI_IMEEM 463
-#define IDI_IMIFIED 464
-#define IDI_IMOV 465
-#define IDI_IMPORTAL 466
-#define IDI_IM_FRIENDLY 467
-#define IDI_INSTANT 468
-#define IDI_INTERACTION 469
-#define IDI_IRUKA 470
-#define IDI_J2J_TRANSPORT 471
-#define IDI_JABBA 472
-#define IDI_JABBER 473
-#define IDI_JABBER_DISK 474
-#define IDI_JABBERFOX 475
-#define IDI_JABBERNAUT 476
-#define IDI_JABBERWOCKY 477
-#define IDI_JABBERZILLA 478
-#define IDI_JABBER_APPLET 479
-#define IDI_JABBER_BEOS 480
-#define IDI_JABBER_MESSENGER 481
-#define IDI_JABBER_NET 482
-#define IDI_JABBIM 483
-#define IDI_JABBROID 484
-#define IDI_JABIRU 485
-#define IDI_JAJC 486
-#define IDI_JAMM 487
-#define IDI_JAPPIX 488
-#define IDI_JCLAIM 489
-#define IDI_JETI 490
-#define IDI_JITSI 491
-#define IDI_JMC 492
-#define IDI_JOOST 493
-#define IDI_JRUDEVELS 494
-#define IDI_JTALK 495
-#define IDI_JUICK 496
-#define IDI_JWCHAT 497
-#define IDI_JWGC 499
-#define IDI_KADU 500
-#define IDI_KF 501
-#define IDI_KONNEKT 502
-#define IDI_LAFFER 503
-#define IDI_LAMPIRO 504
-#define IDI_LAMP_IM 505
-#define IDI_LANDELL 506
-#define IDI_LEAF 507
-#define IDI_LINQ 508
-#define IDI_LLUNA 509
-#define IDI_M8JABBER 510
-#define IDI_MANGO 511
-#define IDI_MCABBER 512
-#define IDI_MEINVZ 513
-#define IDI_MERCURY_MESSENGER 514
-#define IDI_MGTALK 515
-#define IDI_MJABBER 516
-#define IDI_MOBBER 517
-#define IDI_MOJAB 518
-#define IDI_MOZILLACHAT 519
-#define IDI_MUCKL 520
-#define IDI_MYJABBER 521
-#define IDI_NEOS 522
-#define IDI_NITRO 523
-#define IDI_NOSTROMO 524
-#define IDI_OCTROTALK 525
-#define IDI_OM 526
-#define IDI_ONETEAM 527
-#define IDI_ORKUT 528
-#define IDI_PALTALK 529
-#define IDI_PANDION 530
-#define IDI_PAPLA 531
-#define IDI_PJC 532
-#define IDI_POEZIO 533
-#define IDI_PROSODY 534
-#define IDI_PSI 535
-#define IDI_PSIPLUS 536
-#define IDI_PSTO 537
-#define IDI_PSYC 538
-#define IDI_PYGEON 540
-#define IDI_QTJIM 546
-#define IDI_QUTECOM 547
-#define IDI_RENREN 548
-#define IDI_SAJE 549
-#define IDI_SAMEPLACE 550
-#define IDI_SAPO 551
-#define IDI_SBOT 552
-#define IDI_SCHULERVZ 553
-#define IDI_SIEJC 554
-#define IDI_SIP_COMM 555
-#define IDI_SKYMESSAGER 556
-#define IDI_SLICK 557
-#define IDI_SMACK 558
-#define IDI_SMTP_TRANSPORT 559
-#define IDI_SOAPBOX 560
-#define IDI_SPARK 561
-#define IDI_SPEAKALL 562
-#define IDI_SPEEQE 563
-#define IDI_SPIK 564
-#define IDI_STUDIVZ 565
-#define IDI_SWIFT 566
-#define IDI_SWORIM 567
-#define IDI_SYNAPSE 568
-#define IDI_TALKDROID 569
-#define IDI_TALKONAUT 570
-#define IDI_TAPIOCA 571
-#define IDI_TEABOT 572
-#define IDI_TELEPATHY 573
-#define IDI_THEBEE 574
-#define IDI_THUNDERBIRD 575
-#define IDI_TIGASE 576
-#define IDI_TIPICIM 577
-#define IDI_TKABBER 578
-#define IDI_TKCHAT 579
-#define IDI_TRANSACTIM 580
-#define IDI_TRANSLATE 581
-#define IDI_TRIPLE_SOFTWARE 582
-//#define IDI_UJABBER 584
-#define IDI_UKEEPER 585
-#define IDI_VACUUM 586
-#define IDI_VANDV 587
-#define IDI_VAYUSPHERE 588
-#define IDI_VBUZZER 589
-#define IDI_VIRTUS 590
-#define IDI_VK 591
-#define IDI_VYSPER 592
-#define IDI_WANNACHAT 593
-#define IDI_WEBEX 594
-#define IDI_WHISPERIM 595
-#define IDI_WHOISBOT 596
-#define IDI_WIJA 597
-#define IDI_WILDFIRE 598
-#define IDI_WINJAB 599
-#define IDI_WTW 600
-#define IDI_XABBER 601
-#define IDI_GABBLE 602
-#define IDI_XEUS 603
-#define IDI_XEUS2 604
-#define IDI_XIFFIAN 605
-#define IDI_XMPP 606
-#define IDI_YAMBI 607
-#define IDI_YAONLINE 608
-#define IDI_YAXIM 609
-#define IDI_OPENFIRE 610
-
-//###############################################
-//Mail.Ru Agent clients
-#define IDI_MAIL_RU_MOBILE 701
-#define IDI_MAIL_RU_OFFICIAL 702
-#define IDI_MAIL_RU_UNKNOWN 703
-#define IDI_MAIL_RU_WEBAGENT 704
-
-//###############################################
-//AIM
-#define IDI_AIM_6 714
-#define IDI_AIM_7 715
-#define IDI_AIM_MAC 716
-#define IDI_AIM_MOBILE 717
-#define IDI_AIM_TRITON 718
-#define IDI_MINIAIM 719
-#define IDI_NAIM 720
-#define IDI_TERRAIM 721
-
-//###############################################
-//Gadu-Gadu clients
-#define IDI_GG 724
-#define IDI_GG8_OVERLAY 725
-#define IDI_GG9_OVERLAY 726
-#define IDI_GG10_OVERLAY 727
-#define IDI_GG11_OVERLAY 728
-
-//###############################################
-//Tlen clients
-#define IDI_TLEN 731
-
-//###############################################
-//Tlen clients overlays
-#define IDI_TLEN5_OVERLAY 732
-#define IDI_TLEN6_OVERLAY 733
-#define IDI_TLEN7_OVERLAY 734
-#define IDI_TLEN8_OVERLAY 735
-
-//###############################################
-//MSN
-#define IDI_AMSN 741
-#define IDI_MSN_MAC 742
-#define IDI_MSN_45 743
-#define IDI_MSN_6 744
-#define IDI_MSN_7 745
-#define IDI_MSN_8 746
-#define IDI_MSN 747
-#define IDI_WEBMESSENGER 748
-#define IDI_WLM_9 749
-#define IDI_WLM_10 750
-
-//###############################################
-//RSS
-#define IDI_ATOM1 761
-#define IDI_ATOM3 762
-#define IDI_RSS09 763
-#define IDI_RSS1 764
-#define IDI_RSS2 765
-
-//###############################################
-//QQ clients
-#define IDI_MOBILEQQ 770
-#define IDI_QQ 771
-#define IDI_QQCONCEPT 772
-#define IDI_QQCRM 773
-#define IDI_QQINT 774
-#define IDI_QQSILVER 775
-#define IDI_TM 776
-#define IDI_TM2008 777
-#define IDI_WEBQQ 778
-#define IDI_YAMQQ 799
-
-//###############################################
-//QQ clients overlays
-#define IDI_QQ_2000_OVERLAY 780
-#define IDI_QQ_2001_OVERLAY 781
-#define IDI_QQ_2002_OVERLAY 782
-#define IDI_QQ_2003_OVERLAY 783
-#define IDI_QQ_2004_OVERLAY 784
-#define IDI_QQ_2005_OVERLAY 785
-#define IDI_QQ_2006_OVERLAY 786
-#define IDI_QQ_2007_OVERLAY 787
-#define IDI_QQ_2008_OVERLAY 788
-#define IDI_QQ_2009_OVERLAY 789
-#define IDI_QQ_2010_OVERLAY 790
-#define IDI_QQ_2011_OVERLAY 791
-#define IDI_QQ_2012_OVERLAY 792
-
-//###############################################
-//Weather clients
-#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
-
-//###############################################
-//Yahoo
-#define IDI_LIBYAHOO2 821
-#define IDI_YAHOO_PINGBOX 822
-#define IDI_YAHOO 823
-#define IDI_YAHOO_WEB 828
-#define IDI_YAHOO_GO_MOBILE 829
-
-//###############################################
-//Yahoo overlays
-#define IDI_YAHOO5_OVERLAY 831
-#define IDI_YAHOO6_OVERLAY 832
-#define IDI_YAHOO7_OVERLAY 833
-#define IDI_YAHOO8_OVERLAY 834
-#define IDI_YAHOO9_OVERLAY 835
-#define IDI_YAHOO10_OVERLAY 836
-#define IDI_YAHOO11_OVERLAY 837
-
-//###############################################
-//Multi-protocols clients
-#define IDI_ADIUM 1000
-#define IDI_AGILE 1001
-#define IDI_APPOLO 1002
-#define IDI_AYTTM 1003
-#define IDI_BAYANICQ 1004
-#define IDI_BIMOID 1005
-#define IDI_BITLBEE 1006
-#define IDI_BLACKBERRY 1007
-#define IDI_BUDDYCLOUD 1008
-#define IDI_CAUSERIE 1009
-#define IDI_1UND1 1010
-#define IDI_CENTERIM 1011
-#define IDI_CHATSECURE 1012
-#define IDI_CITRON 1013
-#define IDI_CLIMM 1014
-#define IDI_DIGSBY 1015
-#define IDI_EASYMESSAGE 1016
-#define IDI_EBUDDY 1017
-#define IDI_EKG2 1018
-#define IDI_EMESENE 1019
-#define IDI_EM_CLIENT 1020
-#define IDI_EQO 1021
-#define IDI_EYEBALL_CHAT 1022
-#define IDI_FAMAIM 1023
-#define IDI_FRING 1024
-#define IDI_GAIM 1025
-#define IDI_GALAXIUM 1026
-#define IDI_GMX 1027
-#define IDI_ICALL 1028
-#define IDI_ICHAT 1029
-#define IDI_IM2 1030
-#define IDI_IMADERING 1031
-#define IDI_IMOIM 1032
-#define IDI_IMPLUS 1033
-#define IDI_IMVU 1034
-#define IDI_INLUX 1035
-#define IDI_INSTANTBIRD 1036
-#define IDI_IRSSI 1037
-#define IDI_JABBEAR 1038
-#define IDI_JABBIN 1039
-#define IDI_JASMINEIM 1040
-#define IDI_JBOTHER 1041
-#define IDI_JBUDDY 1042
-#define IDI_JIMM 1043
-#define IDI_JIMMY 1044
-#define IDI_JIMM_ASPRO 1045
-#define IDI_KMESS 1046
-#define IDI_KOOLIM 1047
-#define IDI_KOPETE 1048
-#define IDI_LEECHCRAFT 1049
-#define IDI_MCHAT 1050
-#define IDI_MDC 1051
-#define IDI_MEEBO 1052
-#define IDI_MEETRO 1053
-#define IDI_MONAL 1054
-#define IDI_NIMBUZZ 1055
-#define IDI_PALRINGO 1056
-#define IDI_PIDGIN 1057
-#define IDI_PIGEON 1058
-#define IDI_PLAYXPERT 1059
-#define IDI_PRELUDE 1060
-#define IDI_PROTEUS 1061
-#define IDI_PYTHON 1062
-#define IDI_QIP_2010 1063
-#define IDI_QIP_2012 1064
-#define IDI_QIP_ANDROID 1065
-#define IDI_QIP_INFIUM 1066
-#define IDI_QIP_JAVA 1067
-#define IDI_QIP_PDA 1068
-#define IDI_QIP_SYMBIAN 1069
-#define IDI_QIP_IOS 1070
-#define IDI_QNEXT 1071
-#define IDI_QUTIM 1072
-#define IDI_MQUTIM 1073
-#define IDI_SALUT_A_TOI 1074
-#define IDI_SHAIM 1075
-#define IDI_SIM 1076
-#define IDI_SIM_OLD 1077
-#define IDI_SREVIM 1078
-#define IDI_TRILLIAN 1079
-#define IDI_TRILLIAN_ANDROID 1080
-#define IDI_TRILLIAN_ASTRA 1081
-#define IDI_TRILLIAN_PRO 1082
-#define IDI_TUUKLE_CHAT 1083
-#define IDI_UIM 1084
-#define IDI_UTALK 1085
-#define IDI_WINDOWS_PHONE 1086
-#define IDI_WIPPIEN 1087
-#define IDI_YAMIGO 1088
-#define IDI_YEIGO 1089
-#define IDI_YOONO 1090
-#define IDI_GNUGADU 1091
-
-//###############################################
-//Other clients
-#define IDI_FACEBOOK 9001
-#define IDI_SKYPE 9002
-#define IDI_TWITTER 9003
-#define IDI_XFIRE 9004
-
-//###############################################
-//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 IDC_GROUP_OVERLAYS_UNICODE 10048
-
-
-//#define IDC_GROUP_OVERLAYS_RESOURCE_ALT 10048
-
-//###############################################
+// Used by c:\Temp\MirandaNG\plugins\FingerprintNG\res\resource.rc
+//
+#define __MAJOR_VERSION 0
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 0
+#define __MINOR_VERSION 1
+#define IDI_BLANK 1
+#define IDI_NOTFOUND 2
+#define IDI_UNDETECTED 3
+#define IDI_UNKNOWN 4
+#define IDI_MIRANDA_NG 10
+#define IDI_MIRANDA_NG_STABLE 11
+#define IDI_MIRANDA_OLD 12
+#define IDI_MIRANDA_UNKNOWN 13
+#define IDI_MIRANDA_04XX 21
+#define IDI_MIRANDA_05XX 22
+#define IDI_MIRANDA_06XX 23
+#define IDI_MIRANDA_07XX 24
+#define IDI_MIRANDA_08XX 25
+#define IDI_MIRANDA_09XX 26
+#define IDI_MIRANDA_010X 27
+#define IDI_MIRANDA_IM_V4 31
+#define IDI_MIRANDA_IM_V5 32
+#define IDI_MIRANDA_IM_V6 33
+#define IDI_MIRANDA_IM_V7 34
+#define IDI_MIRANDA_IM_V8 35
+#define IDI_MIRANDA_IM_V9 36
+#define IDI_MIRANDA_IM_V10 37
+#define IDI_MIRANDA_NG_V1 41
+#define IDI_MIRANDA_NG_V2 42
+#define IDI_MIRANDA_NG_V3 43
+#define IDI_MIRANDA_NG_V4 44
+#define IDI_MIRANDA_NG_V5 45
+#define IDI_MIRANDA_NG_V6 46
+#define IDI_MIRANDA_NG_V7 47
+#define IDI_MIRANDA_NG_V8 48
+#define IDI_MIRANDA_NG_V9 49
+#define IDI_DEBUG_OVERLAY 51
+#define IDI_HOME_OVERLAY 52
+#define IDI_MOBILE_OVERLAY 53
+#define IDI_NOTEBOOK_OVERLAY 54
+#define IDI_OFFICE_OVERLAY 55
+#define IDI_WORK_OVERLAY 56
+#define IDI_PLATFORM_AMIGA 61
+#define IDI_PLATFORM_ANDROID 62
+#define IDI_PLATFORM_FLASH 63
+#define IDI_PLATFORM_IOS 64
+#define IDI_PLATFORM_JAVA 65
+#define IDI_PLATFORM_LINUX 66
+#define IDI_PLATFORM_MAC 67
+#define IDI_PLATFORM_SYMBIAN 68
+#define IDI_PLATFORM_WIN 69
+#define IDI_UNICODE_CLIENT 71
+#define IDI_PLATFORM_X32 72
+#define IDI_PLATFORM_X64 73
+#define IDI_AIM_OVERLAY 75
+#define IDI_GMAIL_OVERLAY 76
+#define IDI_ICQJ_OVERLAY 77
+#define IDI_ICQJ_PLUS_OVERLAY 78
+#define IDI_IRC_OVERLAY 79
+#define IDI_JABBER_OVERLAY 80
+#define IDI_JGTALK_OVERLAY 81
+#define IDI_MAILRU_OVERLAY 82
+#define IDI_MSN_OVERLAY 83
+#define IDI_QQ_OVERLAY 84
+#define IDI_TLEN_OVERLAY 85
+#define IDI_YAHOO_OVERLAY 86
+#define IDI_SECUREIM_OVERLAY 91
+#define IDI_NEWGPG_OVERLAY 92
+#define IDI_MIROTR_OVERLAY 93
+#define IDI_MIRANDA_A0X 101
+#define IDI_MIRANDA_AF 102
+#define IDI_MIRANDA_ALFAMAR 103
+#define IDI_MIRANDA_AMATORY 104
+#define IDI_MIRANDA_BRI 105
+#define IDI_MIRANDA_CAPPUCCINO 106
+#define IDI_MIRANDA_DAR 107
+#define IDI_MIRANDA_DEVIL 108
+#define IDI_MIRANDA_DMIKOS 109
+#define IDI_MIRANDA_E33 110
+#define IDI_MIRANDA_FAITH 111
+#define IDI_MIRANDA_FINAL 112
+#define IDI_MIRANDA_FR 113
+#define IDI_MIRANDA_FREIZE 114
+#define IDI_MIRANDA_GHOST 115
+#define IDI_MIRANDA_HIEROS 116
+#define IDI_MIRANDA_INDUCTION 117
+#define IDI_MIRANDA_KDL 118
+#define IDI_MIRANDA_KOLICH 119
+#define IDI_MIRANDA_KUZZMAN 120
+#define IDI_MIRANDA_LENINPACK 121
+#define IDI_MIRANDA_LESTAT 122
+#define IDI_MIRANDA_LEXSYS 123
+#define IDI_MIRANDA_MATAES 124
+#define IDI_MIRANDA_MD 125
+#define IDI_MIRANDA_ME 126
+#define IDI_MIRANDA_NATIVE 127
+#define IDI_MIRANDA_NEW_STYLE 128
+#define IDI_MIRANDA_PILOT 129
+#define IDI_MIRANDA_RAZUNTER 130
+#define IDI_MIRANDA_ROBYER 131
+#define IDI_MIRANDA_SE7VEN 132
+#define IDI_MIRANDA_SPELLHOWLER 133
+#define IDI_MIRANDA_SSS_MOD 134
+#define IDI_MIRANDA_STALKER 135
+#define IDI_MIRANDA_TWEETY 136
+#define IDI_MIRANDA_UMEDON 137
+#define IDI_MIRANDA_VALERAVI 138
+#define IDI_MIRANDA_WATCHER 139
+#define IDI_MIRANDA_YAOL 140
+#define IDI_MIRANDA_ZELEBOBA 141
+#define IDI_ICQ 190
+#define IDI_ICQ3_OVERLAY 193
+#define IDI_ICQ4_OVERLAY 194
+#define IDI_ICQ5_OVERLAY 195
+#define IDI_ICQ6_OVERLAY 196
+#define IDI_ICQ7_OVERLAY 197
+#define IDI_ICQ8_OVERLAY 198
+#define IDI_ASIA 202
+#define IDI_DICHAT 203
+#define IDI_GNOMEICU 214
+#define IDI_ICY_JUICE 215
+#define IDI_LIBICQ2000 216
+#define IDI_LICQ 217
+#define IDI_LOCID 218
+#define IDI_QIP_2005 219
+#define IDI_RANDQ 220
+#define IDI_SMARTICQ 221
+#define IDI_SPAM 222
+#define IDI_STRICQ 223
+#define IDI_TICQ 234
+#define IDI_IRC 300
+#define IDI_AMIRC 301
+#define IDI_AMULE 302
+#define IDI_BABBEL 303
+#define IDI_BERSIRC 304
+#define IDI_CBIRC 305
+#define IDI_CHATZILLA 306
+#define IDI_CONVERSATION 307
+#define IDI_DIRC 308
+#define IDI_EGGDROP 309
+#define IDI_EGGDROP_RACBOT 310
+#define IDI_EMULE 311
+#define IDI_EMULE_MORPHXT 312
+#define IDI_EMULE_NEO 313
+#define IDI_EMULE_PLUS 314
+#define IDI_EMULE_XTREME 315
+#define IDI_FCHAT 316
+#define IDI_GDPCHAT 317
+#define IDI_GOPOWERTOOLS 318
+#define IDI_HYDRA_IRC 319
+#define IDI_ICECHAT 320
+#define IDI_IRC_UNKNOWN 321
+#define IDI_IRCLE 322
+#define IDI_IRCXPRO 323
+#define IDI_JIRCII 324
+#define IDI_JMIRC 325
+#define IDI_KLIENT 326
+#define IDI_KONVERSATION 327
+#define IDI_KSIRC 328
+#define IDI_KVIRC 329
+#define IDI_MIRC 330
+#define IDI_MP3_SCRIPT 331
+#define IDI_NEORATRION 332
+#define IDI_NETTALK 333
+#define IDI_NONAME_SCRIPT 334
+#define IDI_OPERA 335
+#define IDI_PIORUN 336
+#define IDI_PIRC 337
+#define IDI_PIRCH 338
+#define IDI_PJIRC 339
+#define IDI_PROCHAT 340
+#define IDI_PSYBNC 341
+#define IDI_SAVIRC 342
+#define IDI_SMART_IRC 343
+#define IDI_SNAK 344
+#define IDI_SYSRESET 345
+#define IDI_VIRCAIRC 346
+#define IDI_VISIONIRC 347
+#define IDI_VISUALIRC 348
+#define IDI_VORTECIRC 349
+#define IDI_WEECHAT 350
+#define IDI_WLIRC 351
+#define IDI_WMIRC 352
+#define IDI_XCHATAQUA 353
+#define IDI_XBITCH 354
+#define IDI_XCHAT 355
+#define IDI_XIRC 356
+#define IDI_XIRCON 357
+#define IDI_ZSIRC 359
+#define IDI_POCKET_IRC 360
+#define IDI_IROFFER_DINOEX 361
+#define IDI_IROFFER 362
+#define IDI_ZNC 363
+#define IDI_AKENI 400
+#define IDI_AMBROSIA 401
+#define IDI_ANDROID 402
+#define IDI_ANOTHRSSBOT 403
+#define IDI_AQQ 404
+#define IDI_BARNOWL 405
+#define IDI_BEEJIVE 406
+#define IDI_BEEM 407
+#define IDI_BELLSOUTH 408
+#define IDI_BITWISE 409
+#define IDI_BOMBUS 410
+#define IDI_BOMBUS_MOD 411
+#define IDI_BOMBUS_NG 412
+#define IDI_BOMBUS_QD 413
+#define IDI_BOWLINE 414
+#define IDI_BUDDYSPACE 415
+#define IDI_CANDY 416
+#define IDI_CARRIER 417
+#define IDI_CHATOPUS 418
+#define IDI_CHAT_BOT 419
+#define IDI_CHIKKA 420
+#define IDI_CHITCHAT 421
+#define IDI_CJC 422
+#define IDI_CLAROS_CHAT 423
+#define IDI_COCCINELLA 424
+#define IDI_COLIBRY 425
+#define IDI_COLLOQUY 426
+#define IDI_COMMUNIGATE 427
+#define IDI_CONFERENCE 428
+#define IDI_CROOM 429
+#define IDI_CROSSTALK 430
+#define IDI_CUDUMAR 431
+#define IDI_CYCLOPS_CHAT 432
+#define IDI_DESYR 433
+#define IDI_DZIOBBER 434
+#define IDI_EJABBERD 435
+#define IDI_ELMER 436
+#define IDI_EMACS 437
+#define IDI_EMESS 438
+#define IDI_EMITE 439
+#define IDI_EMPATHY 440
+#define IDI_EXODUS 441
+#define IDI_FIRE 443
+#define IDI_GABBER 444
+#define IDI_GAJIM 445
+#define IDI_GCN 446
+#define IDI_GIBBERBOT 447
+#define IDI_GLU 448
+#define IDI_GMAIL 449
+#define IDI_GNOME 450
+#define IDI_GOIM 452
+#define IDI_GOSSIP 453
+#define IDI_GOTALKMOBILE 454
+#define IDI_GREENTHUMB 455
+#define IDI_GTALK 456
+#define IDI_GTALK_GADGET 457
+#define IDI_GUSH 458
+#define IDI_GYABER 459
+#define IDI_IGOOGLE 460
+#define IDI_IJAB 461
+#define IDI_IMCOM 462
+#define IDI_IMEEM 463
+#define IDI_IMIFIED 464
+#define IDI_IMOV 465
+#define IDI_IMPORTAL 466
+#define IDI_IM_FRIENDLY 467
+#define IDI_INSTANT 468
+#define IDI_INTERACTION 469
+#define IDI_IRUKA 470
+#define IDI_J2J_TRANSPORT 471
+#define IDI_JABBA 472
+#define IDI_JABBER 473
+#define IDI_JABBER_DISK 474
+#define IDI_JABBERFOX 475
+#define IDI_JABBERNAUT 476
+#define IDI_JABBERWOCKY 477
+#define IDI_JABBERZILLA 478
+#define IDI_JABBER_APPLET 479
+#define IDI_JABBER_BEOS 480
+#define IDI_JABBER_MESSENGER 481
+#define IDI_JABBER_NET 482
+#define IDI_JABBIM 483
+#define IDI_JABBROID 484
+#define IDI_JABIRU 485
+#define IDI_JAJC 486
+#define IDI_JAMM 487
+#define IDI_JAPPIX 488
+#define IDI_JCLAIM 489
+#define IDI_JETI 490
+#define IDI_JITSI 491
+#define IDI_JMC 492
+#define IDI_JOOST 493
+#define IDI_JRUDEVELS 494
+#define IDI_JTALK 495
+#define IDI_JUICK 496
+#define IDI_JWCHAT 497
+#define IDI_JWGC 499
+#define IDI_KADU 500
+#define IDI_KF 501
+#define IDI_KONNEKT 502
+#define IDI_LAFFER 503
+#define IDI_LAMPIRO 504
+#define IDI_LAMP_IM 505
+#define IDI_LANDELL 506
+#define IDI_LEAF 507
+#define IDI_LINQ 508
+#define IDI_LLUNA 509
+#define IDI_M8JABBER 510
+#define IDI_MANGO 511
+#define IDI_MCABBER 512
+#define IDI_MEINVZ 513
+#define IDI_MERCURY_MESSENGER 514
+#define IDI_MGTALK 515
+#define IDI_MJABBER 516
+#define IDI_MOBBER 517
+#define IDI_MOJAB 518
+#define IDI_MOZILLACHAT 519
+#define IDI_MUCKL 520
+#define IDI_MYJABBER 521
+#define IDI_NEOS 522
+#define IDI_NITRO 523
+#define IDI_NOSTROMO 524
+#define IDI_OCTROTALK 525
+#define IDI_OM 526
+#define IDI_ONETEAM 527
+#define IDI_ORKUT 528
+#define IDI_PALTALK 529
+#define IDI_PANDION 530
+#define IDI_PAPLA 531
+#define IDI_PJC 532
+#define IDI_POEZIO 533
+#define IDI_PROSODY 534
+#define IDI_PSI 535
+#define IDI_PSIPLUS 536
+#define IDI_PSTO 537
+#define IDI_PSYC 538
+#define IDI_PYGEON 540
+#define IDI_QTJIM 546
+#define IDI_QUTECOM 547
+#define IDI_RENREN 548
+#define IDI_SAJE 549
+#define IDI_SAMEPLACE 550
+#define IDI_SAPO 551
+#define IDI_SBOT 552
+#define IDI_SCHULERVZ 553
+#define IDI_SIEJC 554
+#define IDI_SIP_COMM 555
+#define IDI_SKYMESSAGER 556
+#define IDI_SLICK 557
+#define IDI_SMACK 558
+#define IDI_SMTP_TRANSPORT 559
+#define IDI_SOAPBOX 560
+#define IDI_SPARK 561
+#define IDI_SPEAKALL 562
+#define IDI_SPEEQE 563
+#define IDI_SPIK 564
+#define IDI_STUDIVZ 565
+#define IDI_SWIFT 566
+#define IDI_SWORIM 567
+#define IDI_SYNAPSE 568
+#define IDI_TALKDROID 569
+#define IDI_TALKONAUT 570
+#define IDI_TAPIOCA 571
+#define IDI_TEABOT 572
+#define IDI_TELEPATHY 573
+#define IDI_THEBEE 574
+#define IDI_THUNDERBIRD 575
+#define IDI_TIGASE 576
+#define IDI_TIPICIM 577
+#define IDI_TKABBER 578
+#define IDI_TKCHAT 579
+#define IDI_TRANSACTIM 580
+#define IDI_TRANSLATE 581
+#define IDI_TRIPLE_SOFTWARE 582
+#define IDI_UKEEPER 585
+#define IDI_VACUUM 586
+#define IDI_VANDV 587
+#define IDI_VAYUSPHERE 588
+#define IDI_VBUZZER 589
+#define IDI_VIRTUS 590
+#define IDI_VK 591
+#define IDI_VYSPER 592
+#define IDI_WANNACHAT 593
+#define IDI_WEBEX 594
+#define IDI_WHISPERIM 595
+#define IDI_WHOISBOT 596
+#define IDI_WIJA 597
+#define IDI_WILDFIRE 598
+#define IDI_WINJAB 599
+#define IDI_WTW 600
+#define IDI_XABBER 601
+#define IDI_GABBLE 602
+#define IDI_XEUS 603
+#define IDI_XEUS2 604
+#define IDI_XIFFIAN 605
+#define IDI_XMPP 606
+#define IDI_YAMBI 607
+#define IDI_YAONLINE 608
+#define IDI_YAXIM 609
+#define IDI_OPENFIRE 610
+#define IDI_MAIL_RU_MOBILE 701
+#define IDI_MAIL_RU_OFFICIAL 702
+#define IDI_MAIL_RU_UNKNOWN 703
+#define IDI_MAIL_RU_WEBAGENT 704
+#define IDI_AIM_6 714
+#define IDI_AIM_7 715
+#define IDI_AIM_MAC 716
+#define IDI_AIM_MOBILE 717
+#define IDI_AIM_TRITON 718
+#define IDI_MINIAIM 719
+#define IDI_NAIM 720
+#define IDI_TERRAIM 721
+#define IDI_GG 724
+#define IDI_GG8_OVERLAY 725
+#define IDI_GG9_OVERLAY 726
+#define IDI_GG10_OVERLAY 727
+#define IDI_GG11_OVERLAY 728
+#define IDI_TLEN 731
+#define IDI_TLEN5_OVERLAY 732
+#define IDI_TLEN6_OVERLAY 733
+#define IDI_TLEN7_OVERLAY 734
+#define IDI_TLEN8_OVERLAY 735
+#define IDI_AMSN 741
+#define IDI_MSN_MAC 742
+#define IDI_MSN_45 743
+#define IDI_MSN_6 744
+#define IDI_MSN_7 745
+#define IDI_MSN_8 746
+#define IDI_MSN 747
+#define IDI_WEBMESSENGER 748
+#define IDI_WLM_9 749
+#define IDI_WLM_10 750
+#define IDI_ATOM1 761
+#define IDI_ATOM3 762
+#define IDI_RSS09 763
+#define IDI_RSS1 764
+#define IDI_RSS2 765
+#define IDI_MOBILEQQ 770
+#define IDI_QQ 771
+#define IDI_QQCONCEPT 772
+#define IDI_QQCRM 773
+#define IDI_QQINT 774
+#define IDI_QQSILVER 775
+#define IDI_TM 776
+#define IDI_TM2008 777
+#define IDI_WEBQQ 778
+#define IDI_QQ_2000_OVERLAY 780
+#define IDI_QQ_2001_OVERLAY 781
+#define IDI_QQ_2002_OVERLAY 782
+#define IDI_QQ_2003_OVERLAY 783
+#define IDI_QQ_2004_OVERLAY 784
+#define IDI_QQ_2005_OVERLAY 785
+#define IDI_QQ_2006_OVERLAY 786
+#define IDI_QQ_2007_OVERLAY 787
+#define IDI_QQ_2008_OVERLAY 788
+#define IDI_QQ_2009_OVERLAY 789
+#define IDI_QQ_2010_OVERLAY 790
+#define IDI_QQ_2011_OVERLAY 791
+#define IDI_QQ_2012_OVERLAY 792
+#define IDI_YAMQQ 799
+#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_LIBYAHOO2 821
+#define IDI_YAHOO_PINGBOX 822
+#define IDI_YAHOO 823
+#define IDI_YAHOO_WEB 828
+#define IDI_YAHOO_GO_MOBILE 829
+#define IDI_YAHOO5_OVERLAY 831
+#define IDI_YAHOO6_OVERLAY 832
+#define IDI_YAHOO7_OVERLAY 833
+#define IDI_YAHOO8_OVERLAY 834
+#define IDI_YAHOO9_OVERLAY 835
+#define IDI_YAHOO10_OVERLAY 836
+#define IDI_YAHOO11_OVERLAY 837
+#define IDI_ADIUM 1000
+#define IDI_AGILE 1001
+#define IDI_APPOLO 1002
+#define IDI_AYTTM 1003
+#define IDI_BAYANICQ 1004
+#define IDI_BIMOID 1005
+#define IDI_BITLBEE 1006
+#define IDI_BLACKBERRY 1007
+#define IDI_BUDDYCLOUD 1008
+#define IDI_CAUSERIE 1009
+#define IDI_1UND1 1010
+#define IDI_CENTERIM 1011
+#define IDI_CHATSECURE 1012
+#define IDI_CITRON 1013
+#define IDI_CLIMM 1014
+#define IDI_DIGSBY 1015
+#define IDI_EASYMESSAGE 1016
+#define IDI_EBUDDY 1017
+#define IDI_EKG2 1018
+#define IDI_EMESENE 1019
+#define IDI_EM_CLIENT 1020
+#define IDI_EQO 1021
+#define IDI_EYEBALL_CHAT 1022
+#define IDI_FAMAIM 1023
+#define IDI_FRING 1024
+#define IDI_GAIM 1025
+#define IDI_GALAXIUM 1026
+#define IDI_GMX 1027
+#define IDI_ICALL 1028
+#define IDI_ICHAT 1029
+#define IDI_IM2 1030
+#define IDI_IMADERING 1031
+#define IDI_IMOIM 1032
+#define IDI_IMPLUS 1033
+#define IDI_IMVU 1034
+#define IDI_INLUX 1035
+#define IDI_INSTANTBIRD 1036
+#define IDI_IRSSI 1037
+#define IDI_JABBEAR 1038
+#define IDI_JABBIN 1039
+#define IDI_JASMINEIM 1040
+#define IDI_JBOTHER 1041
+#define IDI_JBUDDY 1042
+#define IDI_JIMM 1043
+#define IDI_JIMMY 1044
+#define IDI_JIMM_ASPRO 1045
+#define IDI_KMESS 1046
+#define IDI_KOOLIM 1047
+#define IDI_KOPETE 1048
+#define IDI_LEECHCRAFT 1049
+#define IDI_MCHAT 1050
+#define IDI_MDC 1051
+#define IDI_MEEBO 1052
+#define IDI_MEETRO 1053
+#define IDI_MONAL 1054
+#define IDI_NIMBUZZ 1055
+#define IDI_PALRINGO 1056
+#define IDI_PIDGIN 1057
+#define IDI_PIGEON 1058
+#define IDI_PLAYXPERT 1059
+#define IDI_PRELUDE 1060
+#define IDI_PROTEUS 1061
+#define IDI_PYTHON 1062
+#define IDI_QIP_2010 1063
+#define IDI_QIP_2012 1064
+#define IDI_QIP_ANDROID 1065
+#define IDI_QIP_INFIUM 1066
+#define IDI_QIP_JAVA 1067
+#define IDI_QIP_PDA 1068
+#define IDI_QIP_SYMBIAN 1069
+#define IDI_QIP_IOS 1070
+#define IDI_QNEXT 1071
+#define IDI_QUTIM 1072
+#define IDI_MQUTIM 1073
+#define IDI_SALUT_A_TOI 1074
+#define IDI_SHAIM 1075
+#define IDI_SIM 1076
+#define IDI_SIM_OLD 1077
+#define IDI_SREVIM 1078
+#define IDI_TRILLIAN 1079
+#define IDI_TRILLIAN_ANDROID 1080
+#define IDI_TRILLIAN_ASTRA 1081
+#define IDI_TRILLIAN_PRO 1082
+#define IDI_TUUKLE_CHAT 1083
+#define IDI_UIM 1084
+#define IDI_UTALK 1085
+#define IDI_WINDOWS_PHONE 1086
+#define IDI_WIPPIEN 1087
+#define IDI_YAMIGO 1088
+#define IDI_YEIGO 1089
+#define IDI_YOONO 1090
+#define IDI_GNUGADU 1091
+#define IDC_CHECK1 7001
+#define IDC_STATUSBAR 7001
+#define IDI_FACEBOOK 9001
+#define IDI_SKYPE 9002
+#define IDI_TWITTER 9003
+#define IDI_XFIRE 9004
+#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_UNICODE 10048
// Next default values for new objects
-//
+//
#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 7002
+#define _APS_NEXT_SYMED_VALUE 7000
#endif
#endif
diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h index 8b2bdf2609..e1cf7c3a55 100644 --- a/plugins/TabSRMM/src/commonheaders.h +++ b/plugins/TabSRMM/src/commonheaders.h @@ -224,11 +224,6 @@ enum DWMWINDOWATTRIBUTE #define WM_DWMSENDICONICLIVEPREVIEWBITMAP 0x0326
#endif
-
-/* State of icon with such flag will not be saved, and you must set it manually */
-#define MBF_OWNERSTATE 0x04
-
-
#if !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)
#define _USE_32BIT_TIME_T
#else
diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h index d5746cca5a..fb6d9e9cd1 100644 --- a/plugins/TabSRMM/src/functions.h +++ b/plugins/TabSRMM/src/functions.h @@ -178,10 +178,6 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam); int TN_ModuleDeInit();
void TN_TypingMessage(HANDLE hContact, int iMode);
-// mod plus
-
-int ChangeClientIconInStatusBar(const TWindowData *dat);
-
// hotkeys
LRESULT ProcessHotkeysByMsgFilter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT_PTR ctrlId);
diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index bc8310eb7b..7288c5b986 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -49,24 +49,8 @@ int g_bStartup=0; BOOL g_bIMGtagButton;
-static char* getMirVer(HANDLE hContact)
+static TCHAR* getMenuEntry(int i)
{
- char *szProto = NULL;
- char *msg = NULL;
- DBVARIANT dbv = {0};
-
- szProto = GetContactProto(hContact);
- if ( !szProto )
- return (NULL);
-
- if ( !db_get_s(hContact, szProto, "MirVer", &dbv)) {
- msg=mir_strdup(dbv.pszVal);
- db_free(&dbv);
- }
- return (msg);
-}
-
-static TCHAR* getMenuEntry(int i) {
TCHAR *msg = NULL;
char MEntry[256] = {'\0'};
DBVARIANT dbv = {0};
@@ -79,29 +63,6 @@ static TCHAR* getMenuEntry(int i) { return (msg);
}
-int ChangeClientIconInStatusBar(const TWindowData *dat)
-{
- if (!ServiceExists(MS_FP_GETCLIENTICON))
- return(S_FALSE);
-
- char *msg = getMirVer(dat->hContact);
-
- if ( !msg )
- return (S_FALSE);
-
- StatusIconData sid = {0};
-
- sid.cbSize = sizeof(sid);
- sid.szModule = (char *)"tabmodplus";
- sid.hIcon = sid.hIconDisabled = dat->hClientIcon;
- sid.dwId = 1;
- sid.szTooltip = msg;
- sid.flags = MBF_OWNERSTATE;
- CallService(MS_MSG_MODIFYICON,(WPARAM)dat->hContact, (LPARAM)&sid);
- mir_free(msg);
- return (S_OK);
-}
-
static int RegisterCustomButton(WPARAM wParam,LPARAM lParam)
{
if ( ServiceExists(MS_BB_ADDBUTTON)) {
|