tabSRMM: useless array g_buttonBarIconHandles removed + some code cleaning

8 files changed, 43 insertions, 53 deletions

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 4a70352103..6e52d30c82 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -16,74 +16,74 @@ static int CB_InitDefaultButtons(WPARAM, LPARAM)
 
 	bbd.dwButtonID = IDC_NAME;
 	bbd.dwDefPos = 20;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[20];
+	bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);
 	bbd.pwszTooltip = LPGENW("Info button");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID | BBBF_NOREADONLY;
 	bbd.dwButtonID = IDC_SRMM_BOLD;
 	bbd.dwDefPos = 40;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[10];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_FONTBOLD);
 	bbd.pwszTooltip = LPGENW("Bold text");
 	g_plugin.addButton(&bbd);
 
 	bbd.dwButtonID = IDC_SRMM_ITALICS;
 	bbd.dwDefPos = 50;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[11];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_FONTITALIC);
 	bbd.pwszTooltip = LPGENW("Italic text");
 	g_plugin.addButton(&bbd);
 
 	bbd.dwButtonID = IDC_SRMM_UNDERLINE;
 	bbd.dwDefPos = 60;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[12];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_FONTUNDERLINE);
 	bbd.pwszTooltip = LPGENW("Underlined text");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID | BBBF_NOREADONLY;
 	bbd.dwButtonID = IDC_FONTSTRIKEOUT;
 	bbd.dwDefPos = 70;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[15];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_STRIKEOUT);
 	bbd.pwszTooltip = LPGENW("Strike-through text");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID | BBBF_NOREADONLY;
 	bbd.dwButtonID = IDOK;
 	bbd.dwDefPos = 10;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[6];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_SEND);
 	bbd.pwszTooltip = LPGENW("Send message\nClick dropdown arrow for sending options");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_CLOSE;
 	bbd.dwDefPos = 20;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[8];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_CLOSEMSGDLG);
 	bbd.pwszTooltip = LPGENW("Close session");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID | BBBF_NOREADONLY;
 	bbd.dwButtonID = IDC_QUOTE;
 	bbd.dwDefPos = 30;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[4];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_QUOTE);
 	bbd.pwszTooltip = LPGENW("Quote last message OR selected text");
 	g_plugin.addButton(&bbd);
 
 	bbd.dwButtonID = IDC_TIME;
 	bbd.dwDefPos = 40;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[2];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_MSGLOGOPT);
 	bbd.pwszTooltip = LPGENW("Message log options");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_SRMM_HISTORY;
 	bbd.dwDefPos = 50;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[0];
+	bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
 	bbd.pwszTooltip = LPGENW("View user's history");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID | BBBF_NOREADONLY;
 	bbd.dwButtonID = IDC_PIC;
 	bbd.dwDefPos = 60;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[7];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_CONTACTPIC);
 	bbd.pwszTooltip = LPGENW("Edit user notes");
 	g_plugin.addButton(&bbd);
 
@@ -108,32 +108,32 @@ static int CB_InitDefaultButtons(WPARAM, LPARAM)
 	bbd.dwButtonID = IDC_SRMM_COLOR;
 	bbd.pszModuleName = "Tabsrmm";
 	bbd.dwDefPos = 80;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[14];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_FONTCOLOR);
 	bbd.pwszTooltip = LPGENW("Select a foreground color for the text (Ctrl+K)");
 	g_plugin.addButton(&bbd);
 
 	bbd.dwButtonID = IDC_SRMM_BKGCOLOR;
 	bbd.dwDefPos = 81;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[16];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_BKGCOLOR);
 	bbd.pwszTooltip = LPGENW("Select a background color for the text (Ctrl+L)");
 	g_plugin.addButton(&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_SRMM_SHOWNICKLIST;
 	bbd.dwDefPos = 22;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[19];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_SHOWNICKLIST);
 	bbd.pwszTooltip = LPGENW("Show/hide the nick list (Ctrl+N)");
 	g_plugin.addButton(&bbd);
 
 	bbd.dwButtonID = IDC_SRMM_FILTER;
 	bbd.dwDefPos = 24;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[18];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_FILTER2);
 	bbd.pwszTooltip = LPGENW("Enable/disable the event filter (Ctrl+F)");
 	g_plugin.addButton(&bbd);
 
 	bbd.dwButtonID = IDC_SRMM_CHANMGR;
 	bbd.dwDefPos = 33;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[17];
+	bbd.hIcon = g_plugin.getIconHandle(IDI_TOPICBUT);
 	bbd.pwszTooltip = LPGENW("Control this room (Ctrl+O)");
 	g_plugin.addButton(&bbd);
 	return 0;
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index fd8e52cf53..677afb8966 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -919,7 +919,8 @@ void TContainerData::SetIcon(CMsgDialog *pDlg, HICON hIcon)
 	}

 	

 	// default handling (no win7 taskbar)

-	if (hIcon == PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]) {              // always set typing icon, but don't save it...

+	if (hIcon == PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]) {

+		// always set typing icon, but don't save it...

 		SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)PluginConfig.g_IconTypingEventBig);

 		SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);

 		return;

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 15d68aba1e..d2bc1c9f96 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -221,8 +221,9 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM)
 	Skin->Init(true);

 	CSkin::initAeroEffect();

 

