From 56bdae442699a6defb1b783ed4d8e81824acf8de Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 29 May 2019 14:12:44 +0300 Subject: all icons with keys replaced with skin password icon SKINICON_OTHER_KEYS --- protocols/FacebookRM/res/key.ico | Bin 1150 -> 0 bytes protocols/FacebookRM/src/captcha.cpp | 2 +- protocols/FacebookRM/src/resource.h | 1 - protocols/FacebookRM/src/theme.cpp | 1 - protocols/JabberG/res/jabber.rc | 1 - protocols/JabberG/res/key.ico | Bin 1150 -> 0 bytes protocols/JabberG/src/jabber_captcha.cpp | 2 +- protocols/JabberG/src/jabber_disco.cpp | 48 +++++++++++++++--------------- protocols/JabberG/src/jabber_icolib.cpp | 1 - protocols/JabberG/src/jabber_menu.cpp | 2 +- protocols/JabberG/src/jabber_password.cpp | 2 +- protocols/JabberG/src/resource.h | 1 - protocols/VKontakte/res/key.ico | Bin 1150 -> 0 bytes protocols/VKontakte/res/resource.rc | 2 -- protocols/VKontakte/src/misc.cpp | 1 - protocols/VKontakte/src/resource.h | 1 - protocols/VKontakte/src/vk_dialogs.cpp | 2 +- 17 files changed, 29 insertions(+), 38 deletions(-) delete mode 100644 protocols/FacebookRM/res/key.ico delete mode 100644 protocols/JabberG/res/key.ico delete mode 100644 protocols/VKontakte/res/key.ico (limited to 'protocols') diff --git a/protocols/FacebookRM/res/key.ico b/protocols/FacebookRM/res/key.ico deleted file mode 100644 index 44df000c12..0000000000 Binary files a/protocols/FacebookRM/res/key.ico and /dev/null differ diff --git a/protocols/FacebookRM/src/captcha.cpp b/protocols/FacebookRM/src/captcha.cpp index 6c9d2335a6..23226857c4 100644 --- a/protocols/FacebookRM/src/captcha.cpp +++ b/protocols/FacebookRM/src/captcha.cpp @@ -39,7 +39,7 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - Window_SetIcon_IcoLib(hwndDlg, g_plugin.getIconHandle(IDI_KEYS)); + Window_SetIcon_IcoLib(hwndDlg, Skin_GetIconHandle(SKINICON_OTHER_KEYS)); params = (CAPTCHA_FORM_PARAMS*)lParam; SetDlgItemText(hwndDlg, IDC_INSTRUCTION, TranslateT("Enter the text you see")); diff --git a/protocols/FacebookRM/src/resource.h b/protocols/FacebookRM/src/resource.h index f898412dfa..4044214338 100644 --- a/protocols/FacebookRM/src/resource.h +++ b/protocols/FacebookRM/src/resource.h @@ -18,7 +18,6 @@ #define IDI_FRIENDS 130 #define IDI_CONVERSATION 131 #define IDI_READ 132 -#define IDI_KEYS 133 #define IDD_GUARD 134 #define IDI_ANGRY 135 #define IDI_HAHA 136 diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index be9a232bc1..9c0400456a 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -43,7 +43,6 @@ static IconItem icons[] = { LPGEN("Friendship details"), "friendship", IDI_FRIENDS }, { LPGEN("Conversation"), "conversation", IDI_CONVERSATION }, { LPGEN("Message read"), "read", IDI_READ }, - { LPGEN("Captcha form icon"), "key", IDI_KEYS }, { LPGEN("Angry"), "angry", IDI_ANGRY }, { LPGEN("Haha"), "haha", IDI_HAHA }, { LPGEN("Like"), "like", IDI_LIKE }, diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc index 3083e80746..9eb385fca4 100644 --- a/protocols/JabberG/res/jabber.rc +++ b/protocols/JabberG/res/jabber.rc @@ -783,7 +783,6 @@ IDI_NODE_WEATHER ICON "weather.ico" IDI_DISCO_OK ICON "disco_ok.ico" IDI_DISCO_FAIL ICON "disco_fail.ico" IDI_GROUP ICON "group.ico" -IDI_KEYS ICON "key.ico" IDI_ADDCONTACT ICON "addcontact.ico" IDI_AGENTS ICON "roster.ico" IDI_VCARD ICON "pages.ico" diff --git a/protocols/JabberG/res/key.ico b/protocols/JabberG/res/key.ico deleted file mode 100644 index 44df000c12..0000000000 Binary files a/protocols/JabberG/res/key.ico and /dev/null differ diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp index 6ccecae9c8..a462b82f57 100644 --- a/protocols/JabberG/src/jabber_captcha.cpp +++ b/protocols/JabberG/src/jabber_captcha.cpp @@ -44,7 +44,7 @@ INT_PTR CALLBACK JabberCaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, switch (msg) { case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - Window_SetSkinIcon_IcoLib(hwndDlg, IDI_KEYS); + Window_SetIcon_IcoLib(hwndDlg, Skin_GetIconHandle(SKINICON_OTHER_KEYS)); params = (CAPTCHA_FORM_PARAMS*)lParam; const char *hint = params->hint; diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index baba3a7fce..0b63c8b10d 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -63,39 +63,39 @@ struct static sttNodeIcons[] = { // standard identities: http://www.xmpp.org/registrar/disco-categories.html#directory - {nullptr, "account", nullptr, 0, SKINICON_STATUS_ONLINE}, - {nullptr, "auth", nullptr, IDI_KEYS, 0}, - {nullptr, "automation", nullptr, IDI_COMMAND, 0}, - {nullptr, "client", nullptr, 0, SKINICON_STATUS_ONLINE}, - {nullptr, "collaboration", nullptr, IDI_GROUP, 0}, - {nullptr, "conference", nullptr, IDI_GROUP, 0}, - - {nullptr, "directory", "chatroom", IDI_GROUP, 0}, - {nullptr, "directory", "group", IDI_GROUP, 0}, - {nullptr, "directory", "user", 0, SKINICON_OTHER_FINDUSER}, - {nullptr, "directory", nullptr, 0, SKINICON_OTHER_SEARCHALL}, + { nullptr, "account", nullptr, 0, SKINICON_STATUS_ONLINE }, + { nullptr, "auth", nullptr, 0, SKINICON_OTHER_KEYS }, + { nullptr, "automation", nullptr, IDI_COMMAND, 0 }, + { nullptr, "client", nullptr, 0, SKINICON_STATUS_ONLINE }, + { nullptr, "collaboration", nullptr, IDI_GROUP, 0 }, + { nullptr, "conference", nullptr, IDI_GROUP, 0 }, - {nullptr, "gateway", nullptr, IDI_AGENTS, 0}, + { nullptr, "directory", "chatroom", IDI_GROUP, 0 }, + { nullptr, "directory", "group", IDI_GROUP, 0 }, + { nullptr, "directory", "user", 0, SKINICON_OTHER_FINDUSER }, + { nullptr, "directory", nullptr, 0, SKINICON_OTHER_SEARCHALL }, - {nullptr, "headline", "rss", IDI_NODE_RSS, 0}, - {nullptr, "headline", "weather", IDI_NODE_WEATHER, 0}, + { nullptr, "gateway", nullptr, IDI_AGENTS, 0 }, - {nullptr, "proxy", nullptr, 0, SKINICON_EVENT_FILE}, + { nullptr, "headline", "rss", IDI_NODE_RSS, 0 }, + { nullptr, "headline", "weather", IDI_NODE_WEATHER, 0 }, - {nullptr, "server", nullptr, IDI_NODE_SERVER, 0}, + { nullptr, "proxy", nullptr, 0, SKINICON_EVENT_FILE }, - {nullptr, "store", nullptr, IDI_NODE_STORE, 0}, + { nullptr, "server", nullptr, IDI_NODE_SERVER, 0 }, + + { nullptr, "store", nullptr, IDI_NODE_STORE, 0 }, // icons for non-standard identities - {nullptr, "x-service", "x-rss", IDI_NODE_RSS, 0}, - {nullptr, "application", "x-weather", IDI_NODE_WEATHER, 0}, - {nullptr, "user", nullptr, 0, SKINICON_STATUS_ONLINE}, + { nullptr, "x-service", "x-rss", IDI_NODE_RSS, 0 }, + { nullptr, "application", "x-weather", IDI_NODE_WEATHER, 0 }, + { nullptr, "user", nullptr, 0, SKINICON_STATUS_ONLINE }, // icon suggestions based on supported features - {"jabber:iq:gateway", nullptr, nullptr, IDI_AGENTS, 0}, - {"jabber:iq:search", nullptr, nullptr, 0, SKINICON_OTHER_FINDUSER}, - {JABBER_FEAT_COMMANDS, nullptr, nullptr, IDI_COMMAND, 0}, - {JABBER_FEAT_REGISTER, nullptr, nullptr, IDI_KEYS, 0}, + { "jabber:iq:gateway", nullptr, nullptr, IDI_AGENTS, 0 }, + { "jabber:iq:search", nullptr, nullptr, 0, SKINICON_OTHER_FINDUSER }, + { JABBER_FEAT_COMMANDS, nullptr, nullptr, IDI_COMMAND, 0 }, + { JABBER_FEAT_REGISTER, nullptr, nullptr, 0, SKINICON_OTHER_KEYS }, }; void CJabberProto::OnIqResultServiceDiscoveryInfo(const TiXmlElement *iqNode, CJabberIqInfo *pInfo) diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index 6143bfc146..620600bf0f 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -413,7 +413,6 @@ static IconItem sharedIconList1[] = { LPGEN("Agents list"), "Agents", IDI_AGENTS }, { LPGEN("Transports"), "transport", IDI_TRANSPORT }, { LPGEN("Registered transports"), "transport_loc", IDI_TRANSPORTL }, - { LPGEN("Change password"), "key", IDI_KEYS }, { LPGEN("Personal vCard"), "vcard", IDI_VCARD }, { LPGEN("Convert to room"), "convert", IDI_USER2ROOM }, { LPGEN("Login/logout"), "trlogonoff", IDI_LOGIN }, diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index bfb1250cd9..0f7fcf3409 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -592,7 +592,7 @@ void CJabberProto::OnBuildProtoMenu() CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleChangePassword); mi.name.a = LPGEN("Change Password"); mi.position = 2000050007; - mi.hIcolibItem = g_plugin.getIconHandle(IDI_KEYS); + mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_KEYS); m_hMenuChangePassword = Menu_AddProtoMenuItem(&mi, m_szModuleName); // "Roster editor" diff --git a/protocols/JabberG/src/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp index b80679f565..e69a1f444b 100644 --- a/protocols/JabberG/src/jabber_password.cpp +++ b/protocols/JabberG/src/jabber_password.cpp @@ -41,7 +41,7 @@ public: bool OnInitDialog() override { m_proto->m_hwndJabberChangePassword = m_hwnd; - Window_SetIcon_IcoLib(m_hwnd, g_plugin.getIconHandle(IDI_KEYS)); + Window_SetIcon_IcoLib(m_hwnd, Skin_GetIconHandle(SKINICON_OTHER_KEYS)); if (m_proto->m_bJabberOnline && m_proto->m_ThreadInfo != nullptr) { char text[1024]; diff --git a/protocols/JabberG/src/resource.h b/protocols/JabberG/src/resource.h index 3a216aa680..20c587c95d 100644 --- a/protocols/JabberG/src/resource.h +++ b/protocols/JabberG/src/resource.h @@ -37,7 +37,6 @@ #define IDD_CHANGEPASSWORD 136 #define IDD_SEARCHUSER 138 #define IDD_OPT_JABBER2 140 -#define IDI_KEYS 144 #define IDI_GROUP 147 #define IDD_GROUPCHAT_JOIN 148 #define IDI_AGENTS 154 diff --git a/protocols/VKontakte/res/key.ico b/protocols/VKontakte/res/key.ico deleted file mode 100644 index 44df000c12..0000000000 Binary files a/protocols/VKontakte/res/key.ico and /dev/null differ diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc index 52f849a8b7..096a4649f0 100644 --- a/protocols/VKontakte/res/resource.rc +++ b/protocols/VKontakte/res/resource.rc @@ -41,8 +41,6 @@ IDI_VISITPROFILE ICON "home.ico" IDI_HISTORY ICON "history.ico" -IDI_KEYS ICON "key.ico" - IDI_BROADCAST ICON "broadcast.ico" IDI_STATUS ICON "status.ico" diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 1c61b92f4d..d0b75e0e6f 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -62,7 +62,6 @@ bool wlstrstr(wchar_t *_s1, wchar_t *_s2) static IconItem iconList[] = { - { LPGEN("Captcha form icon"), "key", IDI_KEYS }, { LPGEN("Notification icon"), "notification", IDI_NOTIFICATION }, { LPGEN("Read message icon"), "read", IDI_READMSG }, { LPGEN("Visit profile icon"), "profile", IDI_VISITPROFILE }, diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h index fbe4aadc7d..a125e5184a 100644 --- a/protocols/VKontakte/src/resource.h +++ b/protocols/VKontakte/src/resource.h @@ -26,7 +26,6 @@ #define IDI_MARKMESSAGESASREAD 122 #define IDD_OPT_MENU 122 #define IDD_CONTACTDELETE 123 -#define IDI_KEYS 203 #define IDC_LOGIN 1001 #define IDC_PASSWORD 1002 #define IDC_URL 1003 diff --git a/protocols/VKontakte/src/vk_dialogs.cpp b/protocols/VKontakte/src/vk_dialogs.cpp index 8616098d7f..3d37a066b5 100644 --- a/protocols/VKontakte/src/vk_dialogs.cpp +++ b/protocols/VKontakte/src/vk_dialogs.cpp @@ -34,7 +34,7 @@ CVkCaptchaForm::CVkCaptchaForm(CVkProto *proto, CAPTCHA_FORM_PARAMS *param) : bool CVkCaptchaForm::OnInitDialog() { - Window_SetIcon_IcoLib(m_hwnd, g_plugin.getIconHandle(IDI_KEYS)); + Window_SetIcon_IcoLib(m_hwnd, Skin_GetIconHandle(SKINICON_OTHER_KEYS)); m_btnOk.Disable(); m_btnOpenInBrowser.Enable((m_param->bmp != nullptr)); -- cgit v1.2.3