mirror of
https://github.com/reactos/reactos.git
synced 2024-09-10 04:42:00 +00:00
- split logoff and shutdown resources
- add icons for each svn path=/trunk/; revision=20522
This commit is contained in:
parent
f88d2a43eb
commit
b083fbae01
|
@ -392,6 +392,7 @@ void IconCache::init()
|
||||||
_icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK);
|
_icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK);
|
||||||
_icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER);
|
_icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER);
|
||||||
_icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF);
|
_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_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS);
|
||||||
_icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE);
|
_icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,6 +138,7 @@ IDI_REACTOS ICON DISCARDABLE "res/reactos.ico"
|
||||||
IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico"
|
IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico"
|
||||||
IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico"
|
IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico"
|
||||||
IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico"
|
IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico"
|
||||||
|
IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico"
|
||||||
IDI_ARROW ICON DISCARDABLE "res/arrow.ico"
|
IDI_ARROW ICON DISCARDABLE "res/arrow.ico"
|
||||||
IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico"
|
IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico"
|
||||||
IDI_APPICON ICON DISCARDABLE "res/appicon.ico"
|
IDI_APPICON ICON DISCARDABLE "res/appicon.ico"
|
||||||
|
|
|
@ -80,6 +80,7 @@ enum ICON_ID {
|
||||||
ICID_NETWORK,
|
ICID_NETWORK,
|
||||||
ICID_COMPUTER,
|
ICID_COMPUTER,
|
||||||
ICID_LOGOFF,
|
ICID_LOGOFF,
|
||||||
|
ICID_SHUTDOWN,
|
||||||
ICID_BOOKMARK,
|
ICID_BOOKMARK,
|
||||||
ICID_MINIMIZE,
|
ICID_MINIMIZE,
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 3.5 KiB |
BIN
reactos/subsys/system/explorer/res/shutdown.ico
Normal file
BIN
reactos/subsys/system/explorer/res/shutdown.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.5 KiB |
|
@ -67,6 +67,7 @@
|
||||||
#define IDI_FOLDERARROW 125
|
#define IDI_FOLDERARROW 125
|
||||||
#define IDI_ARROW 125
|
#define IDI_ARROW 125
|
||||||
#define IDI_ARROW_SELECTED 126
|
#define IDI_ARROW_SELECTED 126
|
||||||
|
#define IDI_SHUTDOWN 127
|
||||||
#define IDB_LOGOV 129
|
#define IDB_LOGOV 129
|
||||||
#define IDB_LOGOV256 130
|
#define IDB_LOGOV256 130
|
||||||
#define IDA_SEARCH_PROGRAM 133
|
#define IDA_SEARCH_PROGRAM 133
|
||||||
|
|
|
@ -121,7 +121,7 @@ void QuickLaunchBar::AddShortcuts()
|
||||||
COLORREF bk_color = GetSysColor(COLOR_BTNFACE);
|
COLORREF bk_color = GetSysColor(COLOR_BTNFACE);
|
||||||
HBRUSH bk_brush = GetSysColorBrush(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);
|
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};
|
TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0};
|
||||||
|
|
|
@ -1753,7 +1753,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs)
|
||||||
#else
|
#else
|
||||||
if (IS_VALUE_ZERO(hkey, _T("NoClose")))
|
if (IS_VALUE_ZERO(hkey, _T("NoClose")))
|
||||||
#endif
|
#endif
|
||||||
AddButton(ResString(IDS_SHUTDOWN), ICID_LOGOFF, false, IDC_SHUTDOWN);
|
AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN);
|
||||||
|
|
||||||
|
|
||||||
#ifndef _ROS_
|
#ifndef _ROS_
|
||||||
|
|
Loading…
Reference in a new issue