From 63ccf9482d4328cbbcf597c137954211f7bd24c2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 6 Mar 2024 17:19:29 +0300 Subject: Msg_Export: unused icons removed --- plugins/Msg_Export/res/notick.ico | Bin 1150 -> 0 bytes plugins/Msg_Export/res/resource.rc | 6 +----- plugins/Msg_Export/res/tick.ico | Bin 1150 -> 0 bytes plugins/Msg_Export/src/FileViewer.cpp | 4 ++-- plugins/Msg_Export/src/main.cpp | 14 +++++++------- plugins/Msg_Export/src/resource.h | 4 +--- plugins/Msg_Export/src/stdafx.h | 1 - 7 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 plugins/Msg_Export/res/notick.ico delete mode 100644 plugins/Msg_Export/res/tick.ico (limited to 'plugins/Msg_Export') diff --git a/plugins/Msg_Export/res/notick.ico b/plugins/Msg_Export/res/notick.ico deleted file mode 100644 index 7f93490642..0000000000 Binary files a/plugins/Msg_Export/res/notick.ico and /dev/null differ diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc index d9869428a6..2c9a4b412e 100644 --- a/plugins/Msg_Export/res/resource.rc +++ b/plugins/Msg_Export/res/resource.rc @@ -198,11 +198,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_EXPORT_MESSAGE ICON "export_m.ico" - -IDI_TICK ICON "tick.ico" - -IDI_NOTICK ICON "notick.ico" +IDI_MAIN ICON "export_m.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Msg_Export/res/tick.ico b/plugins/Msg_Export/res/tick.ico deleted file mode 100644 index 609504d614..0000000000 Binary files a/plugins/Msg_Export/res/tick.ico and /dev/null differ diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp index 1ab7eebdcc..50bda31613 100644 --- a/plugins/Msg_Export/src/FileViewer.cpp +++ b/plugins/Msg_Export/src/FileViewer.cpp @@ -741,8 +741,8 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); pclDlg = (CLHistoryDlg *)lParam; - Window_SetIcon_IcoLib(hwndDlg, iconList[0].hIcolib); - SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_EXPORT_MESSAGE))); + Window_SetIcon_IcoLib(hwndDlg, g_plugin.getIconHandle(IDI_MAIN)); + SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_MAIN))); { HWND hRichEdit = GetDlgItem(hwndDlg, IDC_RICHEDIT); mir_subclassWindow(hRichEdit, EditSubclassProc); diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index 7eb98a030b..76daadba0f 100644 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -22,11 +22,6 @@ CMPlugin g_plugin; MWindowList hInternalWindowList = nullptr; -IconItem iconList[] = -{ - { "Main icon", "main", IDI_EXPORT_MESSAGE }, -}; - ///////////////////////////////////////////////////// // Remember to update the Version in the resource !!! ///////////////////////////////////////////////////// @@ -120,7 +115,7 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/) CMenuItem mi(&g_plugin); SET_UID(mi, 0x4e889089, 0x2304, 0x425f, 0x8f, 0xaa, 0x4f, 0x8a, 0x7b, 0x26, 0x4d, 0x4d); // {4E889089-2304-425F-8FAA-4F8A7B264D4D} - mi.hIcolibItem = iconList[0].hIcolib; + mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN); mi.position = 1000090101; mi.name.a = LPGEN("Export history"); mi.pszService = MS_EXPORT_HISTORY; @@ -128,7 +123,7 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/) if (!g_bReplaceHistory) { SET_UID(mi, 0x701c543, 0xd078, 0x41dd, 0x95, 0xe3, 0x96, 0x49, 0x8a, 0x72, 0xc7, 0x50); - mi.hIcolibItem = iconList[0].hIcolib; + mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN); mi.position = 1000090100; mi.name.a = LPGEN("Open E&xported History"); mi.pszService = MS_SHOW_EXPORT_HISTORY; @@ -152,6 +147,11 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/) // Developer : KN ///////////////////////////////////////////////////////////////////// +static IconItem iconList[] = +{ + { "Main icon", "main", IDI_MAIN }, +}; + int CMPlugin::Load() { registerIcon(MODULENAME, iconList, MODULENAME); diff --git a/plugins/Msg_Export/src/resource.h b/plugins/Msg_Export/src/resource.h index 77919cd84f..d42cfb4645 100644 --- a/plugins/Msg_Export/src/resource.h +++ b/plugins/Msg_Export/src/resource.h @@ -2,7 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by w:\miranda-ng\plugins\Msg_Export\res\resource.rc // -#define IDI_EXPORT_MESSAGE 108 +#define IDI_MAIN 108 #define IDD_EXPORT_ALL_DLG 110 #define IDR_MSG_EXPORT 114 #define IDD_FILE_VIEWER 116 @@ -10,8 +10,6 @@ #define IDD_OPT_MSGEXPORT 121 #define IDD_OPT_CONTACTS 122 #define IDD_OPT_MSGEXPORT2 123 -#define IDI_NOTICK 205 -#define IDI_TICK 206 #define IDC_EXPORTALL 1001 #define IDC_EXPORT_DIR 1002 #define IDC_MAX_CLOUMN_WIDTH 1003 diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h index 9db4cfaf19..8c22887482 100644 --- a/plugins/Msg_Export/src/stdafx.h +++ b/plugins/Msg_Export/src/stdafx.h @@ -72,7 +72,6 @@ struct CMPlugin : public PLUGIN extern MWindowList hInternalWindowList; extern wstring g_sDBPath, g_sMirandaPath; -extern IconItem iconList[]; /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3