- Use a separate icon for minimizing windows.
authorGed Murphy <gedmurphy@reactos.org>
Sat, 31 Dec 2005 17:27:25 +0000 (17:27 +0000)
committerGed Murphy <gedmurphy@reactos.org>
Sat, 31 Dec 2005 17:27:25 +0000 (17:27 +0000)
- Add new icon

svn path=/trunk/; revision=20489

reactos/subsys/system/explorer/explorer.cpp
reactos/subsys/system/explorer/explorer_intres.rc
reactos/subsys/system/explorer/globals.h
reactos/subsys/system/explorer/res/minimize.ico [new file with mode: 0644]
reactos/subsys/system/explorer/resource.h
reactos/subsys/system/explorer/taskbar/quicklaunch.cpp

index f9a9ce3..d2f1df1 100644 (file)
@@ -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);
 }
 
 
index 9c0ffc4..9b1310d 100644 (file)
@@ -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
 /////////////////////////////////////////////////////////////////////////////
 
index 724ca78..99f8ffd 100644 (file)
@@ -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 (file)
index 0000000..af8b800
Binary files /dev/null and b/reactos/subsys/system/explorer/res/minimize.ico differ
index 811507a..52b20d7 100644 (file)
 #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
index 1e7c172..8214d93 100644 (file)
@@ -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};