diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-08-23 00:11:36 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-08-23 00:11:36 +0300 |
| commit | bf9981cdfdaf818530c180d6975e0f6a53dcc944 (patch) | |
| tree | 9daef0a1ca77fccf29d80fe1b9184490e5971399 | |
| parent | 5cd3afbd509c515604921b2713960fb25b5bce73 (diff) | |
IEView: all icons added to icolib (fixes #295)
| -rw-r--r-- | plugins/IEView/res/ieview.rc | 6 | ||||
| -rw-r--r-- | plugins/IEView/src/Options.cpp | 8 | ||||
| -rw-r--r-- | plugins/IEView/src/ieview_main.cpp | 9 | ||||
| -rw-r--r-- | plugins/IEView/src/stdafx.h | 1 |
4 files changed, 18 insertions, 6 deletions
diff --git a/plugins/IEView/res/ieview.rc b/plugins/IEView/res/ieview.rc index 71df058918..1f602697e2 100644 --- a/plugins/IEView/res/ieview.rc +++ b/plugins/IEView/res/ieview.rc @@ -7,7 +7,8 @@ //
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "afxres.h"
+
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -165,7 +166,8 @@ END //
// Generated from the TEXTINCLUDE 3 resource.
//
-
+
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 841bebac25..59723e6c5f 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -360,10 +360,10 @@ static void RefreshIcons() else {
hImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 0, 0);
}
- ImageList_AddIcon(hImageList, (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_GROUP_OFF), IMAGE_ICON, 0, 0, 0));
- ImageList_AddIcon(hImageList, (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_GROUP_ON), IMAGE_ICON, 0, 0, 0));
- ImageList_AddIcon(hImageList, (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_RTL_OFF), IMAGE_ICON, 0, 0, 0));
- ImageList_AddIcon(hImageList, (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_RTL_ON), IMAGE_ICON, 0, 0, 0));
+ ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[3].hIcolib));
+ ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[2].hIcolib));
+ ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[1].hIcolib));
+ ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[0].hIcolib));
}
static void RefreshProtoList(HWND hwndDlg, int mode, bool protoTemplates)
diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp index b949bed4f3..5ac7146d98 100644 --- a/plugins/IEView/src/ieview_main.cpp +++ b/plugins/IEView/src/ieview_main.cpp @@ -57,6 +57,14 @@ static int ModulesLoaded(WPARAM, LPARAM) return 0;
}
+IconItem iconList[] =
+{
+ { LPGEN("RTL On"), "RTL_ON", IDI_RTL_ON },
+ { LPGEN("RTL Off"), "RTL_OFF", IDI_RTL_OFF },
+ { LPGEN("Group On"), "GROUP_ON", IDI_GROUP_ON },
+ { LPGEN("Group Off"), "GROUP_OFF", IDI_GROUP_OFF }
+};
+
extern "C" int __declspec(dllexport) Load(void)
{
int wdsize = GetCurrentDirectory(0, NULL);
@@ -77,6 +85,7 @@ extern "C" int __declspec(dllexport) Load(void) CreateServiceFunction(MS_IEVIEW_NAVIGATE, HandleIENavigate);
CreateServiceFunction("IEView/ReloadOptions", ReloadOptions);
hHookOptionsChanged = CreateHookableEvent(ME_IEVIEW_OPTIONSCHANGED);
+ Icon_Register(hInstance, ieviewModuleName, iconList, _countof(iconList), ieviewModuleName);
return 0;
}
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h index 198f944b68..7f1102d51c 100644 --- a/plugins/IEView/src/stdafx.h +++ b/plugins/IEView/src/stdafx.h @@ -78,6 +78,7 @@ extern HINSTANCE hInstance; extern IEView *debugView;
extern char *workingDirUtf8;
extern HANDLE hHookOptionsChanged;
+extern IconItem iconList[];
class BSTR_PTR
{
|