From 8278b0f406d3e1f1d2d2938b0047f255fa0f2825 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 24 Jun 2013 09:52:51 +0000
Subject: automatic displaying custom events in tabSRMM according to their
 masks

git-svn-id: http://svn.miranda-ng.org/main/trunk@5111 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/eventpopups.cpp | 78 ++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 36 deletions(-)

(limited to 'plugins/TabSRMM/src/eventpopups.cpp')

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 68e8f0b421..8e81baebc5 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -510,35 +510,39 @@ static BOOL CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 * @return
 */
 
-static TCHAR *GetPreviewT(WORD eventType, DBEVENTINFO* dbe)
+static TCHAR *ShortenPreview(DBEVENTINFO* dbe)
 {
-	char	*pBlob = (char *)dbe->pBlob;
 	bool	fAddEllipsis = false;
-
 	int iPreviewLimit = nen_options.iLimitPreview;
 	if (iPreviewLimit > 500 || iPreviewLimit == 0)
 		iPreviewLimit = 500;
 
+	TCHAR* buf = DbGetEventTextT(dbe, CP_ACP);
+	if (lstrlen(buf) > iPreviewLimit) {
+		fAddEllipsis = true;
+		int iIndex = iPreviewLimit;
+		int iWordThreshold = 20;
+		while(iIndex && buf[iIndex] != ' ' && iWordThreshold--)
+			buf[iIndex--] = 0;
+
+		buf[iIndex] = 0;
+	}
+	if (fAddEllipsis) {
+		buf = (TCHAR *)mir_realloc(buf, (lstrlen(buf) + 5) * sizeof(TCHAR));
+		_tcscat(buf, _T("..."));
+	}
+	return buf;
+}
+
+static TCHAR *GetPreviewT(WORD eventType, DBEVENTINFO* dbe)
+{
+	char	*pBlob = (char *)dbe->pBlob;
+
 	switch (eventType) {
 	case EVENTTYPE_MESSAGE:
-		if (pBlob) {
-			if (nen_options.bPreview) {
-				TCHAR* buf = DbGetEventTextT(dbe, CP_ACP);
-				if (lstrlen(buf) > iPreviewLimit) {
-					fAddEllipsis = true;
-					int iIndex = iPreviewLimit;
-					int iWordThreshold = 20;
-					while(iIndex && buf[iIndex] != ' ' && iWordThreshold--) {
-						buf[iIndex--] = 0;
-					}
-					buf[iIndex] = 0;
-				}
-				buf = (TCHAR *)mir_realloc(buf, (lstrlen(buf) + 5) * sizeof(TCHAR));
-				if (fAddEllipsis)
-					_tcscat(buf, _T("..."));
-				return buf;
-			}
-		}
+		if (pBlob && nen_options.bPreview)
+			return ShortenPreview(dbe);
+
 		return mir_tstrdup( TranslateT("Message"));
 
 	case EVENTTYPE_FILE:
@@ -574,6 +578,9 @@ static TCHAR *GetPreviewT(WORD eventType, DBEVENTINFO* dbe)
 		return mir_tstrdup(TranslateT("Incoming file (invalid format"));
 
 	default:
+		if (nen_options.bPreview)
+			return ShortenPreview(dbe);
+
 		return mir_tstrdup(TranslateT("Unknown event"));
 	}
 }
@@ -656,6 +663,17 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent
 	if (!PluginConfig.g_PopupAvail)
 		return 0;
 
+	DBEVENTINFO dbe = { sizeof(dbe) };
+	// fix for a crash
+	if (hEvent && (pluginOptions->bPreview || hContact == 0)) {
+		dbe.cbBlob = db_event_getBlobSize(hEvent);
+		dbe.pBlob = (PBYTE)malloc(dbe.cbBlob);
+	}
+	db_event_get(hEvent, &dbe);
+
+	if (hEvent == 0 && hContact == 0)
+		dbe.szModule = Translate("Unknown module or contact");
+
 	POPUPDATAT pud = {0};
 	long iSeconds;
 	switch (eventType) {
@@ -665,27 +683,15 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent
 		pud.colorText = pluginOptions->bDefaultColorMsg ? 0 : pluginOptions->colTextMsg;
 		iSeconds = pluginOptions->iDelayMsg;
 		break;
-	case EVENTTYPE_FILE:
-		pud.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_FILE);
+
+	default:
+		pud.lchIcon = (HICON)CallService(MS_DB_EVENT_GETICON, LR_SHARED, (LPARAM)&dbe);
 		pud.colorBack = pluginOptions->bDefaultColorOthers ? 0 : pluginOptions->colBackOthers;
 		pud.colorText = pluginOptions->bDefaultColorOthers ? 0 : pluginOptions->colTextOthers;
 		iSeconds = pluginOptions->iDelayOthers;
 		break;
-	default:
-		return 1;
 	}
 
-	DBEVENTINFO dbe = { sizeof(dbe) };
-	// fix for a crash
-	if (hEvent && (pluginOptions->bPreview || hContact == 0)) {
-		dbe.cbBlob = db_event_getBlobSize(hEvent);
-		dbe.pBlob = (PBYTE)malloc(dbe.cbBlob);
-	}
-	db_event_get(hEvent, &dbe);
-
-	if (hEvent == 0 && hContact == 0)
-		dbe.szModule = Translate("Unknown module or contact");
-
 	PLUGIN_DATAT *pdata = (PLUGIN_DATAT *)mir_calloc(sizeof(PLUGIN_DATAT));
 	pdata->eventType = eventType;
 	pdata->hContact = hContact;
-- 
cgit v1.2.3