diff options
Diffstat (limited to 'plugins/Msg_Export/src')
| -rw-r--r-- | plugins/Msg_Export/src/FileViewer.cpp | 4 | ||||
| -rw-r--r-- | plugins/Msg_Export/src/main.cpp | 14 | ||||
| -rw-r--r-- | plugins/Msg_Export/src/resource.h | 4 | ||||
| -rw-r--r-- | plugins/Msg_Export/src/stdafx.h | 1 |
4 files changed, 10 insertions, 13 deletions
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<CMPlugin> extern MWindowList hInternalWindowList;
extern wstring g_sDBPath, g_sMirandaPath;
-extern IconItem iconList[];
///////////////////////////////////////////////////////////////////////////////
|