-	for (int i = 0; i < NR_BUTTONBARICONS; i++)

-		PluginConfig.g_buttonBarIcons[i] = nullptr;

+	for (auto &it: PluginConfig.g_buttonBarIcons)

+		it = nullptr;

+	

 	::LoadIconTheme();

 	::CreateImageList(true);

 	::CB_InitCustomButtons();

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index d96b558765..59cfaba124 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -73,8 +73,7 @@ public:
 	HICON       g_IconMsgEvent, g_IconTypingEvent, g_IconFileEvent, g_IconSend;

 	HICON       g_IconMsgEventBig, g_IconTypingEventBig;

 	HMENU       g_hMenuContext, g_hMenuContainer;

-	HICON       g_buttonBarIcons[NR_BUTTONBARICONS];

-	HANDLE      g_buttonBarIconHandles[23];

+	HICON       g_buttonBarIcons[37];

 

 	// dynamic options, need reload when options change

 	int         m_iTabNameLimit;

diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index 9c07cef70a..af160c72c4 100644
--- a/plugins/TabSRMM/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
@@ -718,7 +718,7 @@ HMENU CInfoPanel::constructContextualMenu() const
 				::EnableMenuItem(m, IDC_SRMM_CHANMGR, MF_GRAYED);

 		}

 		::AppendMenu(m, MF_SEPARATOR, 1000, nullptr);

-		Utils::addMenuItem(m, mii, PluginConfig.g_buttonBarIcons[6], TranslateT("Close session"), IDC_CLOSE, 4);

+		Utils::addMenuItem(m, mii, PluginConfig.g_buttonBarIcons[ICON_BUTTON_CANCEL], TranslateT("Close session"), IDC_CLOSE, 4);

 	}

 	::AppendMenu(m, MF_SEPARATOR, 1000, nullptr);

 	::AppendMenu(m, MF_STRING, CMD_IP_COPY, TranslateT("Copy to clipboard"));

diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index 6fbe381dc6..e3c9c5cdac 100644
--- a/plugins/TabSRMM/src/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -53,7 +53,7 @@ static int RegisterCustomButton(WPARAM, LPARAM)
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISPUSHBUTTON | BBBF_NOREADONLY | BBBF_NOREADONLY;

 	bbd.dwButtonID = 1;

 	bbd.dwDefPos = 200;

-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[3];

+	bbd.hIcon = g_plugin.getIconHandle(IDI_IMAGETAG);

 	bbd.pszModuleName = "Tabmodplus";

 	bbd.pwszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

 	g_plugin.addButton(&bbd);

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index d86a116913..1ffab3882e 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -424,7 +424,7 @@ void TSAPI CreateImageList(bool bInitial)
 	PluginConfig.g_IconMsgEvent = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	PluginConfig.g_IconMsgEventBig = Skin_LoadIcon(SKINICON_EVENT_MESSAGE, true);

 	PluginConfig.g_IconTypingEventBig = Skin_LoadIcon(SKINICON_OTHER_TYPING, true);

-	PluginConfig.g_IconSend = PluginConfig.g_buttonBarIcons[9];

+	PluginConfig.g_IconSend = PluginConfig.g_buttonBarIcons[ICON_BUTTON_SEND];

 	PluginConfig.g_IconTypingEvent = PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING];

 }

 

