diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-19 19:27:54 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-19 19:27:54 +0000 |
| commit | bc71dc491b0487d465fac290224c27a1240281bf (patch) | |
| tree | 60f2a7fcb7f54f80d9869a256580d9b7aedd0ba3 | |
| parent | 4105064506a4ea89fe17ed8007073faf3ccfe08c (diff) | |
more red icon for the fatal errors
git-svn-id: http://svn.miranda-ng.org/main/trunk@9869 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/m_skin.h | 1 | ||||
| -rw-r--r-- | src/modules/database/profilemanager.cpp | 2 | ||||
| -rw-r--r-- | src/modules/skin/skinicons.cpp | 2 | ||||
| -rw-r--r-- | src/res/icon_fatal.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | src/resource.h | 7 | ||||
| -rw-r--r-- | src/resource.rc | 1 |
6 files changed, 9 insertions, 4 deletions
diff --git a/include/m_skin.h b/include/m_skin.h index 6f12e1008b..1b887902df 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -48,6 +48,7 @@ __forceinline LPCSTR LoadSkinnedIconName(int id) { return (LPCSTR)CallService( #define SKINICON_INFORMATION 150
#define SKINICON_WARNING 151
#define SKINICON_ERROR 152
+#define SKINICON_FATAL 153
// other icons
#define SKINICON_OTHER_MIRANDA 200
diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp index 4c1d4fec2f..0edb7e8380 100644 --- a/src/modules/database/profilemanager.cpp +++ b/src/modules/database/profilemanager.cpp @@ -519,7 +519,7 @@ static INT_PTR CALLBACK DlgProfileSelect(HWND hwndDlg, UINT msg, WPARAM wParam, ImageList_AddIcon_NotShared(hImgList, MAKEINTRESOURCE(IDI_USERDETAILS));
ImageList_AddIcon_NotShared(hImgList, MAKEINTRESOURCE(IDI_DELETE));
ImageList_AddIcon_NotShared(hImgList, MAKEINTRESOURCE(IDI_MWARNING));
- ImageList_AddIcon_NotShared(hImgList, MAKEINTRESOURCE(IDI_MERROR));
+ ImageList_AddIcon_NotShared(hImgList, MAKEINTRESOURCE(IDI_MFATAL));
// LV will destroy the image list
SetWindowLongPtr(hwndList, GWL_STYLE, GetWindowLongPtr(hwndList, GWL_STYLE) | LVS_SORTASCENDING);
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 89775c90c6..345eaf0e96 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -87,9 +87,11 @@ 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_FATAL, LPGEN("Fatal error"), -IDI_MFATAL },
{ 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/res/icon_fatal.ico b/src/res/icon_fatal.ico Binary files differnew file mode 100644 index 0000000000..3212038565 --- /dev/null +++ b/src/res/icon_fatal.ico diff --git a/src/resource.h b/src/resource.h index 3c1587dcc6..a9496fb22c 100644 --- a/src/resource.h +++ b/src/resource.h @@ -57,9 +57,10 @@ #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_MFATAL 164
+#define IDI_MERROR 165
+#define IDI_MWARNING 166
+#define IDI_MINFO 167
#define IDI_MIRANDAWEBSITE 172
#define IDI_RENAME 173
#define IDI_HISTORY 174
diff --git a/src/resource.rc b/src/resource.rc index 8d22538ea2..9d722a70d5 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -1203,6 +1203,7 @@ 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_MFATAL ICON "res/icon_fatal.ico"
IDI_MERROR ICON "res/icon_error.ico"
IDI_MWARNING ICON "res/icon_warning.ico"
IDI_MINFO ICON "res/icon_notify.ico"
|