From 03faabc4ee5eb6a9bfa5882f155cf3225128ca42 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 19 Jan 2014 15:49:47 +0000 Subject: chat log icons are back git-svn-id: http://svn.miranda-ng.org/main/trunk@7761 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/options.cpp | 22 +++++++++++----------- plugins/TabSRMM/src/chat/log.cpp | 21 +++++++++------------ plugins/TabSRMM/src/chat/muchighlight.cpp | 6 +++--- plugins/TabSRMM/src/chat/options.cpp | 16 ++++++++-------- plugins/TabSRMM/src/themes.cpp | 2 +- 5 files changed, 32 insertions(+), 35 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 565449481e..25db35293c 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -36,7 +36,7 @@ struct branch_t static struct branch_t branch1[] = { { LPGENT("Flash when someone speaks"), "FlashWindow", 0, 0, NULL }, - { LPGENT("Flash when a word is highlighted"), "bFlashWindowHighlight", 0, 1, NULL }, + { LPGENT("Flash when a word is highlighted"), "FlashWindowHighlight", 0, 1, NULL }, { LPGENT("Show chat user list"), "ShowNicklist", 0, 1, NULL }, { LPGENT("Enable button context menus"), "RightClickFilter", 0, 0, NULL }, { LPGENT("Show topic on your contact list (if supported)"), "TopicOnClist", 0, 0, NULL }, @@ -54,9 +54,9 @@ static struct branch_t branch2[] = { GC_EVENT_KICK | GC_EVENT_NOTICE | GC_EVENT_NICK | GC_EVENT_INFORMATION | GC_EVENT_ADDSTATUS, 0, NULL }, { LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0, 1, NULL }, { LPGENT("Only prefix with timestamp if it has changed"), "ShowTimeStampIfChanged", 0, 0, NULL }, - { LPGENT("Timestamp has same color as event"), "bTimeStampEventColour", 0, 0, NULL }, - { LPGENT("Indent the second line of a message"), "bLogIndentEnabled", 0, 1, NULL }, - { LPGENT("Limit user names to 20 characters"), "bLogLimitNames", 0, 1, NULL }, + { LPGENT("Timestamp has same color as event"), "TimeStampEventColour", 0, 0, NULL }, + { LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0, 1, NULL }, + { LPGENT("Limit user names to 20 characters"), "LogLimitNames", 0, 1, NULL }, { LPGENT("Strip colors from messages"), "StripFormatting", 0, 0, NULL }, { LPGENT("Enable \'event filter\' for new rooms"), "FilterEnabled", 0, 0, NULL } }; @@ -76,7 +76,7 @@ static struct branch_t branch3[] = { }; static struct branch_t branch4[] = { - { LPGENT("Show icons in tray only when the chat room is not active"), "bTrayIconInactiveOnly", 0, 1, NULL }, + { LPGENT("Show icons in tray only when the chat room is not active"), "TrayIconInactiveOnly", 0, 1, NULL }, { LPGENT("Show icon in tray for topic changes"), "TrayIconFlags", GC_EVENT_TOPIC, 0, NULL }, { LPGENT("Show icon in tray for users joining"), "TrayIconFlags", GC_EVENT_JOIN, 0, NULL }, { LPGENT("Show icon in tray for users disconnecting"), "TrayIconFlags", GC_EVENT_QUIT, 0, NULL }, @@ -365,7 +365,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa TCHAR tszTooltipText[2048]; RECT rect; - mir_sntprintf(tszTooltipText, SIZEOF(tszTooltipText), + mir_sntprintf(tszTooltipText, SIZEOF(tszTooltipText), _T("%s - %s\n%s - %s\n%s - %s\n\n") _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n") _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"), @@ -581,10 +581,10 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa else db_unset(NULL, "Chat", "HeaderOutgoing"); g_Settings.bHighlightEnabled = IsDlgButtonChecked(hwndDlg, IDC_CHAT_HIGHLIGHT) == BST_CHECKED ? TRUE : FALSE; - db_set_b(NULL, "Chat", "bHighlightEnabled", (BYTE)g_Settings.bHighlightEnabled); + db_set_b(NULL, "Chat", "HighlightEnabled", (BYTE)g_Settings.bHighlightEnabled); g_Settings.bLoggingEnabled = IsDlgButtonChecked(hwndDlg, IDC_CHAT_LOGGING) == BST_CHECKED ? TRUE : FALSE; - db_set_b(NULL, "Chat", "bLoggingEnabled", (BYTE)g_Settings.bLoggingEnabled); + db_set_b(NULL, "Chat", "LoggingEnabled", (BYTE)g_Settings.bLoggingEnabled); iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN2, UDM_GETPOS, 0, 0); db_set_w(NULL, "Chat", "LogLimit", (WORD)iLen); @@ -600,9 +600,9 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa g_Settings.dwTrayIconFlags = db_get_dw(NULL, "Chat", "TrayIconFlags", 0x1000); g_Settings.dwPopupFlags = db_get_dw(NULL, "Chat", "PopupFlags", 0x0000); g_Settings.bStripFormat = db_get_b(NULL, "Chat", "TrimFormatting", 0) != 0; - g_Settings.bTrayIconInactiveOnly = db_get_b(NULL, "Chat", "bTrayIconInactiveOnly", 1) != 0; + g_Settings.bTrayIconInactiveOnly = db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1) != 0; g_Settings.bPopupInactiveOnly = db_get_b(NULL, "Chat", "PopUpInactiveOnly", 1) != 0; - g_Settings.bLogIndentEnabled = (db_get_b(NULL, "Chat", "bLogIndentEnabled", 1) != 0) ? TRUE : FALSE; + g_Settings.bLogIndentEnabled = (db_get_b(NULL, "Chat", "LogIndentEnabled", 1) != 0) ? TRUE : FALSE; pci->MM_FontsChanged(); pci->SM_BroadcastMessage(NULL, GC_SETWNDPROPS, 0, 0, TRUE); @@ -621,7 +621,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa DestroyWindow(hPathTip); hPathTip = 0; } - + BYTE b = TreeView_GetItemState(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), hListHeading2, TVIS_EXPANDED)&TVIS_EXPANDED?1:0; db_set_b(NULL, "Chat", "Branch2Exp", b); b = TreeView_GetItemState(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), hListHeading3, TVIS_EXPANDED)&TVIS_EXPANDED?1:0; diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp index 8c32c07e32..45dd01be43 100644 --- a/plugins/TabSRMM/src/chat/log.cpp +++ b/plugins/TabSRMM/src/chat/log.cpp @@ -42,14 +42,11 @@ * the srmm module and then modified to fit the chat module. */ -static PBYTE pLogIconBmpBits[14]; -static int logIconBmpSize[ SIZEOF(pLogIconBmpBits)]; - -static int logPixelSY = 0; -static int logPixelSX = 0; -static char *szDivider = "\\strike----------------------------------------------------------------------------\\strike0"; -static char CHAT_rtfFontsGlobal[OPTIONS_FONTCOUNT + 2][RTFCACHELINESIZE]; -static char *CHAT_rtffonts = 0; +static int logPixelSY = 0; +static int logPixelSX = 0; +static char *szDivider = "\\strike----------------------------------------------------------------------------\\strike0"; +static char CHAT_rtfFontsGlobal[OPTIONS_FONTCOUNT + 2][RTFCACHELINESIZE]; +static char *CHAT_rtffonts = 0; /* * ieview MUC support - mostly from scriver @@ -864,11 +861,11 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData) else if (g_Settings.dwIconFlags) { int iIndex = lin->bIsHighlighted ? ICON_HIGHLIGHT : EventToIcon(lin); Log_Append(&buffer, &bufferEnd, &bufferAlloced, "\\f0\\fs14"); - while (bufferAlloced - bufferEnd < (logIconBmpSize[0] + 20)) + while (bufferAlloced - bufferEnd < (pci->logIconBmpSize[0] + 20)) bufferAlloced += 4096; buffer = (char *) mir_realloc(buffer, bufferAlloced); - CopyMemory(buffer + bufferEnd, pLogIconBmpBits[iIndex], logIconBmpSize[iIndex]); - bufferEnd += logIconBmpSize[iIndex]; + CopyMemory(buffer + bufferEnd, pci->pLogIconBmpBits[iIndex], pci->logIconBmpSize[iIndex]); + bufferEnd += pci->logIconBmpSize[iIndex]; } if (g_Settings.bTimeStampEventColour) { @@ -917,7 +914,7 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData) while (ui) { if (!lstrcmp(ui->pszNick, lin->ptszNick)) { STATUSINFO *ti = pci->TM_FindStatus(streamData->si->pStatuses, pci->TM_WordToString(streamData->si->pStatuses, ui->Status)); - if (ti && (UINT_PTR)ti->hIcon < streamData->si->iStatusCount) { + if (ti && (int)ti->hIcon < streamData->si->iStatusCount) { pszIndicator[0] = szIndicators[(int)ti->hIcon]; crNickIndex = streamData->si->iStatusCount - (int)ti->hIcon; // color table's index is not zero-based } diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp index f4690a4645..f2161f769d 100644 --- a/plugins/TabSRMM/src/chat/muchighlight.cpp +++ b/plugins/TabSRMM/src/chat/muchighlight.cpp @@ -62,7 +62,7 @@ void CMUCHighlight::init() if (0 == db_get_ts(0, "Chat", "HighlightNames", &dbv)) m_NickPatternString = dbv.ptszVal; - m_dwFlags = M.GetByte("Chat", "bHighlightEnabled", MATCH_TEXT); + m_dwFlags = M.GetByte("Chat", "HighlightEnabled", MATCH_TEXT); m_fHighlightMe = (M.GetByte("Chat", "HighlightMe", 1) ? true : false); __try { @@ -270,7 +270,7 @@ INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L ::db_free(&dbv); } - DWORD dwFlags = M.GetByte("Chat", "bHighlightEnabled", MATCH_TEXT); + DWORD dwFlags = M.GetByte("Chat", "HighlightEnabled", MATCH_TEXT); ::CheckDlgButton(hwndDlg, IDC_HIGHLIGHTNICKENABLE, dwFlags & MATCH_NICKNAME ? BST_CHECKED : BST_UNCHECKED); ::CheckDlgButton(hwndDlg, IDC_HIGHLIGHTNICKUID, dwFlags & MATCH_UIN ? BST_CHECKED : BST_UNCHECKED); @@ -335,7 +335,7 @@ INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L if (dwFlags & MATCH_NICKNAME) dwFlags |= (::IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHTNICKUID) ? MATCH_UIN : 0); - db_set_b(0, "Chat", "bHighlightEnabled", dwFlags); + db_set_b(0, "Chat", "HighlightEnabled", dwFlags); db_set_b(0, "Chat", "HighlightMe", ::IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHTME) ? 1 : 0); g_Settings.Highlight->init(); } diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 87d2f24f73..3527fd69ef 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -143,7 +143,7 @@ struct branch_t { static branch_t branch1[] = { { LPGENT("Open new chat rooms in the default container"), "DefaultContainer", 0, 1, NULL }, { LPGENT("Flash window when someone speaks"), "FlashWindow", 0, 0, NULL }, - { LPGENT("Flash window when a word is highlighted"), "bFlashWindowHighlight", 0, 1, NULL }, + { LPGENT("Flash window when a word is highlighted"), "FlashWindowHighlight", 0, 1, NULL }, { LPGENT("Create tabs or windows for highlight events"), "CreateWindowOnHighlight", 0, 0, NULL }, { LPGENT("Activate chat window on highlight"), "AnnoyingHighlight", 0, 0, NULL }, { LPGENT("Show list of users in the chat room"), "ShowNicklist", 0, 1, NULL }, @@ -162,9 +162,9 @@ static branch_t branch1[] = { static branch_t branch2[] = { { LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0, 1, NULL }, { LPGENT("Timestamp only when event time differs"), "ShowTimeStampIfChanged", 0, 0, NULL }, - { LPGENT("Timestamp has same color as the event"), "bTimeStampEventColour", 0, 0, NULL }, - { LPGENT("Indent the second line of a message"), "bLogIndentEnabled", 0, 1, NULL }, - { LPGENT("Limit user names in the message log to 20 characters"), "bLogLimitNames", 0, 1, NULL }, + { LPGENT("Timestamp has same color as the event"), "TimeStampEventColour", 0, 0, NULL }, + { LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0, 1, NULL }, + { LPGENT("Limit user names in the message log to 20 characters"), "LogLimitNames", 0, 1, NULL }, { LPGENT("Add a colon (:) to auto-completed user names"), "AddColonToAutoComplete", 0, 1, NULL }, { LPGENT("Start private conversation on doubleclick in nick list (insert nick if unchecked)"), "DoubleClick4Privat", 0, 0, NULL }, { LPGENT("Strip colors from messages in the log"), "StripFormatting", 0, 0, NULL }, @@ -926,11 +926,11 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM db_set_ts(NULL, "Chat", "LogDirectory", pszText1); mir_free(pszText1); g_Settings.bLoggingEnabled = IsDlgButtonChecked(hwndDlg, IDC_LOGGING) == BST_CHECKED; - db_set_b(0, "Chat", "bLoggingEnabled", g_Settings.bLoggingEnabled); + db_set_b(0, "Chat", "LoggingEnabled", g_Settings.bLoggingEnabled); } else { db_unset(NULL, "Chat", "LogDirectory"); - db_set_b(0, "Chat", "bLoggingEnabled", 0); + db_set_b(0, "Chat", "LoggingEnabled", 0); } pci->SM_InvalidateLogDirectories(); @@ -1063,7 +1063,7 @@ INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_SETCURSEL, (g_Settings.bLogSymbols ? 2 : (g_Settings.dwIconFlags ? 1 : 0)), 0); CheckDlgButton(hwndDlg, IDC_NOPOPUPSFORCLOSEDWINDOWS, M.GetByte("Chat", "SkipWhenNoWindow", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_TRAYONLYFORINACTIVE, M.GetByte("Chat", "bTrayIconInactiveOnly", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_TRAYONLYFORINACTIVE, M.GetByte("Chat", "TrayIconInactiveOnly", 0) ? BST_CHECKED : BST_UNCHECKED); break; case WM_COMMAND: @@ -1098,7 +1098,7 @@ INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM db_set_b(0, "Chat", "LogSymbols", lr == 2 ? 1 : 0); db_set_b(0, "Chat", "SkipWhenNoWindow", IsDlgButtonChecked(hwndDlg, IDC_NOPOPUPSFORCLOSEDWINDOWS) ? 1 : 0); - db_set_b(0, "Chat", "bTrayIconInactiveOnly", IsDlgButtonChecked(hwndDlg, IDC_TRAYONLYFORINACTIVE) ? 1 : 0); + db_set_b(0, "Chat", "TrayIconInactiveOnly", IsDlgButtonChecked(hwndDlg, IDC_TRAYONLYFORINACTIVE) ? 1 : 0); pci->ReloadSettings(); pci->MM_FontsChanged(); diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 04fda1e79e..bcda08d422 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1950,7 +1950,7 @@ void CSkin::SkinDrawBGFromDC(HWND hwndClient, HWND hwnd, RECT *rcClient, HDC hdc } /** - * draw an icon "bDimmed" (small amount of transparency applied) + * draw an icon "Dimmed" (small amount of transparency applied) */ void CSkin::DrawDimmedIcon(HDC hdc, LONG left, LONG top, LONG dx, LONG dy, HICON hIcon, BYTE alpha) -- cgit v1.2.3