From b06220b86dbfbe321fdf40332c707891fb30f128 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 25 Dec 2020 21:49:35 +0300 Subject: tabSRMM: rest of unused shit removed (main part of shit was removed in fixes #2215 (TabSRMM: destroy custom tray icon from its own NeN)) --- plugins/TabSRMM/src/controls.cpp | 2 -- plugins/TabSRMM/src/generic_msghandlers.cpp | 6 ------ plugins/TabSRMM/src/globals.h | 1 - plugins/TabSRMM/src/msgs.h | 6 ++---- 4 files changed, 2 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 9a9680c859..81700f6c2f 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -967,8 +967,6 @@ LONG_PTR CALLBACK CMsgDialog::StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM mir_snwprintf(wBuf, TranslateT("Sending typing notifications is %s."), mtnStatus ? TranslateT("enabled") : TranslateT("disabled")); } - else if (sid->dwId == MSG_ICON_SESSION) - wcsncpy_s(wBuf, TranslateT("Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior"), _TRUNCATE); } else if (sid->szTooltip.w) wcsncpy_s(wBuf, sid->szTooltip.w, _TRUNCATE); diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 5f4758b7e5..5175a533d3 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1229,9 +1229,6 @@ void CMsgDialog::DrawStatusIcons(HDC hDC, const RECT &rc, int gap) } else CSkin::DrawDimmedIcon(hDC, x, y, PluginConfig.m_smcxicon, PluginConfig.m_smcyicon, PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING], 50); } - else if (sid->dwId == MSG_ICON_SESSION) { - DrawIconEx(hDC, x, y, PluginConfig.g_sideBarIcons[0], PluginConfig.m_smcxicon, PluginConfig.m_smcyicon, 0, nullptr, DI_NORMAL); - } } else { HICON hIcon; @@ -1360,9 +1357,6 @@ int SI_InitStatusIcons() sid.dwId = MSG_ICON_UTN; Srmm_AddIcon(&sid, &g_plugin); - sid.dwId = MSG_ICON_SESSION; - Srmm_AddIcon(&sid, &g_plugin); - HookEvent(ME_MSG_ICONSCHANGED, OnSrmmIconChanged); return 0; } diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index 409e1891e8..d67332b217 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -74,7 +74,6 @@ public: HICON g_IconMsgEventBig, g_IconTypingEventBig; HMENU g_hMenuContext, g_hMenuContainer; HICON g_buttonBarIcons[NR_BUTTONBARICONS]; - HICON g_sideBarIcons[NR_SIDEBARICONS]; HANDLE g_buttonBarIconHandles[23]; // dynamic options, need reload when options change diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 15e2dc0b65..519d1b0e10 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -105,7 +105,6 @@ struct TitleBtn { #define NR_LOGICONS 7 #define NR_BUTTONBARICONS 37//MaD: 29 -#define NR_SIDEBARICONS 2 class CContactCache; class CMenuBar; @@ -1037,9 +1036,8 @@ struct SIDEBARITEM // encryption status bar indicator #define MSG_ICON_MODULE " TabSrmm" -#define MSG_ICON_SESSION 0 -#define MSG_ICON_UTN 1 -#define MSG_ICON_SOUND 2 +#define MSG_ICON_UTN 0 +#define MSG_ICON_SOUND 1 int SI_InitStatusIcons(); -- cgit v1.2.3