[ros-diffs] [gedmurphy] 20489: - Use a separate icon for minimizing windows.

[gedmurphy at svn.reactos.org]

- Use a separate icon for minimizing windows.
- Add new icon
Modified: trunk/reactos/subsys/system/explorer/explorer.cpp
Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
Modified: trunk/reactos/subsys/system/explorer/globals.h
Added: trunk/reactos/subsys/system/explorer/res/minimize.ico
Modified: trunk/reactos/subsys/system/explorer/resource.h
Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer.cpp
--- trunk/reactos/subsys/system/explorer/explorer.cpp	2005-12-31
16:15:42 UTC (rev 20488)
+++ trunk/reactos/subsys/system/explorer/explorer.cpp	2005-12-31
17:27:25 UTC (rev 20489)
@@ -393,6 +393,7 @@

 	_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);
 }
 
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
--- trunk/reactos/subsys/system/explorer/explorer_intres.rc
2005-12-31 16:15:42 UTC (rev 20488)
+++ trunk/reactos/subsys/system/explorer/explorer_intres.rc
2005-12-31 17:27:25 UTC (rev 20489)
@@ -163,6 +163,7 @@

 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
 
////////////////////////////////////////////////////////////////////////
/////
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/globals.h
--- trunk/reactos/subsys/system/explorer/globals.h	2005-12-31
16:15:42 UTC (rev 20488)
+++ trunk/reactos/subsys/system/explorer/globals.h	2005-12-31
17:27:25 UTC (rev 20489)
@@ -81,6 +81,7 @@

 	ICID_COMPUTER,
 	ICID_LOGOFF,
 	ICID_BOOKMARK,
+    ICID_MINIMIZE,
 
 	ICID_DYNAMIC
 };
  _____  

Added: trunk/reactos/subsys/system/explorer/res/minimize.ico
(Binary files differ)
Property changes on:
trunk/reactos/subsys/system/explorer/res/minimize.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
  _____  

Modified: trunk/reactos/subsys/system/explorer/resource.h
--- trunk/reactos/subsys/system/explorer/resource.h	2005-12-31
16:15:42 UTC (rev 20488)
+++ trunk/reactos/subsys/system/explorer/resource.h	2005-12-31
17:27:25 UTC (rev 20489)
@@ -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
  _____  

Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
--- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
2005-12-31 16:15:42 UTC (rev 20488)
+++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
2005-12-31 17:27:25 UTC (rev 20489)
@@ -121,7 +121,7 @@

 	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_col
or, 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};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051231/42cd6543/attachment.html