From e3dd268bed4cc0618eae400dbf29ae4cd2c21120 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Sat, 31 Dec 2005 17:27:25 +0000
Subject: [PATCH] - Use a separate icon for minimizing windows. - Add new icon

svn path=/trunk/; revision=20489
---
 reactos/subsys/system/explorer/explorer.cpp      |   1 +
 .../subsys/system/explorer/explorer_intres.rc    |   1 +
 reactos/subsys/system/explorer/globals.h         |   1 +
 reactos/subsys/system/explorer/res/minimize.ico  | Bin 0 -> 3606 bytes
 reactos/subsys/system/explorer/resource.h        |   1 +
 .../system/explorer/taskbar/quicklaunch.cpp      |   2 +-
 6 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 reactos/subsys/system/explorer/res/minimize.ico

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 0000000000000000000000000000000000000000..af8b800afbb55bc3619ef2dbd3cefd73d97c25f8
GIT binary patch
literal 3606
zcmd6pSxj3;6oxNJq^M8LW8TP9)xPzit)jN7kXor}A5xa45CRE{9Ahvhln|C+c7kIF
zaj+XuAS?+u2F#KM%u=8rq*SF)Kyp<U5j7MLOV~Fdoc^6N=vt03hQw0UD}9=K$LIWa
zW;}QPBM5H75#huMfwiZEuw#PojvxppPwqae-V%g7*7q*!V<9YJx1TkF2kW=LvcEos
zAwxQTEs*V@Lh=C!X@m@k%Ik<rOt6x1Ba8P_{$OP?o@yniR!1N_T*CXq!lh8<sL<4G
z;?MQ<^)MI=R{Hz<t@-^Al2E6X@#mH0C2VePVry#)9Y1#>HX#mDc{ucXJ<7_;tk~wa
z-b?1W%gf7{oSekO!~|z`brpTT_aibo3aJ@s$hnmRtyYV|!a~^Q)BH9zHZVUwzlWuz
zCH&UkhX_RkVy?v?IW+|ujmDZ!xzp3rn4g^iy?=du9cycA9GV05&CJYzbSO6ZYBX|k
zb9jE9YIoe!pMO_}N`oFR7GA(&v2ZBIY&OGKYeaEz5pr+kLYbU|?(S|hHZ`F*Qvq84
zt~=qlFaHA7EUwB}jg^%ZzJ}Y|+aMMe7BD+Ii_y_h{@%KV282mNP^<Le`JH)}`Tsor
z>=_I-)qI>ZCWpu*(8dR&D!~(v<G$qi?dlMozq7LgN6;Rsx#EGkn9uh><8RHr#Phog
z<9RFYJKNSE{{%HrpY4J2O_>*9P<ZU08}TvpvePiI)*i}lO!dP<$%iNp`_v&1E}urF
z^dpB*esQt{1=j-K2+IHa`E#_iv~Wg7M$pmG!SBb%$8pe=dB$Bs8gGjIdGNZ=bk4A&
zM|ht>=Mh~&><s#!UT$n$$2`CFethn{@0gG8IXJ@qV!+B-Z_iQ|OYy{EE{Z$yjkniO
zK+r`P>uMKE%gb=Tq{PD5G1k^vN=i#D4=XCx+4J*Dp}{!o<!NR)M-L;;V%*rcke9E4
z`42PN+uPCB)`r&BR#fOK;TPZ!{i8=19v;Tn*cgU}h7c;1fZikO-}uTs-Pt~&anH@o
z@$+hGY6>Ex-P_xXfq?-lgM)*ptFPnhC+d^-aAW?y=<nq^TyLo~7zxTGKBwm9W{A)k
zP5+OrzS)?Kz9PkILu+R;nLs`y;z)l#FBJXpCtcJlb5Ny3qw#J$d@r2my7nGtKYr0G
z$uI3`xg+P=wjL<IqCk91IKK1ubLfHg`sAfOw}bc4cw51>9eLyvQxpH~x>5<<4?6CT
zqDR{6_m;$?D<^Od6nBt^QVi|Ml=L)YWM*;?v)BKnC>G6WKChhR6tm7el{|K7alxs_
zQY`Ibd6a_d2T4MgZTHX9!f38NKJq8VM~69-Bht=l4)QR24=yV&$4&K3q@<-Gl4+9%
zN5{s{_cdUv-=mA<`sDfc(07}k7>b4`KOX4ORBHu>1g%MAQZHM5@_O>c#l=O3P#vJn
zx@w(|I4}E_t<gx9TJ@f&O)Y)DVl6;*j3emX<oo;4Q}8|aB3oVYp7dR*6{vpb(ndMe
zccqq~`l3@4;Z)z1T7znj_B@$WeOGD`s!`h15~upE)GActROKZ&)pw<qp<3skmoN9#
sceU0Ly)Wa8yH4Db|5eMTCg88*0=kY0NOcoZSy^#7j<dM8okH6G0((MQ2LJ#7

literal 0
HcmV?d00001

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};