@@ -433,18 +433,18 @@ void TSAPI CreateImageList(bool bInitial)
 

 static TIconDesc _toolbaricons[] =

 {

-	{ "tabSRMM_mlog", LPGEN("Message Log options"), &PluginConfig.g_buttonBarIcons[2], -IDI_MSGLOGOPT, 1 },

+	{ "tabSRMM_mlog", LPGEN("Message Log options"), &PluginConfig.g_buttonBarIcons[2], -IDI_MSGLOGOPT, 1 }, // 2

 	{ "tabSRMM_multi", LPGEN("Image tag"), &PluginConfig.g_buttonBarIcons[3], -IDI_IMAGETAG, 1 },

 	{ "tabSRMM_quote", LPGEN("Quote text"), &PluginConfig.g_buttonBarIcons[8], -IDI_QUOTE, 1 },

 	{ "tabSRMM_save", LPGEN("Save and close"), &PluginConfig.g_buttonBarIcons[7], -IDI_SAVE, 1 },

-	{ "tabSRMM_send", LPGEN("Send message"), &PluginConfig.g_buttonBarIcons[9], -IDI_SEND, 1 },

+	{ "tabSRMM_send", LPGEN("Send message"), &PluginConfig.g_buttonBarIcons[ICON_BUTTON_SEND], -IDI_SEND, 1 },

 	{ "tabSRMM_avatar", LPGEN("Edit user notes"), &PluginConfig.g_buttonBarIcons[10], -IDI_CONTACTPIC, 1 },

-	{ "tabSRMM_close", LPGEN("Close"), &PluginConfig.g_buttonBarIcons[6], -IDI_CLOSEMSGDLG, 1 }

+	{ "tabSRMM_close", LPGEN("Close"), &PluginConfig.g_buttonBarIcons[ICON_BUTTON_CANCEL], -IDI_CLOSEMSGDLG, 1 }

 };

 

 static TIconDesc _exttoolbaricons[] =

 {

-	{ "tabSRMM_emoticon", LPGEN("Smiley button"), &PluginConfig.g_buttonBarIcons[11], -IDI_SMILEYICON, 1 },

+	{ "tabSRMM_emoticon", LPGEN("Smiley button"), &PluginConfig.g_buttonBarIcons[11], -IDI_SMILEYICON, 1 }, // 9

 	{ "tabSRMM_bold", LPGEN("Format bold"), &PluginConfig.g_buttonBarIcons[17], -IDI_FONTBOLD, 1 },

 	{ "tabSRMM_italic", LPGEN("Format italic"), &PluginConfig.g_buttonBarIcons[18], -IDI_FONTITALIC, 1 },

 	{ "tabSRMM_underline", LPGEN("Format underline"), &PluginConfig.g_buttonBarIcons[19], -IDI_FONTUNDERLINE, 1 },

@@ -509,8 +509,6 @@ static ICONBLOCKS[] = {
 

 static int TSAPI SetupIconLibConfig()

 {

-	int j = 2;

-

 	HINSTANCE hIconDll = LoadLibraryA("icons\\tabsrmm_icons.dll");

 	if (hIconDll == nullptr) {

 		CWarning::show(CWarning::WARN_ICONPACKMISSING, CWarning::CWF_NOALLOWHIDE | MB_ICONERROR | MB_OK);

@@ -526,18 +524,13 @@ static int TSAPI SetupIconLibConfig()
 	sid.defaultFile.w = szFilename;

 	sid.flags = SIDF_PATH_UNICODE;

 

-	for (int n = 0; n < _countof(ICONBLOCKS); n++) {

-		auto &it = ICONBLOCKS[n];

+	for (auto &it: ICONBLOCKS) {

 		sid.section.a = it.szSection;

 		for (int i = 0; i < it.nItems; i++) {

 			sid.pszName = it.idesc[i].szName;

 			sid.description.a = it.idesc[i].szDesc;

-			sid.iDefaultIndex = it.idesc[i].uId == -IDI_HISTORY ? 0 : it.idesc[i].uId;        // workaround problem /w icoLib and a resource id of 1 (actually, a Windows problem)

-

-			if (n > 0 && n < 4)

-				PluginConfig.g_buttonBarIconHandles[j++] = g_plugin.addIcon(&sid);

-			else

-				g_plugin.addIcon(&sid);

+			sid.iDefaultIndex = it.idesc[i].uId == -IDI_HISTORY ? 0 : it.idesc[i].uId;

+			g_plugin.addIcon(&sid);

 		}

 	}

 

@@ -565,9 +558,6 @@ static int TSAPI LoadFromIconLib()
 

 	PluginConfig.g_buttonBarIcons[0] = Skin_LoadIcon(SKINICON_OTHER_ADDCONTACT);

 	PluginConfig.g_buttonBarIcons[1] = Skin_LoadIcon(SKINICON_OTHER_HISTORY);

-	PluginConfig.g_buttonBarIconHandles[0] = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

-	PluginConfig.g_buttonBarIconHandles[1] = Skin_GetIconHandle(SKINICON_OTHER_ADDCONTACT);

-	PluginConfig.g_buttonBarIconHandles[20] = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

 

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

 

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index f0eaeec646..5b9de4088a 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -168,8 +168,6 @@ struct TitleBtn {
 #define BTN_MAX 1

 #define BTN_CLOSE 2

 

-#define NR_BUTTONBARICONS 37//MaD: 29

-

 class CContactCache;

 class CMenuBar;

 class CMsgDialog;

@@ -1032,16 +1030,17 @@ struct SKINDESC
 #define SKIN_VERSION	 2

 

 // icon defintions (index into g_buttonBarIcons)

-#define ICON_DEFAULT_SOUNDS 			22

-#define ICON_DEFAULT_PULLDOWN			16

-#define ICON_DEFAULT_LEFT				25

-#define ICON_DEFAULT_RIGHT				28

-#define ICON_DEFAULT_UP					26

-#define ICON_DEFAULT_TYPING				5

-

-#define ICON_BUTTON_ADD					0

-#define ICON_BUTTON_CANCEL				6

-#define ICON_BUTTON_SAVE				7

+#define ICON_DEFAULT_SOUNDS        22

+#define ICON_DEFAULT_PULLDOWN      16

+#define ICON_DEFAULT_LEFT          25

+#define ICON_DEFAULT_RIGHT         28

+#define ICON_DEFAULT_UP            26

+#define ICON_DEFAULT_TYPING         5

+

+#define ICON_BUTTON_ADD             0

+#define ICON_BUTTON_CANCEL          6

+#define ICON_BUTTON_SAVE            7

+#define ICON_BUTTON_SEND            9

 

 struct CMPlugin : public PLUGIN<CMPlugin>

 {