summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-07-19 16:59:01 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-07-19 16:59:01 +0000
commit5b24aa5f6f969c07be09468eceb6a184f3f9fc8a (patch)
treebdb55dd8bdacd500b9687cc381b5e3441d5c5818 /src
parent6d5918b4b93e6de25b9973fa922bc29072ba8c89 (diff)
three standard icons added to the core: for a warning, error or notification
git-svn-id: http://svn.miranda-ng.org/main/trunk@9864 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r--src/modules/skin/skinicons.cpp3
-rw-r--r--src/resource.h3
-rw-r--r--src/resource.rc3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index 0cc55cc0bb..89775c90c6 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -87,6 +87,9 @@ static struct StandardIconDescription mainIcons[] =
{ 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_ERROR, LPGEN("Error"), -IDI_MERROR },
+ { SKINICON_WARNING, LPGEN("Warning"), -IDI_MWARNING },
+ { SKINICON_INFORMATION, LPGEN("Information"), -IDI_MINFO },
{ 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") },
diff --git a/src/resource.h b/src/resource.h
index 77a602bc32..3c1587dcc6 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -57,6 +57,9 @@
#define IDI_FINDUSER 161
#define IDI_HELP 162
#define IDI_OPTIONS 163
+#define IDI_MERROR 164
+#define IDI_MWARNING 165
+#define IDI_MINFO 166
#define IDI_MIRANDAWEBSITE 172
#define IDI_RENAME 173
#define IDI_HISTORY 174
diff --git a/src/resource.rc b/src/resource.rc
index 74039b09b5..8d22538ea2 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -1203,6 +1203,9 @@ IDI_LOADED_GRAY ICON "res/icon_loaded_gray.ico"
IDI_NOTLOADED ICON "res/icon_notloaded.ico"
IDI_NOTLOADED_GRAY ICON "res/icon_notloaded_gray.ico"
IDI_FRAME ICON "res/icon_frame.ico"
+IDI_MERROR ICON "res/icon_error.ico"
+IDI_MWARNING ICON "res/icon_warning.ico"
+IDI_MINFO ICON "res/icon_notify.ico"
IDI_BLANK ICON "res/_blank.ico"
IDI_UNDO ICON "res/icon_undo.ico"
IDI_WINDOW ICON "res/icon_window.ico"