duplicate popup icons moved into global skin

3 files changed, 4 insertions, 18 deletions

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 75e826a44e..8df3dd9aa7 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -905,18 +905,6 @@ static int TSAPI SetupIconLibConfig()
 	sid.description.a = LPGEN("Feature enabled (used as overlay)");

 	sid.iDefaultIndex = -IDI_FEATURE_ENABLED;

 	g_plugin.addIcon(&sid);

-

-	sid.section.a = LPGEN("Message Sessions") "/" LPGEN("Popups");

-	sid.pszName = "tabSRMM_popups_disabled";

-	sid.description.a = LPGEN("Enable typing notification");

-	sid.iDefaultIndex = -IDI_DISABLED;

-	g_plugin.addIcon(&sid);

-

-	sid.pszName = "tabSRMM_popups_enabled";

-	sid.description.a = LPGEN("Disable typing notification");

-	sid.iDefaultIndex = -IDI_ENABLED;

-	g_plugin.addIcon(&sid);

-

 	return 1;

 }

 

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 4cb7204346..3c1ca3f16e 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -525,8 +525,6 @@
 #define IDI_STOP1                       30161

 #define IDI_START2                      30162

 #define IDI_STOP2                       30163

-#define IDI_ENABLED                     30164

-#define IDI_DISABLED                    30165

 #define IDD_OPT                         30166

 #define IDC_START                       30167

 #define IDC_STOP                        30168

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 353d45f7cb..45a2105ab7 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -43,9 +43,9 @@ static INT_PTR EnableDisableMenuCommand(WPARAM, LPARAM)
 {

 	Disabled = !Disabled;

 	if (!Disabled)

-		Menu_ModifyItem(hDisableMenu, LPGENW("Disable &typing notification"), IcoLib_GetIcon("tabSRMM_popups_enabled"));

+		Menu_ModifyItem(hDisableMenu, LPGENW("Disable &typing notification"), Skin_LoadIcon(SKINICON_OTHER_POPUP));

 	else

-		Menu_ModifyItem(hDisableMenu, LPGENW("Enable &typing notification"), IcoLib_GetIcon("tabSRMM_popups_disabled"));

+		Menu_ModifyItem(hDisableMenu, LPGENW("Enable &typing notification"), Skin_LoadIcon(SKINICON_OTHER_NOPOPUP));

 

 	return 0;

 }

@@ -522,11 +522,11 @@ int TN_ModuleInit()
 		SET_UID(mi, 0xe18fd2cf, 0xcf90, 0x459e, 0xb6, 0xe6, 0x70, 0xec, 0xad, 0xc6, 0x73, 0xef);

 		if (!Disabled) {

 			mi.name.a = LPGEN("Disable &typing notification");

-			mi.hIcolibItem = IcoLib_GetIcon("tabSRMM_popups_enabled");

+			mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 		}

 		else {

 			mi.name.a = LPGEN("Enable &typing notification");

-			mi.hIcolibItem = IcoLib_GetIcon("tabSRMM_popups_disabled");

+			mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);

 		}

 		mi.pszService = "TypingNotify/EnableDisableMenuCommand";

 		mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 0);