From 6a53de3a1f093a92126c0a86ec5f7ad52e3caf15 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 13 Mar 2021 17:50:26 +0300 Subject: Group chats API: - for #2574: fixes icons problem after unloading tabSRMM; - status icons extracted to the separate array; - another group chat icons are hidden completely to restrict access to them --- src/core/stdmsg/res/1.ico | Bin 502 -> 0 bytes src/core/stdmsg/res/2.ico | Bin 502 -> 0 bytes src/core/stdmsg/res/3.ico | Bin 502 -> 0 bytes src/core/stdmsg/res/4.ico | Bin 502 -> 0 bytes src/core/stdmsg/res/5.ico | Bin 502 -> 0 bytes src/core/stdmsg/res/6.ico | Bin 502 -> 0 bytes src/core/stdmsg/res/resource.rc | 12 ------------ src/core/stdmsg/src/chat_options.cpp | 7 ------- src/core/stdmsg/src/resource.h | 6 ------ 9 files changed, 25 deletions(-) delete mode 100644 src/core/stdmsg/res/1.ico delete mode 100644 src/core/stdmsg/res/2.ico delete mode 100644 src/core/stdmsg/res/3.ico delete mode 100644 src/core/stdmsg/res/4.ico delete mode 100644 src/core/stdmsg/res/5.ico delete mode 100644 src/core/stdmsg/res/6.ico (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/res/1.ico b/src/core/stdmsg/res/1.ico deleted file mode 100644 index 61fa00e172..0000000000 Binary files a/src/core/stdmsg/res/1.ico and /dev/null differ diff --git a/src/core/stdmsg/res/2.ico b/src/core/stdmsg/res/2.ico deleted file mode 100644 index 5c1dc06fbc..0000000000 Binary files a/src/core/stdmsg/res/2.ico and /dev/null differ diff --git a/src/core/stdmsg/res/3.ico b/src/core/stdmsg/res/3.ico deleted file mode 100644 index f103719b68..0000000000 Binary files a/src/core/stdmsg/res/3.ico and /dev/null differ diff --git a/src/core/stdmsg/res/4.ico b/src/core/stdmsg/res/4.ico deleted file mode 100644 index 47d8f35fe2..0000000000 Binary files a/src/core/stdmsg/res/4.ico and /dev/null differ diff --git a/src/core/stdmsg/res/5.ico b/src/core/stdmsg/res/5.ico deleted file mode 100644 index 7008463787..0000000000 Binary files a/src/core/stdmsg/res/5.ico and /dev/null differ diff --git a/src/core/stdmsg/res/6.ico b/src/core/stdmsg/res/6.ico deleted file mode 100644 index 8a681faeb7..0000000000 Binary files a/src/core/stdmsg/res/6.ico and /dev/null differ diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index d7cc7e427b..752f5c20a8 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -461,18 +461,6 @@ IDI_NICKLIST ICON "nicklist.ico" IDI_BLANK ICON "blank.ico" -IDI_STATUS3 ICON "4.ico" - -IDI_STATUS2 ICON "3.ico" - -IDI_STATUS4 ICON "5.ico" - -IDI_STATUS1 ICON "2.ico" - -IDI_STATUS0 ICON "1.ico" - -IDI_STATUS5 ICON "6.ico" - IDI_CLOSE ICON "close.ico" IDI_OVERLAY ICON "overlay.ico" diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 97cd62c2bb..17f73d4a7a 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -102,13 +102,6 @@ static IconItem iconList1[] = { LPGEN("Show nick list"), "nicklist2", IDI_NICKLIST2 }, { LPGEN("Icon overlay"), "overlay", IDI_OVERLAY }, { LPGEN("Close"), "close", IDI_CLOSE }, - - { LPGEN("Status 1 (10x10)"), "status0", IDI_STATUS0, 10 }, - { LPGEN("Status 2 (10x10)"), "status1", IDI_STATUS1, 10 }, - { LPGEN("Status 3 (10x10)"), "status2", IDI_STATUS2, 10 }, - { LPGEN("Status 4 (10x10)"), "status3", IDI_STATUS3, 10 }, - { LPGEN("Status 5 (10x10)"), "status4", IDI_STATUS4, 10 }, - { LPGEN("Status 6 (10x10)"), "status5", IDI_STATUS5, 10 } }; static IconItem iconList2[] = diff --git a/src/core/stdmsg/src/resource.h b/src/core/stdmsg/src/resource.h index 78bd1288d8..d3e1b94b91 100644 --- a/src/core/stdmsg/src/resource.h +++ b/src/core/stdmsg/src/resource.h @@ -38,12 +38,6 @@ #define IDI_TAG1 149 #define IDI_TAG2 150 #define IDR_MENU 151 -#define IDI_STATUS3 153 -#define IDI_STATUS2 154 -#define IDI_STATUS4 155 -#define IDI_STATUS1 156 -#define IDI_STATUS0 157 -#define IDI_STATUS5 158 #define IDI_CLOSE 159 #define IDI_OVERLAY 160 #define IDI_NICKLIST2 161 -- cgit v1.2.3