diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-10-12 21:32:25 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-10-12 21:32:25 +0300 |
| commit | 70cf96fdda918321f2f90ffb9271d690cd55d011 (patch) | |
| tree | 1cedc5c1615b2a9a254cc0e722e4786958302c36 /plugins/IEView/src | |
| parent | 2f112b300d2c5582b9a614ce3588d6d6879bcd1c (diff) | |
fixes #4726 (IEView: remove duplicate "Code" button)
Diffstat (limited to 'plugins/IEView/src')
| -rw-r--r-- | plugins/IEView/src/Options.cpp | 8 | ||||
| -rw-r--r-- | plugins/IEView/src/ieview_main.cpp | 39 | ||||
| -rw-r--r-- | plugins/IEView/src/resource.h | 1 | ||||
| -rw-r--r-- | plugins/IEView/src/stdafx.h | 1 |
4 files changed, 10 insertions, 39 deletions
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index be47efc419..c0ffd80344 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -306,10 +306,10 @@ static void RefreshProtoIcons() static void RefreshIcons()
{
hImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 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));
+ ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_GROUP_OFF));
+ ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_GROUP_ON));
+ ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_RTL_OFF));
+ ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_RTL_ON));
}
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 9056ca1950..a407c37c8d 100644 --- a/plugins/IEView/src/ieview_main.cpp +++ b/plugins/IEView/src/ieview_main.cpp @@ -23,15 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. char *workingDirUtf8;
CMPlugin g_plugin;
-IconItem iconList[] =
-{
- { LPGEN("Code"), "CODE", IDI_CODE },
- { 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 }
-};
-
/////////////////////////////////////////////////////////////////////////////////////////
PLUGININFOEX pluginInfoEx = {
@@ -53,34 +44,16 @@ CMPlugin::CMPlugin() : /////////////////////////////////////////////////////////////////////////////////////////
-static int CustomButtonPressed(WPARAM, LPARAM lParam)
+static IconItem iconList[] =
{
- CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
- if (mir_strcmp(cbcd->pszModule, MODULENAME))
- return 0;
-
- if (cbcd->dwButtonId != 1)
- return 1;
-
- HWND hEdit = GetDlgItem(cbcd->hwndFrom, IDC_SRMM_MESSAGE);
- SendMessage(hEdit, EM_REPLACESEL, TRUE, (LPARAM)L"[code][/code]");
- return 0;
-}
+ { 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 }
+};
static int ModulesLoaded(WPARAM, LPARAM)
{
- BBButton bbd = {};
- bbd.pszModuleName = MODULENAME;
- bbd.dwButtonID = 1;
- bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISIMBUTTON | BBBF_NOREADONLY | BBBF_NOREADONLY;
- bbd.dwDefPos = 40;
- bbd.hIcon = g_plugin.getIconHandle(IDI_CODE);
- bbd.pwszText = L"[Code]";
- bbd.pwszTooltip = LPGENW("Format text as code");
- g_plugin.addButton(&bbd);
-
- HookEvent(ME_MSG_BUTTONPRESSED, CustomButtonPressed);
-
Options::init();
return 0;
}
diff --git a/plugins/IEView/src/resource.h b/plugins/IEView/src/resource.h index 10a782b67e..f3c6a430b6 100644 --- a/plugins/IEView/src/resource.h +++ b/plugins/IEView/src/resource.h @@ -9,7 +9,6 @@ #define IDI_RTL_OFF 101
#define IDI_GROUP_ON 102
#define IDI_GROUP_OFF 103
-#define IDI_CODE 104
#define IDD_SRMM_OPTIONS 153
#define IDD_GENERAL_OPTIONS 155
#define IDR_CONTEXTMENU 200
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h index fa5ba81185..3732b09705 100644 --- a/plugins/IEView/src/stdafx.h +++ b/plugins/IEView/src/stdafx.h @@ -87,7 +87,6 @@ CSrmmLogWindow *logBuilder(CMsgDialog &pDlg); extern IEView *debugView;
extern char *workingDirUtf8;
extern HANDLE hHookOptionsChanged;
-extern IconItem iconList[];
class BSTR_PTR
{
|