From 88da7ba66825d1e04f64ef36db9cbac1d7fec582 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 17 Jan 2024 12:49:30 +0300 Subject: =?UTF-8?q?fixes=20#4126=20(=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D1=8D=D0=BA=D1=81=D1=82=D1=80=D0=B0-=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=BE=D0=BA=20"=D0=92=D0=B8=D0=B4=D0=B8=D0=BC?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/m_skin.h | 26 ++++++++++++-------------- src/mir_app/res/always_visible.ico | Bin 1150 -> 0 bytes src/mir_app/res/never_visible.ico | Bin 1150 -> 0 bytes src/mir_app/res/resource.rc | 4 ---- src/mir_app/src/ei_defaulticons.cpp | 12 ++---------- src/mir_app/src/resource.h | 2 -- src/mir_app/src/skinicons.cpp | 2 -- 7 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 src/mir_app/res/always_visible.ico delete mode 100644 src/mir_app/res/never_visible.ico diff --git a/include/m_skin.h b/include/m_skin.h index 3e8a32927c..9a57f768b7 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -79,20 +79,18 @@ #define SKINICON_OTHER_GROUP 237 #define SKINICON_OTHER_ON 238 #define SKINICON_OTHER_OFF 239 -#define SKINICON_OTHER_VISIBLE_ALL 240 -#define SKINICON_OTHER_INVISIBLE_ALL 241 -#define SKINICON_OTHER_FRAME 242 -#define SKINICON_AUTH_ADD 243 -#define SKINICON_AUTH_REQUEST 244 -#define SKINICON_AUTH_GRANT 245 -#define SKINICON_AUTH_REVOKE 246 -#define SKINICON_OTHER_GROUPADD 247 -#define SKINICON_OTHER_POPUP 248 -#define SKINICON_OTHER_NOPOPUP 249 -#define SKINICON_OTHER_KEYS 250 -#define SKINICON_OTHER_SOUND 251 -#define SKINICON_OTHER_EDIT 252 -#define SKINICON_OTHER_BLANK 253 +#define SKINICON_OTHER_FRAME 240 +#define SKINICON_AUTH_ADD 241 +#define SKINICON_AUTH_REQUEST 242 +#define SKINICON_AUTH_GRANT 243 +#define SKINICON_AUTH_REVOKE 244 +#define SKINICON_OTHER_GROUPADD 245 +#define SKINICON_OTHER_POPUP 246 +#define SKINICON_OTHER_NOPOPUP 247 +#define SKINICON_OTHER_KEYS 248 +#define SKINICON_OTHER_SOUND 249 +#define SKINICON_OTHER_EDIT 250 +#define SKINICON_OTHER_BLANK 251 ///////////////////////////////////////////////////////////////////////////////////////// // Miranda skin diff --git a/src/mir_app/res/always_visible.ico b/src/mir_app/res/always_visible.ico deleted file mode 100644 index 1bc8480355..0000000000 Binary files a/src/mir_app/res/always_visible.ico and /dev/null differ diff --git a/src/mir_app/res/never_visible.ico b/src/mir_app/res/never_visible.ico deleted file mode 100644 index 12a69a5807..0000000000 Binary files a/src/mir_app/res/never_visible.ico and /dev/null differ diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 9aaf8b1a00..b683748fde 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -1596,10 +1596,6 @@ IDI_ON ICON "On.ico" IDI_OFF ICON "Off.ico" -IDI_ALWAYSVIS ICON "always_visible.ico" - -IDI_NEVERVIS ICON "never_visible.ico" - IDI_CHAT ICON "chat_channel.ico" IDI_MALE ICON "male.ico" diff --git a/src/mir_app/src/ei_defaulticons.cpp b/src/mir_app/src/ei_defaulticons.cpp index f228c4c7af..dea63a7409 100644 --- a/src/mir_app/src/ei_defaulticons.cpp +++ b/src/mir_app/src/ei_defaulticons.cpp @@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA. //////////////////////////////////////////////////////////////////////////////////////// // DB extra icons -HANDLE hExtraVisibility, hExtraChat, hExtraChatMute, hExtraGender, hExtraProto; +HANDLE hExtraChat, hExtraChatMute, hExtraGender, hExtraProto; static void SetVisibility(MCONTACT hContact, int apparentMode, bool clear) { @@ -43,7 +43,7 @@ static void SetVisibility(MCONTACT hContact, int apparentMode, bool clear) if (apparentMode <= 0) apparentMode = db_get_w(hContact, proto, "ApparentMode", 0); - HANDLE hExtraIcon, hIcolib = nullptr; + HANDLE hExtraIcon = nullptr, hIcolib = nullptr; // Is chat if (Contact::IsGroupChat(hContact, proto)) { @@ -51,13 +51,6 @@ static void SetVisibility(MCONTACT hContact, int apparentMode, bool clear) if (apparentMode == ID_STATUS_OFFLINE) hIcolib = IcoLib_GetIconHandle("ChatActivity"); } - else { // Not chat - hExtraIcon = hExtraVisibility; - if (apparentMode == ID_STATUS_OFFLINE) - hIcolib = Skin_GetIconHandle(SKINICON_OTHER_INVISIBLE_ALL); - else if (apparentMode == ID_STATUS_ONLINE) - hIcolib = Skin_GetIconHandle(SKINICON_OTHER_VISIBLE_ALL); - } if (hIcolib != nullptr || clear) ExtraIcon_SetIcon(hExtraIcon, hContact, hIcolib); @@ -315,7 +308,6 @@ void DefaultExtraIcons_Load() { hExtraChat = ExtraIcon_RegisterIcolib("chat_activity", LPGEN("Chat activity"), "ChatActivity"); hExtraChatMute = ExtraIcon_RegisterIcolib("chat_mute", LPGEN("Chat mute mode"), "ChatMute"); - hExtraVisibility = ExtraIcon_RegisterIcolib("visibility", LPGEN("Visibility"), Skin_GetIconHandle(SKINICON_OTHER_VISIBLE_ALL)); hExtraGender = ExtraIcon_RegisterIcolib("gender", LPGEN("Gender"), "gender_male", nullptr, 0, EIF_DISABLED_BY_DEFAULT); hExtraProto = ExtraIcon_RegisterCallback("protocol", LPGEN("Account"), Skin_GetIconHandle(SKINICON_OTHER_ACCMGR), &ProtocolRebuildIcons, &ProtocolApplyIcon, &ProtocolOnClick, 0, EIF_DISABLED_BY_DEFAULT); diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index 1576f6d873..5d7c3e08d0 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -76,9 +76,7 @@ #define IDR_CONTEXT 180 #define IDR_ICOLIB_CONTEXT 181 #define IDC_DROP 183 -#define IDI_ALWAYSVIS 184 #define IDD_EI_OPTIONS 185 -#define IDI_NEVERVIS 186 #define IDI_CHAT 187 #define IDI_MALE 188 #define IDI_FEMALE 189 diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp index 042c3d0737..5941c5b929 100644 --- a/src/mir_app/src/skinicons.cpp +++ b/src/mir_app/src/skinicons.cpp @@ -97,8 +97,6 @@ static struct StandardIconDescription mainIcons[] = { SKINICON_OTHER_EDIT, LPGEN("Edit"), -IDI_TYPING, 0, nullptr }, // 56 { SKINICON_OTHER_BLANK, LPGEN("Blank"), -IDI_BLANK, 0, nullptr }, // 57 - { SKINICON_OTHER_VISIBLE_ALL, LPGEN("Always visible"), -IDI_ALWAYSVIS, 0, LPGEN("Contact list") }, - { SKINICON_OTHER_INVISIBLE_ALL, LPGEN("Always invisible"), -IDI_NEVERVIS, 0, LPGEN("Contact list") }, { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, LPGEN("Status icons") }, }; -- cgit v1.2.3