diff options
| author | George Hazan <ghazan@miranda.im> | 2022-07-24 17:32:34 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-07-24 17:32:34 +0300 |
| commit | 3c43a0c80558f3f8ae35b8fc543e482ab255c1aa (patch) | |
| tree | 546c7b58935ae263a081b00de5760e7689867255 | |
| parent | e55d071e5485a937efd427d159b76c208cccdcce (diff) | |
fixes #3124 (Jabber: у действия "Edit" значок "Rename")
| -rw-r--r-- | include/m_skin.h | 1 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_bookmarks.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_notes.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_privacy.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/skinicons.cpp | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/include/m_skin.h b/include/m_skin.h index 1261c7330b..d40848c3bd 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -91,6 +91,7 @@ #define SKINICON_OTHER_NOPOPUP 249
#define SKINICON_OTHER_KEYS 250
#define SKINICON_OTHER_SOUND 251
+#define SKINICON_OTHER_EDIT 252
/////////////////////////////////////////////////////////////////////////////////////////
// Miranda skin
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index 6219126763..0c9944677a 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -172,7 +172,7 @@ public: CJabberDlgBookmarks(CJabberProto *proto) :
CSuper(proto, IDD_BOOKMARKS),
m_btnAdd(this, IDC_ADD, SKINICON_OTHER_ADDCONTACT, LPGEN("Add")),
- m_btnEdit(this, IDC_EDIT, SKINICON_OTHER_RENAME, LPGEN("Edit")),
+ m_btnEdit(this, IDC_EDIT, SKINICON_OTHER_EDIT, LPGEN("Edit")),
m_btnRemove(this, IDC_REMOVE, SKINICON_OTHER_DELETE, LPGEN("Remove")),
m_lvBookmarks(this, IDC_BM_LIST)
{
diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp index 5986fc701e..6734e7c26c 100644 --- a/protocols/JabberG/src/jabber_notes.cpp +++ b/protocols/JabberG/src/jabber_notes.cpp @@ -484,7 +484,7 @@ public: CJabberDlgNotes(CJabberProto *proto) :
CSuper(proto, IDD_NOTEBOOK),
m_btnAdd(this, IDC_ADD, SKINICON_OTHER_ADDCONTACT, LPGEN("Add")),
- m_btnEdit(this, IDC_EDIT, SKINICON_OTHER_RENAME, LPGEN("Edit")),
+ m_btnEdit(this, IDC_EDIT, SKINICON_OTHER_EDIT, LPGEN("Edit")),
m_btnRemove(this, IDC_REMOVE, SKINICON_OTHER_DELETE, LPGEN("Remove")),
m_lstNotes(this, IDC_LST_NOTES),
m_tvFilter(this, IDC_TV_FILTER),
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index c511356aef..524ba78841 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -1219,7 +1219,7 @@ public: m_btnAddJid(this, IDC_ADDJID, g_plugin.getIcon(IDI_ADDCONTACT), LPGEN("Add JID")),
m_btnActivate(this, IDC_ACTIVATE, g_plugin.getIcon(IDI_PL_LIST_ACTIVE), LPGEN("Activate")),
m_btnSetDefault(this, IDC_SET_DEFAULT, g_plugin.getIcon(IDI_PL_LIST_DEFAULT), LPGEN("Set default")),
- m_btnEditRule(this, IDC_EDIT_RULE, SKINICON_OTHER_RENAME, LPGEN("Edit rule")),
+ m_btnEditRule(this, IDC_EDIT_RULE, SKINICON_OTHER_EDIT, LPGEN("Edit rule")),
m_btnAddRule(this, IDC_ADD_RULE, SKINICON_OTHER_ADDCONTACT, LPGEN("Add rule")),
m_btnRemoveRule(this, IDC_REMOVE_RULE, SKINICON_OTHER_DELETE, LPGEN("Delete rule")),
m_btnUpRule(this, IDC_UP_RULE, g_plugin.getIcon(IDI_ARROW_UP), LPGEN("Move rule up")),
diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp index e5c27a87da..8994333313 100644 --- a/src/mir_app/src/skinicons.cpp +++ b/src/mir_app/src/skinicons.cpp @@ -94,6 +94,7 @@ static struct StandardIconDescription mainIcons[] = { SKINICON_ERROR, LPGEN("Error"), -IDI_MERROR, 0, nullptr }, // 53
{ SKINICON_WARNING, LPGEN("Warning"), -IDI_MWARNING, 0, nullptr }, // 54
{ SKINICON_INFORMATION, LPGEN("Information"), -IDI_MINFO, 0, nullptr }, // 55
+ { SKINICON_OTHER_EDIT, LPGEN("Edit"), -IDI_TYPING, 0, nullptr }, // 56
{ 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") },
|