diff options
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/res/jabber.rc | 1 | ||||
| -rw-r--r-- | protocols/JabberG/res/key.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | protocols/JabberG/src/jabber_captcha.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_disco.cpp | 48 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_icolib.cpp | 1 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_password.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/resource.h | 1 |
8 files changed, 27 insertions, 30 deletions
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 Binary files differdeleted file mode 100644 index 44df000c12..0000000000 --- a/protocols/JabberG/res/key.ico +++ /dev/null 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
|