From 7d7d51840d543ea394ea4cebae53c5c6063a7e74 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 26 Jul 2023 20:35:46 +0300
Subject: code cleaning

---
 plugins/Scriver/src/msgs.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/Scriver/src/msgs.cpp')

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 264551e372..62d97ef0fe 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -331,7 +331,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISIMBUTTON | BBBF_CREATEBYID | BBBF_ISRSIDEBUTTON | BBBF_CANTBEHIDDEN;
 	bbd.dwButtonID = IDOK;
 	bbd.dwDefPos = 5;
-	bbd.hIcon = IcoLib_GetIconHandle("scriver_SEND");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_SEND);
 	bbd.pwszText = LPGENW("&OK");
 	bbd.pwszTooltip = LPGENW("Send message");
 	Srmm_AddButton(&bbd, &g_plugin);
@@ -339,7 +339,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_QUOTE;
 	bbd.dwDefPos = 10;
-	bbd.hIcon = IcoLib_GetIconHandle("scriver_QUOTE");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_QUOTE);
 	bbd.pwszText = LPGENW("&Quote");
 	bbd.pwszTooltip = LPGENW("Quote");
 	Srmm_AddButton(&bbd, &g_plugin);
@@ -347,7 +347,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	bbd.bbbFlags |= BBBF_ISRSIDEBUTTON;
 	bbd.dwButtonID = IDC_ADD;
 	bbd.dwDefPos = 20;
-	bbd.hIcon = IcoLib_GetIconHandle("scriver_ADD");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_ADDCONTACT);
 	bbd.pwszText = LPGENW("&Add");
 	bbd.pwszTooltip = LPGENW("Add contact permanently to list");
 	Srmm_AddButton(&bbd, &g_plugin);
@@ -361,7 +361,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 
 	bbd.dwButtonID = IDC_DETAILS;
 	bbd.dwDefPos = 40;
-	bbd.hIcon = IcoLib_GetIconHandle("scriver_USERDETAILS");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_USERDETAILS);
 	bbd.pwszText = LPGENW("User &details");
 	bbd.pwszTooltip = LPGENW("View user's details");
 	Srmm_AddButton(&bbd, &g_plugin);
@@ -369,7 +369,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	bbd.bbbFlags |= BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON;
 	bbd.dwButtonID = IDC_SRMM_HISTORY;
 	bbd.dwDefPos = 50;
-	bbd.hIcon = IcoLib_GetIconHandle("scriver_HISTORY");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_HISTORY);
 	bbd.pwszText = LPGENW("&History");
 	bbd.pwszTooltip = LPGENW("View user's history (Ctrl+H)");
 	Srmm_AddButton(&bbd, &g_plugin);
@@ -378,35 +378,35 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	bbd.bbbFlags = BBBF_ISPUSHBUTTON | BBBF_ISCHATBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_SRMM_BOLD;
 	bbd.dwDefPos = 10;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_bold");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_BBOLD);
 	bbd.pwszText = LPGENW("&Bold");
 	bbd.pwszTooltip = LPGENW("Make the text bold (Ctrl+B)");
 	Srmm_AddButton(&bbd, &g_plugin);
 
 	bbd.dwButtonID = IDC_SRMM_ITALICS;
 	bbd.dwDefPos = 15;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_italics");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_BITALICS);
 	bbd.pwszText = LPGENW("&Italic");
 	bbd.pwszTooltip = LPGENW("Make the text italicized (Ctrl+I)");
 	Srmm_AddButton(&bbd, &g_plugin);
 
 	bbd.dwButtonID = IDC_SRMM_UNDERLINE;
 	bbd.dwDefPos = 20;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_underline");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_BUNDERLINE);
 	bbd.pwszText = LPGENW("&Underline");
 	bbd.pwszTooltip = LPGENW("Make the text underlined (Ctrl+U)");
 	Srmm_AddButton(&bbd, &g_plugin);
 
 	bbd.dwButtonID = IDC_SRMM_COLOR;
 	bbd.dwDefPos = 25;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_fgcol");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_COLOR);
 	bbd.pwszText = LPGENW("&Color");
 	bbd.pwszTooltip = LPGENW("Select a foreground color for the text (Ctrl+K)");
 	Srmm_AddButton(&bbd, &g_plugin);
 
 	bbd.dwButtonID = IDC_SRMM_BKGCOLOR;
 	bbd.dwDefPos = 30;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_bkgcol");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_BKGCOLOR);
 	bbd.pwszText = LPGENW("&Background color");
 	bbd.pwszTooltip = LPGENW("Select a background color for the text (Ctrl+L)");
 	Srmm_AddButton(&bbd, &g_plugin);
@@ -414,21 +414,21 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_SRMM_CHANMGR;
 	bbd.dwDefPos = 30;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_settings");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_TOPICBUT);
 	bbd.pwszText = LPGENW("&Room settings");
 	bbd.pwszTooltip = LPGENW("Control this room (Ctrl+O)");
 	Srmm_AddButton(&bbd, &g_plugin);
 
 	bbd.dwButtonID = IDC_SRMM_SHOWNICKLIST;
 	bbd.dwDefPos = 20;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_nicklist");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_NICKLIST);
 	bbd.pwszText = LPGENW("&Show/hide nick list");
 	bbd.pwszTooltip = LPGENW("Show/hide the nick list (Ctrl+N)");
 	Srmm_AddButton(&bbd, &g_plugin);
 
 	bbd.dwButtonID = IDC_SRMM_FILTER;
 	bbd.dwDefPos = 10;
-	bbd.hIcon = IcoLib_GetIconHandle("chat_filter");
+	bbd.hIcon = g_plugin.getIconHandle(IDI_FILTER);
 	bbd.pwszText = LPGENW("&Filter");
 	bbd.pwszTooltip = LPGENW("Enable/disable the event filter (Ctrl+F)");
 	Srmm_AddButton(&bbd, &g_plugin);
-- 
cgit v1.2.3