From: Ged Murphy <gedmurphy@reactos.org>
Date: Sat, 31 Dec 2005 17:27:25 +0000 (+0000)
Subject: - Use a separate icon for minimizing windows.
X-Git-Tag: backups/expat-rbuild@40467~660
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=e3dd268bed4cc0618eae400dbf29ae4cd2c21120;hp=f9048f833eec2d66460f254ac69b78e7e4612f50

- Use a separate icon for minimizing windows.
- Add new icon

svn path=/trunk/; revision=20489
---

diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp
index f9a9ce37c24..d2f1df181b4 100644
--- a/reactos/subsys/system/explorer/explorer.cpp
+++ b/reactos/subsys/system/explorer/explorer.cpp
@@ -393,6 +393,7 @@ void IconCache::init()
 	_icons[ICID_COMPUTER]	= Icon(ICID_COMPUTER,	IDI_COMPUTER);
 	_icons[ICID_LOGOFF]		= Icon(ICID_LOGOFF,		IDI_LOGOFF);
 	_icons[ICID_BOOKMARK]	= Icon(ICID_BOOKMARK,	IDI_DOT_TRANS);
+    _icons[ICID_MINIMIZE]	= Icon(ICID_MINIMIZE,	IDI_MINIMIZE);
 }
 
 
diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index 9c0ffc4e2b8..9b1310db91b 100644
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -163,6 +163,7 @@ IDI_ARROW_UP            ICON    DISCARDABLE     "res/arrow_up.ico"
 IDI_ARROW_DOWN          ICON    DISCARDABLE     "res/arrow_dwn.ico"
 IDI_NOTIFY_L            ICON    DISCARDABLE     "res/notify_l.ico"
 IDI_NOTIFY_R            ICON    DISCARDABLE     "res/notify_r.ico"
+IDI_MINIMIZE            ICON    DISCARDABLE     "res/minimize.ico" 
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/reactos/subsys/system/explorer/globals.h b/reactos/subsys/system/explorer/globals.h
index 724ca7872b4..99f8ffd02ee 100644
--- a/reactos/subsys/system/explorer/globals.h
+++ b/reactos/subsys/system/explorer/globals.h
@@ -81,6 +81,7 @@ enum ICON_ID {
 	ICID_COMPUTER,
 	ICID_LOGOFF,
 	ICID_BOOKMARK,
+    ICID_MINIMIZE,
 
 	ICID_DYNAMIC
 };
diff --git a/reactos/subsys/system/explorer/res/minimize.ico b/reactos/subsys/system/explorer/res/minimize.ico
new file mode 100644
index 00000000000..af8b800afbb
Binary files /dev/null and b/reactos/subsys/system/explorer/res/minimize.ico differ
diff --git a/reactos/subsys/system/explorer/resource.h b/reactos/subsys/system/explorer/resource.h
index 811507aa2eb..52b20d7431d 100644
--- a/reactos/subsys/system/explorer/resource.h
+++ b/reactos/subsys/system/explorer/resource.h
@@ -116,6 +116,7 @@
 #define IDI_NOTIFY_R                    169
 #define IDB_MDI                         170
 #define IDB_SDI                         171
+#define IDI_MINIMIZE                    172
 #define ID_VIEW_NAME                    401
 #define ID_VIEW_ALL_ATTRIBUTES          402
 #define ID_VIEW_SELECTED_ATTRIBUTES     403
diff --git a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
index 1e7c172c7b7..8214d931b21 100644
--- a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
+++ b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
@@ -121,7 +121,7 @@ void QuickLaunchBar::AddShortcuts()
 	COLORREF bk_color = GetSysColor(COLOR_BTNFACE);
 	HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE);
 
-	AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_LOGOFF/*@@*/).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL);
+	AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE/*@@*/).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL);
 	AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL);
 
 	TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0};