From 00f5e35c664bd8b2b1b00de3353aa0c3e70f5423 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 7 Mar 2019 13:00:51 +0300 Subject: duplicate popup icons moved into global skin --- src/mir_app/res/icon_popup.ico | Bin 0 -> 1150 bytes src/mir_app/res/icon_popup_no.ico | Bin 0 -> 1150 bytes src/mir_app/res/resource.rc | 2 ++ src/mir_app/src/resource.h | 2 ++ src/mir_app/src/skinicons.cpp | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/mir_app/res/icon_popup.ico create mode 100644 src/mir_app/res/icon_popup_no.ico (limited to 'src') diff --git a/src/mir_app/res/icon_popup.ico b/src/mir_app/res/icon_popup.ico new file mode 100644 index 0000000000..5b3fe4e65b Binary files /dev/null and b/src/mir_app/res/icon_popup.ico differ diff --git a/src/mir_app/res/icon_popup_no.ico b/src/mir_app/res/icon_popup_no.ico new file mode 100644 index 0000000000..cac10ab068 Binary files /dev/null and b/src/mir_app/res/icon_popup_no.ico differ diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 4a77645959..daf0af8b8d 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -1142,6 +1142,8 @@ IDI_LOADED ICON "icon_loaded.ico" IDI_LOADED_GRAY ICON "icon_loaded_gray.ico" IDI_NOTLOADED ICON "icon_notloaded.ico" IDI_NOTLOADED_GRAY ICON "icon_notloaded_gray.ico" +IDI_POPUP ICON "icon_popup.ico" +IDI_NOPOPUP ICON "icon_popup_no.ico" IDI_FRAME ICON "icon_frame.ico" IDI_MFATAL ICON "icon_fatal.ico" IDI_MERROR ICON "icon_error.ico" diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index 3b30327ac1..3572ea28a7 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -18,11 +18,13 @@ #define IDD_OPT_PROTOCOLORDER 109 #define IDD_OPT_ICOLIB 110 #define IDD_ICOLIB_IMPORT 111 +#define IDI_POPUP 112 #define IDI_LOADED_GRAY 113 #define IDI_NOTLOADED_GRAY 114 #define IDD_ADDED 115 #define IDD_ENTER_STRING 116 #define IDI_ADDGROUP 117 +#define IDI_NOPOPUP 118 #define IDD_AUTHREQ 121 #define IDD_DETAILS 125 #define IDD_HISTORY 127 diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp index c8ac4a39d2..7ed66af300 100644 --- a/src/mir_app/src/skinicons.cpp +++ b/src/mir_app/src/skinicons.cpp @@ -67,8 +67,8 @@ static struct StandardIconDescription mainIcons[] = { SKINICON_OTHER_EMPTYBLOB, LPGEN("Empty blob"), -IDI_EMPTYBLOB, 0, nullptr }, // 26 { SKINICON_OTHER_UNICODE, LPGEN("Unicode plugin"), -IDI_UNICODE, 0, nullptr }, // 27 { SKINICON_OTHER_ANSI, LPGEN("ANSI plugin"), -IDI_ANSI, 0, nullptr }, // 28 - { -1, LPGEN("Unused"), 0, 0, nullptr }, // 29 - { -1, LPGEN("Unused"), 0, 0, nullptr }, // 30 + { SKINICON_OTHER_POPUP, LPGEN("Popups are enabled"), -IDI_POPUP, 0, nullptr }, // 29 + { SKINICON_OTHER_NOPOPUP, LPGEN("Popups are disabled"), -IDI_NOPOPUP, 0, nullptr }, // 30 { SKINICON_OTHER_UNDO, LPGEN("Undo"), -IDI_UNDO, 0, nullptr }, // 31 { SKINICON_OTHER_WINDOW, LPGEN("Window"), -IDI_WINDOW, 0, nullptr }, // 32 { SKINICON_OTHER_WINDOWS, LPGEN("System"), -IDI_WINDOWS, 0, nullptr }, // 33 -- cgit v1.2.3