diff options
| author | Robert Pösel <robyer@seznam.cz> | 2013-06-14 14:07:23 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2013-06-14 14:07:23 +0000 |
| commit | 58d0f51be9792eeca8eadd796ef849039efaf866 (patch) | |
| tree | 7b385f99f5e256f2bb9e54ce462d1f7b82f870d3 | |
| parent | 3c6f0aac31f72ebf98ab5ccc5b088cfa977a5126 (diff) | |
Added auth icons into core. Used those for auth events (instead of miranda logo icon). Also fixes #186
git-svn-id: http://svn.miranda-ng.org/main/trunk@4935 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/m_skin.h | 4 | ||||
| -rw-r--r-- | src/core/stdauth/auth.cpp | 4 | ||||
| -rw-r--r-- | src/modules/ignore/ignore.cpp | 2 | ||||
| -rw-r--r-- | src/modules/skin/skinicons.cpp | 104 | ||||
| -rw-r--r-- | src/res/auth_add.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | src/res/auth_grant.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | src/res/auth_request.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | src/res/auth_revoke.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | src/resource.h | 6 | ||||
| -rw-r--r-- | src/resource.rc | 4 |
10 files changed, 70 insertions, 54 deletions
diff --git a/include/m_skin.h b/include/m_skin.h index a57d79f238..53bf6fc4a4 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -91,6 +91,10 @@ __forceinline LPCSTR LoadSkinnedIconName(int id) { return (LPCSTR)CallService( #define SKINICON_OTHER_VISIBLE_ALL 244 // v.0.93.4+
#define SKINICON_OTHER_INVISIBLE_ALL 245 // v.0.93.4+
#define SKINICON_OTHER_FRAME 246 // v.0.94.1+
+#define SKINICON_AUTH_ADD 247 // v.0.94.4+
+#define SKINICON_AUTH_REQUEST 248 // v.0.94.4+
+#define SKINICON_AUTH_GRANT 249 // v.0.94.4+
+#define SKINICON_AUTH_REVOKE 250 // v.0.94.4+
//menu icons are owned by the module that uses them so are not and should not
//be skinnable. Except exit and show/hide
diff --git a/src/core/stdauth/auth.cpp b/src/core/stdauth/auth.cpp index 270bbb1436..7f349ede03 100644 --- a/src/core/stdauth/auth.cpp +++ b/src/core/stdauth/auth.cpp @@ -91,7 +91,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam) else
mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u requests authorization"), *(PDWORD)dbei.pBlob);
- cli.hIcon = LoadSkinIcon(SKINICON_OTHER_MIRANDA);
+ cli.hIcon = LoadSkinIcon(SKINICON_AUTH_REQUEST);
cli.pszService = MS_AUTH_SHOWREQUEST;
CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cli);
}
@@ -102,7 +102,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam) else
mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u added you to their contact list"), *(PDWORD)dbei.pBlob);
- cli.hIcon = LoadSkinIcon(SKINICON_OTHER_MIRANDA);
+ cli.hIcon = LoadSkinIcon(SKINICON_AUTH_ADD);
cli.pszService = MS_AUTH_SHOWADDED;
CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cli);
}
diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp index d719ca67a8..d5d8178103 100644 --- a/src/modules/ignore/ignore.cpp +++ b/src/modules/ignore/ignore.cpp @@ -202,7 +202,7 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_EVENT_URL);
ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_EVENT_FILE);
ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_USERONLINE);
- ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_MIRANDA);
+ ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_AUTH_REQUEST);
ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_ADDCONTACT);
ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_TYPING);
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index d2f602be45..ecd474a1d1 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -35,56 +35,60 @@ struct StandardIconDescription static struct StandardIconDescription mainIcons[] =
{
- { SKINICON_OTHER_MIRANDA, LPGEN("Miranda NG"), -IDI_MIRANDA }, // 0
- { SKINICON_EVENT_MESSAGE, LPGEN("Message"), -IDI_RECVMSG }, // 1
- { SKINICON_EVENT_URL, LPGEN("URL"), -IDI_URL }, // 2
- { SKINICON_EVENT_FILE, LPGEN("File"), -IDI_FILE }, // 3
- { SKINICON_OTHER_USERONLINE, LPGEN("User Online"), -IDI_USERONLINE }, // 4
- { SKINICON_OTHER_GROUPOPEN, LPGEN("Group (Open)"), -IDI_GROUPOPEN }, // 5
- { SKINICON_OTHER_GROUPSHUT, LPGEN("Group (Closed)"), -IDI_GROUPSHUT }, // 6
- { SKINICON_OTHER_CONNECTING, LPGEN("Connecting"), -IDI_LOAD }, // 7
- { SKINICON_OTHER_ADDCONTACT, LPGEN("Add Contact"), -IDI_ADDCONTACT }, // 8
- { SKINICON_OTHER_USERDETAILS, LPGEN("User Details"), -IDI_USERDETAILS }, // 9
- { SKINICON_OTHER_HISTORY, LPGEN("History"), -IDI_HISTORY }, // 10
- { SKINICON_OTHER_DOWNARROW, LPGEN("Down Arrow"), -IDI_DOWNARROW }, // 11
- { SKINICON_OTHER_FINDUSER, LPGEN("Find User"), -IDI_FINDUSER }, // 12
- { SKINICON_OTHER_OPTIONS, LPGEN("Options"), -IDI_OPTIONS }, // 13
- { SKINICON_OTHER_SENDEMAIL, LPGEN("Send E-mail"), -IDI_SENDEMAIL }, // 14
- { SKINICON_OTHER_DELETE, LPGEN("Delete"), -IDI_DELETE }, // 15
- { SKINICON_OTHER_RENAME, LPGEN("Rename"), -IDI_RENAME }, // 16
- { SKINICON_OTHER_SMS, LPGEN("SMS"), -IDI_SMS }, // 17
- { SKINICON_OTHER_SEARCHALL, LPGEN("Search All"), -IDI_SEARCHALL }, // 18
- { SKINICON_OTHER_TICK, LPGEN("Tick"), -IDI_TICK }, // 19
- { SKINICON_OTHER_NOTICK, LPGEN("No Tick"), -IDI_NOTICK }, // 20
- { SKINICON_OTHER_HELP, LPGEN("Help"), -IDI_HELP }, // 21
- { SKINICON_OTHER_MIRANDAWEB, LPGEN("Miranda Website"), -IDI_MIRANDAWEBSITE }, // 22
- { SKINICON_OTHER_TYPING, LPGEN("Typing"), -IDI_TYPING }, // 23
- { SKINICON_OTHER_SMALLDOT, LPGEN("Small Dot"), -IDI_SMALLDOT }, // 24
- { SKINICON_OTHER_FILLEDBLOB, LPGEN("Filled Blob"), -IDI_FILLEDBLOB }, // 25
- { SKINICON_OTHER_EMPTYBLOB, LPGEN("Empty Blob"), -IDI_EMPTYBLOB }, // 26
- { SKINICON_OTHER_UNICODE, LPGEN("Unicode plugin"), -IDI_UNICODE }, // 27
- { SKINICON_OTHER_ANSI, LPGEN("ANSI plugin"), -IDI_ANSI }, // 28
- { SKINICON_OTHER_LOADED, LPGEN("Running plugin"), -IDI_LOADED }, // 29
- { SKINICON_OTHER_NOTLOADED, LPGEN("Unloaded plugin"), -IDI_NOTLOADED }, // 30
- { SKINICON_OTHER_UNDO, LPGEN("Undo"), -IDI_UNDO }, // 31
- { SKINICON_OTHER_WINDOW, LPGEN("Window"), -IDI_WINDOW }, // 32
- { SKINICON_OTHER_WINDOWS, LPGEN("System"), -IDI_WINDOWS }, // 33
- { SKINICON_OTHER_ACCMGR, LPGEN("Accounts"), -IDI_ACCMGR }, // 34
- { SKINICON_OTHER_SHOWHIDE, LPGEN("ShowHide"), -IDI_SHOWHIDE }, // 35
- { SKINICON_OTHER_EXIT, LPGEN("Exit"), -IDI_EXIT }, // 36
- { SKINICON_OTHER_MAINMENU, LPGEN("Main Menu"), -IDI_MAINMENU }, // 37
- { SKINICON_OTHER_STATUS, LPGEN("Status"), -IDI_ONLINE }, // 38
- { SKINICON_CHAT_JOIN, LPGEN("Join chat"), -IDI_JOINCHAT }, // 39
- { SKINICON_CHAT_LEAVE, LPGEN("Leave chat"), -IDI_LEAVECHAT }, // 40
- { SKINICON_OTHER_GROUP, LPGEN("Move to Group"), -IDI_MOVETOGROUP }, // 41
- { SKINICON_OTHER_ON, LPGEN("On"), -IDI_ON }, // 42
- { SKINICON_OTHER_OFF, LPGEN("Off"), -IDI_OFF }, // 43
- { SKINICON_OTHER_LOADEDGRAY, LPGEN("Running core plugin"), -IDI_LOADED_GRAY }, // 44
- { SKINICON_OTHER_NOTLOADEDGRAY, LPGEN("Non-loadable plugin"), -IDI_NOTLOADED_GRAY }, // 45
- { SKINICON_OTHER_FRAME, LPGEN("Frames"), -IDI_FRAME }, // 46
- { 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") },
- { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, LPGEN("Status Icons") },
+ { SKINICON_OTHER_MIRANDA, LPGEN("Miranda NG"), -IDI_MIRANDA }, // 0
+ { SKINICON_EVENT_MESSAGE, LPGEN("Message"), -IDI_RECVMSG }, // 1
+ { SKINICON_EVENT_URL, LPGEN("URL"), -IDI_URL }, // 2
+ { SKINICON_EVENT_FILE, LPGEN("File"), -IDI_FILE }, // 3
+ { SKINICON_OTHER_USERONLINE, LPGEN("User Online"), -IDI_USERONLINE }, // 4
+ { SKINICON_OTHER_GROUPOPEN, LPGEN("Group (Open)"), -IDI_GROUPOPEN }, // 5
+ { SKINICON_OTHER_GROUPSHUT, LPGEN("Group (Closed)"), -IDI_GROUPSHUT }, // 6
+ { SKINICON_OTHER_CONNECTING, LPGEN("Connecting"), -IDI_LOAD }, // 7
+ { SKINICON_OTHER_ADDCONTACT, LPGEN("Add Contact"), -IDI_ADDCONTACT }, // 8
+ { SKINICON_OTHER_USERDETAILS, LPGEN("User Details"), -IDI_USERDETAILS }, // 9
+ { SKINICON_OTHER_HISTORY, LPGEN("History"), -IDI_HISTORY }, // 10
+ { SKINICON_OTHER_DOWNARROW, LPGEN("Down Arrow"), -IDI_DOWNARROW }, // 11
+ { SKINICON_OTHER_FINDUSER, LPGEN("Find User"), -IDI_FINDUSER }, // 12
+ { SKINICON_OTHER_OPTIONS, LPGEN("Options"), -IDI_OPTIONS }, // 13
+ { SKINICON_OTHER_SENDEMAIL, LPGEN("Send E-mail"), -IDI_SENDEMAIL }, // 14
+ { SKINICON_OTHER_DELETE, LPGEN("Delete"), -IDI_DELETE }, // 15
+ { SKINICON_OTHER_RENAME, LPGEN("Rename"), -IDI_RENAME }, // 16
+ { SKINICON_OTHER_SMS, LPGEN("SMS"), -IDI_SMS }, // 17
+ { SKINICON_OTHER_SEARCHALL, LPGEN("Search All"), -IDI_SEARCHALL }, // 18
+ { SKINICON_OTHER_TICK, LPGEN("Tick"), -IDI_TICK }, // 19
+ { SKINICON_OTHER_NOTICK, LPGEN("No Tick"), -IDI_NOTICK }, // 20
+ { SKINICON_OTHER_HELP, LPGEN("Help"), -IDI_HELP }, // 21
+ { SKINICON_OTHER_MIRANDAWEB, LPGEN("Miranda Website"), -IDI_MIRANDAWEBSITE }, // 22
+ { SKINICON_OTHER_TYPING, LPGEN("Typing"), -IDI_TYPING }, // 23
+ { SKINICON_OTHER_SMALLDOT, LPGEN("Small Dot"), -IDI_SMALLDOT }, // 24
+ { SKINICON_OTHER_FILLEDBLOB, LPGEN("Filled Blob"), -IDI_FILLEDBLOB }, // 25
+ { SKINICON_OTHER_EMPTYBLOB, LPGEN("Empty Blob"), -IDI_EMPTYBLOB }, // 26
+ { SKINICON_OTHER_UNICODE, LPGEN("Unicode plugin"), -IDI_UNICODE }, // 27
+ { SKINICON_OTHER_ANSI, LPGEN("ANSI plugin"), -IDI_ANSI }, // 28
+ { SKINICON_OTHER_LOADED, LPGEN("Running plugin"), -IDI_LOADED }, // 29
+ { SKINICON_OTHER_NOTLOADED, LPGEN("Unloaded plugin"), -IDI_NOTLOADED }, // 30
+ { SKINICON_OTHER_UNDO, LPGEN("Undo"), -IDI_UNDO }, // 31
+ { SKINICON_OTHER_WINDOW, LPGEN("Window"), -IDI_WINDOW }, // 32
+ { SKINICON_OTHER_WINDOWS, LPGEN("System"), -IDI_WINDOWS }, // 33
+ { SKINICON_OTHER_ACCMGR, LPGEN("Accounts"), -IDI_ACCMGR }, // 34
+ { SKINICON_OTHER_SHOWHIDE, LPGEN("ShowHide"), -IDI_SHOWHIDE }, // 35
+ { SKINICON_OTHER_EXIT, LPGEN("Exit"), -IDI_EXIT }, // 36
+ { SKINICON_OTHER_MAINMENU, LPGEN("Main Menu"), -IDI_MAINMENU }, // 37
+ { SKINICON_OTHER_STATUS, LPGEN("Status"), -IDI_ONLINE }, // 38
+ { SKINICON_CHAT_JOIN, LPGEN("Join chat"), -IDI_JOINCHAT }, // 39
+ { SKINICON_CHAT_LEAVE, LPGEN("Leave chat"), -IDI_LEAVECHAT }, // 40
+ { SKINICON_OTHER_GROUP, LPGEN("Move to Group"), -IDI_MOVETOGROUP }, // 41
+ { SKINICON_OTHER_ON, LPGEN("On"), -IDI_ON }, // 42
+ { SKINICON_OTHER_OFF, LPGEN("Off"), -IDI_OFF }, // 43
+ { SKINICON_OTHER_LOADEDGRAY, LPGEN("Running core plugin"), -IDI_LOADED_GRAY }, // 44
+ { SKINICON_OTHER_NOTLOADEDGRAY, LPGEN("Non-loadable plugin"), -IDI_NOTLOADED_GRAY }, // 45
+ { SKINICON_OTHER_FRAME, LPGEN("Frames"), -IDI_FRAME }, // 46
+ { SKINICON_AUTH_ADD, LPGEN("Add to list"), -IDI_AUTH_ADD }, // 47
+ { SKINICON_AUTH_REQUEST, LPGEN("Request authorization"), -IDI_AUTH_REQUEST }, // 48
+ { SKINICON_AUTH_GRANT, LPGEN("Grant authorization"), -IDI_AUTH_GRANT }, // 49
+ { SKINICON_AUTH_REVOKE, LPGEN("Revoke authorization"), -IDI_AUTH_REVOKE }, // 50
+ { 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") },
+ { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, LPGEN("Status Icons") },
};
static struct StandardIconDescription statusIcons[] =
diff --git a/src/res/auth_add.ico b/src/res/auth_add.ico Binary files differnew file mode 100644 index 0000000000..90c6b83639 --- /dev/null +++ b/src/res/auth_add.ico diff --git a/src/res/auth_grant.ico b/src/res/auth_grant.ico Binary files differnew file mode 100644 index 0000000000..58acccb83f --- /dev/null +++ b/src/res/auth_grant.ico diff --git a/src/res/auth_request.ico b/src/res/auth_request.ico Binary files differnew file mode 100644 index 0000000000..85ea50a284 --- /dev/null +++ b/src/res/auth_request.ico diff --git a/src/res/auth_revoke.ico b/src/res/auth_revoke.ico Binary files differnew file mode 100644 index 0000000000..e91ee67dc9 --- /dev/null +++ b/src/res/auth_revoke.ico diff --git a/src/resource.h b/src/resource.h index c6e2c4c3b8..a56ae48eab 100644 --- a/src/resource.h +++ b/src/resource.h @@ -147,6 +147,10 @@ #define IDI_ON 320
#define IDI_OFF 322
#define IDI_FRAME 323
+#define IDI_AUTH_ADD 324
+#define IDI_AUTH_GRANT 325
+#define IDI_AUTH_REQUEST 326
+#define IDI_AUTH_REVOKE 327
#define IDC_SAVE 1001
#define IDI_ONTHEPHONE 1002
#define IDC_MESSAGE 1002
@@ -538,7 +542,7 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 323
+#define _APS_NEXT_RESOURCE_VALUE 328
#define _APS_NEXT_COMMAND_VALUE 40018
#define _APS_NEXT_CONTROL_VALUE 1746
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/src/resource.rc b/src/resource.rc index 9dba2c9672..b8b16247b6 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -1081,6 +1081,10 @@ IDI_NEVERVIS ICON "res/never_visible.ico" IDI_CHAT ICON "res/chat_channel.ico"
IDI_MALE ICON "res/male.ico"
IDI_FEMALE ICON "res/female.ico"
+IDI_AUTH_ADD ICON "res/auth_add.ico"
+IDI_AUTH_GRANT ICON "res/auth_grant.ico"
+IDI_AUTH_REQUEST ICON "res/auth_request.ico"
+IDI_AUTH_REVOKE ICON "res/auth_revoke.ico"
/////////////////////////////////////////////////////////////////////////////
//
|