- split logoff and shutdown resources - add icons for each 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 Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico Added: trunk/reactos/subsys/system/explorer/res/shutdown.ico Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____
Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -392,6 +392,7 @@
_icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK); _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF); + _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN); _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 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-01 18:13:07 UTC (rev 20522) @@ -138,6 +138,7 @@
IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" +IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" _____
Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-01 18:13:07 UTC (rev 20522) @@ -80,6 +80,7 @@
ICID_NETWORK, ICID_COMPUTER, ICID_LOGOFF, + ICID_SHUTDOWN, ICID_BOOKMARK, ICID_MINIMIZE,
_____
Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico (Binary files differ) _____
Added: trunk/reactos/subsys/system/explorer/res/shutdown.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/shutdown.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____
Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-01 18:13:07 UTC (rev 20522) @@ -67,6 +67,7 @@
#define IDI_FOLDERARROW 125 #define IDI_ARROW 125 #define IDI_ARROW_SELECTED 126 +#define IDI_SHUTDOWN 127 #define IDB_LOGOV 129 #define IDB_LOGOV256 130 #define IDA_SEARCH_PROGRAM 133 _____
Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -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_MINIMIZE/*@@*/).create_bitmap(bk_col or, 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}; _____
Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -1753,7 +1753,7 @@
#else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif - AddButton(ResString(IDS_SHUTDOWN), ICID_LOGOFF, false, IDC_SHUTDOWN); + AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN);
#ifndef _ROS_