summaryrefslogtreecommitdiff
path: root/plugins/MenuItemEx
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-06-14 15:27:15 +0000
committerRobert Pösel <robyer@seznam.cz>2013-06-14 15:27:15 +0000
commit6e422260d5f5ffe10daf5e6d16aae451590a25e0 (patch)
tree72e44f9e3f57bc133ee340d5f010b2bf9c00df64 /plugins/MenuItemEx
parent0d6706f24c377d7f52a0584ee830fde4e789baae (diff)
MenuItemEx: Used core auth icons.
git-svn-id: http://svn.miranda-ng.org/main/trunk@4937 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MenuItemEx')
-rw-r--r--plugins/MenuItemEx/res/auth_added.icobin1150 -> 0 bytes
-rw-r--r--plugins/MenuItemEx/res/auth_ask.icobin1150 -> 0 bytes
-rw-r--r--plugins/MenuItemEx/res/resource.rc2
-rw-r--r--plugins/MenuItemEx/src/main.cpp12
-rw-r--r--plugins/MenuItemEx/src/resource.h2
5 files changed, 5 insertions, 11 deletions
diff --git a/plugins/MenuItemEx/res/auth_added.ico b/plugins/MenuItemEx/res/auth_added.ico
deleted file mode 100644
index 1dbafdc342..0000000000
--- a/plugins/MenuItemEx/res/auth_added.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/MenuItemEx/res/auth_ask.ico b/plugins/MenuItemEx/res/auth_ask.ico
deleted file mode 100644
index d0bc40eb89..0000000000
--- a/plugins/MenuItemEx/res/auth_ask.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/MenuItemEx/res/resource.rc b/plugins/MenuItemEx/res/resource.rc
index 47d0f24e47..5d5c6430b0 100644
--- a/plugins/MenuItemEx/res/resource.rc
+++ b/plugins/MenuItemEx/res/resource.rc
@@ -30,8 +30,6 @@ IDI_ICON0 ICON "hide_from_list.ico"
IDI_ICON1 ICON "Always Visible.ico"
IDI_ICON2 ICON "Never Visible.ico"
IDI_ICON3 ICON "copyid_overlay.ico"
-IDI_ICON4 ICON "auth_added.ico"
-IDI_ICON5 ICON "auth_ask.ico"
IDI_ICON6 ICON "change_proto.ico"
IDI_ICON7 ICON "ignore_list.ico"
IDI_ICON8 ICON "show_in_list.ico"
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 9ced29f044..7021bdabc9 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -47,9 +47,7 @@ static IconItem iconList[] = {
{ LPGEN("Show in list"), "miex_showil", IDI_ICON8 },
{ LPGEN("Always visible"), "miex_vis", IDI_ICON1 },
{ LPGEN("Never visible"), "miex_invis", IDI_ICON2 },
- { LPGEN("Send 'You were added'"), "miex_added", IDI_ICON4 },
- { LPGEN("Request authorization"), "miex_authorization", IDI_ICON5 },
- { LPGEN("Copy to Account"), "miex_protocol", IDI_ICON6 },
+ { LPGEN("Copy to Account"), "miex_protocol", IDI_ICON6 },
{ LPGEN("Ignore"), "miex_ignore", IDI_ICON7 },
{ LPGEN("Browse Received Files"), "miex_recfiles", IDI_ICON12 },
{ LPGEN("Copy MirVer"), "miex_copymver", IDI_ICON13 }
@@ -73,8 +71,8 @@ static const ii[] = {
{ LPGENT("URL"), IGNOREEVENT_URL, SKINICON_EVENT_URL },
{ LPGENT("Files"), IGNOREEVENT_FILE, SKINICON_EVENT_FILE },
{ LPGENT("User Online"), IGNOREEVENT_USERONLINE, SKINICON_OTHER_USERONLINE },
- { LPGENT("Authorization"), IGNOREEVENT_AUTHORIZATION, SKINICON_OTHER_MIRANDA },
- { LPGENT("You Were Added"), IGNOREEVENT_YOUWEREADDED, SKINICON_OTHER_ADDCONTACT },
+ { LPGENT("Authorization"), IGNOREEVENT_AUTHORIZATION, SKINICON_AUTH_REQUEST },
+ { LPGENT("You Were Added"), IGNOREEVENT_YOUWEREADDED, SKINICON_AUTH_ADD },
{ LPGENT("Typing Notify"), IGNOREEVENT_TYPINGNOTIFY, SKINICON_OTHER_TYPING }
};
@@ -1134,13 +1132,13 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
mi.position++;
mi.ptszName = LPGENT("Send 'You were added'");
mi.pszService = MS_ADDED;
- mi.hIcon = Skin_GetIcon("miex_added");
+ mi.hIcon = LoadSkinnedIcon(SKINICON_AUTH_ADD);
hmenuAdded = Menu_AddContactMenuItem(&mi);
mi.position++;
mi.ptszName = LPGENT("Request authorization");
mi.pszService = MS_AUTHREQ;
- mi.hIcon = Skin_GetIcon("miex_authorization");
+ mi.hIcon = LoadSkinnedIcon(SKINICON_AUTH_REQUEST);
hmenuAuthReq = Menu_AddContactMenuItem(&mi);
mi.position++;
diff --git a/plugins/MenuItemEx/src/resource.h b/plugins/MenuItemEx/src/resource.h
index 18b7de34cd..d94600c900 100644
--- a/plugins/MenuItemEx/src/resource.h
+++ b/plugins/MenuItemEx/src/resource.h
@@ -8,8 +8,6 @@
#define IDI_ICON1 111
#define IDI_ICON2 112
#define IDI_ICON3 113
-#define IDI_ICON4 114
-#define IDI_ICON5 115
#define IDI_ICON6 116
#define IDI_ICON7 117
#define IDI_ICON8 118