From c02b03b9853fa99fbd5d6618cbfd20ce5f99db1b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 7 Oct 2024 14:26:59 +0300 Subject: Scriver: useless icon removed --- plugins/Scriver/res/resource.rc | 2 -- plugins/Scriver/src/globals.cpp | 29 ++++++++++++++--------------- plugins/Scriver/src/msgs.cpp | 2 +- plugins/Scriver/src/resource.h | 1 - 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index ffcf50c076..487a396b6e 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -428,8 +428,6 @@ END // remains consistent on all systems. IDI_ADDCONTACT ICON "addcontact.ico" -IDI_USERDETAILS ICON "details.ico" - IDI_HISTORY ICON "history.ico" IDI_SEND ICON "send.ico" diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index 6ec8c203bd..a6e7023f36 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -28,21 +28,20 @@ GlobalMessageData g_dat; static IconItem iconList1[] = { { LPGEN("Add contact"), "ADD", IDI_ADDCONTACT }, // 1 - { LPGEN("User's details"), "USERDETAILS", IDI_USERDETAILS }, // 2 - { LPGEN("User's history"), "HISTORY", IDI_HISTORY }, // 3 - { LPGEN("Send message"), "SEND", IDI_SEND }, // 4 - { LPGEN("Smiley button"), "SMILEY", IDI_SMILEY }, // 5 - { LPGEN("User is typing"), "TYPING", IDI_TYPING }, // 6 - { LPGEN("Typing notification off"), "TYPINGOFF", IDI_TYPINGOFF }, // 7 - { LPGEN("Sending"), "DELIVERING", IDI_TIMESTAMP }, // 8 - { LPGEN("Quote button"), "QUOTE", IDI_QUOTE }, // 9 - { LPGEN("Close button"), "CLOSEX", IDI_CLOSEX }, // 10 - { LPGEN("Icon overlay"), "OVERLAY", IDI_OVERLAY }, // 11 - { LPGEN("Incoming message (10x10)"), "INCOMING", IDI_INCOMING, 10}, // 12 - { LPGEN("Outgoing message (10x10)"), "OUTGOING", IDI_OUTGOING, 10}, // 13 - { LPGEN("Notice (10x10)"), "NOTICE", IDI_NOTICE, 10}, // 14 - { LPGEN("Secure message (10x10)"), "SECURE", IDI_SECURE, 10}, // 15 - { LPGEN("Secure verified message (10x10)"), "STRONG", IDI_STRONG, 10}, // 16 + { LPGEN("User's history"), "HISTORY", IDI_HISTORY }, // 2 + { LPGEN("Send message"), "SEND", IDI_SEND }, // 3 + { LPGEN("Smiley button"), "SMILEY", IDI_SMILEY }, // 4 + { LPGEN("User is typing"), "TYPING", IDI_TYPING }, // 5 + { LPGEN("Typing notification off"), "TYPINGOFF", IDI_TYPINGOFF }, // 6 + { LPGEN("Sending"), "DELIVERING", IDI_TIMESTAMP }, // 7 + { LPGEN("Quote button"), "QUOTE", IDI_QUOTE }, // 8 + { LPGEN("Close button"), "CLOSEX", IDI_CLOSEX }, // 9 + { LPGEN("Icon overlay"), "OVERLAY", IDI_OVERLAY }, // 10 + { LPGEN("Incoming message (10x10)"), "INCOMING", IDI_INCOMING, 10}, // 11 + { LPGEN("Outgoing message (10x10)"), "OUTGOING", IDI_OUTGOING, 10}, // 12 + { LPGEN("Notice (10x10)"), "NOTICE", IDI_NOTICE, 10}, // 13 + { LPGEN("Secure message (10x10)"), "SECURE", IDI_SECURE, 10}, // 14 + { LPGEN("Secure verified message (10x10)"), "STRONG", IDI_STRONG, 10}, // 15 }; static IconItem iconList2[] = diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index d1eab61301..7414955646 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -381,7 +381,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_DETAILS; bbd.dwDefPos = 40; - bbd.hIcon = g_plugin.getIconHandle(IDI_USERDETAILS); + bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS); bbd.pwszText = LPGENW("User &details"); bbd.pwszTooltip = LPGENW("View user's details"); g_plugin.addButton(&bbd); diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h index 7f5bb9ed3d..9fc3b2e7dc 100644 --- a/plugins/Scriver/src/resource.h +++ b/plugins/Scriver/src/resource.h @@ -15,7 +15,6 @@ #define IDD_OPT_MSGTABS 115 #define IDD_OPT_LAYOUT 116 #define IDI_ADDCONTACT 120 -#define IDI_USERDETAILS 121 #define IDI_HISTORY 122 #define IDI_SEND 123 #define IDI_SMILEY 125 -- cgit v1.2.3