- split logoff and shutdown resources

- add icons for each

svn path=/trunk/; revision=20522

diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp
index d2f1df1..22ed036 100644 (file)
--- a/reactos/subsys/system/explorer/explorer.cpp
+++ b/reactos/subsys/system/explorer/explorer.cpp
@@ -392,6 +392,7 @@ void IconCache::init()
        _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);
 }

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index 9b1310d..4411fd1 100644 (file)
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -138,6 +138,7 @@ IDI_REACTOS             ICON    DISCARDABLE     "res/reactos.ico"
 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"

diff --git a/reactos/subsys/system/explorer/globals.h b/reactos/subsys/system/explorer/globals.h
index 99f8ffd..361e381 100644 (file)
--- a/reactos/subsys/system/explorer/globals.h
+++ b/reactos/subsys/system/explorer/globals.h
@@ -80,6 +80,7 @@ enum ICON_ID {
        ICID_NETWORK,
        ICID_COMPUTER,
        ICID_LOGOFF,
+    ICID_SHUTDOWN,
        ICID_BOOKMARK,
     ICID_MINIMIZE,
 

diff --git a/reactos/subsys/system/explorer/res/logoff.ico b/reactos/subsys/system/explorer/res/logoff.ico
index a10592b..ad98a3a 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/logoff.ico and b/reactos/subsys/system/explorer/res/logoff.ico differ

diff --git a/reactos/subsys/system/explorer/res/shutdown.ico b/reactos/subsys/system/explorer/res/shutdown.ico
new file mode 100644 (file)
index 0000000..8b76962
Binary files /dev/null and b/reactos/subsys/system/explorer/res/shutdown.ico differ

diff --git a/reactos/subsys/system/explorer/resource.h b/reactos/subsys/system/explorer/resource.h
index 52b20d7..680d993 100644 (file)
--- a/reactos/subsys/system/explorer/resource.h
+++ b/reactos/subsys/system/explorer/resource.h
@@ -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

diff --git a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
index 29c1538..19acaa3 100644 (file)
--- 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_MINIMIZE/*@@*/).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};

diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index 83dc2a9..fb54000 100644 (file)
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
@@ -1753,7 +1753,7 @@ LRESULT   StartMenuRoot::Init(LPCREATESTRUCT pcs)
 #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_