tabSRMM: get rid of green overlay icon completely

6 files changed, 3 insertions, 15 deletions

diff --git a/plugins/TabSRMM/res/overlay_enabled.ico b/plugins/TabSRMM/res/overlay_enabled.ico
deleted file mode 100644
index 430effe441..0000000000
--- a/plugins/TabSRMM/res/overlay_enabled.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 764e08982f..8574810ef4 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -755,9 +755,6 @@ END
 // remains consistent on all systems.

 IDI_FEATURE_DISABLED    ICON                    "overlay_disabled.ico"

 

-IDI_FEATURE_ENABLED     ICON                    "overlay_enabled.ico"

-

-

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp
index 1ac916f6cc..f30fe76c75 100644
--- a/plugins/TabSRMM/src/controls.cpp
+++ b/plugins/TabSRMM/src/controls.cpp
@@ -835,10 +835,7 @@ LONG_PTR CALLBACK CMsgDialog::StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM
 					if (hIcon) {

 						if (LOWORD(result) > 1) {				// we have a text

 							DrawIconEx(hdcMem, itemRect.left + 3, (height / 2 - 8) + itemRect.top, hIcon, 16, 16, 0, nullptr, DI_NORMAL);

-							if (dat) {

-								if (dat->m_bShowTyping == 2)

-									DrawIconEx(hdcMem, itemRect.left + 3, (height / 2 - 8) + itemRect.top, PluginConfig.g_iconOverlayEnabled, 16, 16, 0, nullptr, DI_NORMAL);

-							}

+

 							itemRect.left += 20;

 							CSkin::RenderText(hdcMem, hTheme, szText, &itemRect, DT_VCENTER | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX,

 								CSkin::m_glowSize, clr);

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 004377dfce..f60627770b 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -65,7 +65,7 @@ public:
 

 	HWND        g_hwndHotkeyHandler;

 	HICON       g_iconIn, g_iconOut, g_iconErr, g_iconContainer, g_iconStatus, g_iconSecure, g_iconStrong;

-	HICON       g_iconOverlayDisabled, g_iconOverlayEnabled, g_iconClock;

+	HICON       g_iconOverlayDisabled, g_iconClock;

 	HCURSOR     hCurSplitNS, hCurSplitWE, hCurSplitSW, hCurSplitWSE;

 	HBITMAP     g_hbmUnknown;

 	bool        g_SmileyAddAvail;

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index d2deeab39b..7816293863 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2575,7 +2575,7 @@ void CMsgDialog::UpdateFilterButton()
 {

 	CSuper::UpdateFilterButton();

 

-	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayDisabled : PluginConfig.g_iconOverlayEnabled), 0);

+	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayDisabled : 0), 0);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index f1390d3dac..7343237d28 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -553,11 +553,6 @@ static int TSAPI SetupIconLibConfig()
 	sid.description.a = LPGEN("Feature disabled (used as overlay)");

 	sid.iDefaultIndex = -IDI_FEATURE_DISABLED;

 	g_plugin.addIcon(&sid);

-

-	sid.pszName = "tabSRMM_overlay_enabled";

-	sid.description.a = LPGEN("Feature enabled (used as overlay)");

-	sid.iDefaultIndex = -IDI_FEATURE_ENABLED;

-	g_plugin.addIcon(&sid);

 	return 1;

 }

 

@@ -576,7 +571,6 @@ static int TSAPI LoadFromIconLib()
 

 	PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING] = PluginConfig.g_buttonBarIcons[12] = Skin_LoadIcon(SKINICON_OTHER_TYPING);

 

-	PluginConfig.g_iconOverlayEnabled = IcoLib_GetIcon("tabSRMM_overlay_enabled");

 	PluginConfig.g_iconOverlayDisabled = IcoLib_GetIcon("tabSRMM_overlay_disabled");

 

 	PluginConfig.g_iconClock = IcoLib_GetIcon("tabSRMM_clock_symbol");