diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-07 13:00:51 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-07 13:00:51 +0300 |
| commit | 00f5e35c664bd8b2b1b00de3353aa0c3e70f5423 (patch) | |
| tree | 5766fc5e1bb1886b664e280b65d503a594838883 /plugins/ChangeKeyboardLayout | |
| parent | e855b0922f15871e8deb07562f3d5c8ba675bf93 (diff) | |
duplicate popup icons moved into global skin
Diffstat (limited to 'plugins/ChangeKeyboardLayout')
| -rw-r--r-- | plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc | 2 | ||||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/res/Popup.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/hook_events.cpp | 2 | ||||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/main.cpp | 1 | ||||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/resource.h | 1 |
5 files changed, 2 insertions, 4 deletions
diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc index 82e599a3ae..277de6bc88 100644 --- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc +++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc @@ -54,7 +54,7 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_POPUPICON ICON "Popup.ico"
+
IDI_COPYICON ICON "CopyToClipboard.ico"
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ChangeKeyboardLayout/res/Popup.ico b/plugins/ChangeKeyboardLayout/res/Popup.ico Binary files differdeleted file mode 100644 index c0cc313845..0000000000 --- a/plugins/ChangeKeyboardLayout/res/Popup.ico +++ /dev/null diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 884182159e..acb11976be 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -85,7 +85,7 @@ void RegPopupActions() int OnIconsChanged(WPARAM, LPARAM)
{
- hPopupIcon = IcoLib_GetIcon("ckl_popup_icon");
+ hPopupIcon = Skin_LoadIcon(SKINICON_OTHER_POPUP);
hCopyIcon = IcoLib_GetIcon("ckl_copy_icon");
RegPopupActions();
return 0;
diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp index ca660047ae..51b09a88a8 100644 --- a/plugins/ChangeKeyboardLayout/src/main.cpp +++ b/plugins/ChangeKeyboardLayout/src/main.cpp @@ -19,7 +19,6 @@ HANDLE hOptionsInitialize; static IconItem iconList[] =
{
- { LPGEN("Popup"), "ckl_popup_icon", IDI_POPUPICON },
{ LPGEN("Copy to clipboard"), "ckl_copy_icon", IDI_COPYICON }
};
diff --git a/plugins/ChangeKeyboardLayout/src/resource.h b/plugins/ChangeKeyboardLayout/src/resource.h index 8ca2e0e8be..737754fc59 100644 --- a/plugins/ChangeKeyboardLayout/src/resource.h +++ b/plugins/ChangeKeyboardLayout/src/resource.h @@ -4,7 +4,6 @@ //
#define IDD_MAIN_OPTION_FORM 101
#define IDD_POPUP_OPTION_FORM 102
-#define IDI_POPUPICON 103
#define IDI_COPYICON 104
#define IDB_BITMAP_WIN 110
#define IDB_BITMAP_ALT 111
|