Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FORMATTING]

Browse source 
* No code changes.

svn path=/trunk/; revision=56370
This commit is contained in:
Amine Khaldi 2012-04-20 19:12:07 +00:00
parent 54d9802905
commit b9a7b90af3
1 changed files with 716 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/base/shell/explorer/explorer.cpp
View file

@ -94,10 +94,12 @@ void ExplorerGlobals::read_persistent()
_cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str()); _cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str());
if (!_cfg.read_file(_cfg_path)) { if (!_cfg.read_file(_cfg_path)) {
if (!_cfg._errors.empty()) if (!_cfg._errors.empty()) {
MessageBox(_hwndDesktop, _cfg._errors.str(), MessageBox(_hwndDesktop,
TEXT("ROS Explorer - reading user settings"), MB_OK); _cfg._errors.str(),
TEXT("ROS Explorer - reading user settings"),
MB_OK);
}
_cfg.read_file(TEXT("explorer-cfg-template.xml")); _cfg.read_file(TEXT("explorer-cfg-template.xml"));
} }
@ -391,7 +393,7 @@ void IconCache::init()
_icons[ICID_FOLDER] = Icon(ICID_FOLDER, IDI_FOLDER); _icons[ICID_FOLDER] = Icon(ICID_FOLDER, IDI_FOLDER);
//_icons[ICID_DOCUMENT] = Icon(ICID_DOCUMENT, IDI_DOCUMENT); //_icons[ICID_DOCUMENT] = Icon(ICID_DOCUMENT, IDI_DOCUMENT);
_icons[ICID_EXPLORER] = Icon(ICID_EXPLORER, IDI_EXPLORER); _icons[ICID_EXPLORER] = Icon(ICID_EXPLORER, IDI_EXPLORER);
// _icons[ICID_APP] = Icon(ICID_APP, IDI_APPICON); //_icons[ICID_APP] = Icon(ICID_APP, IDI_APPICON);
_icons[ICID_CONFIG] = Icon(ICID_CONFIG, IDI_CONFIG, icon_size); _icons[ICID_CONFIG] = Icon(ICID_CONFIG, IDI_CONFIG, icon_size);
_icons[ICID_DOCUMENTS] = Icon(ICID_DOCUMENTS, IDI_DOCUMENTS, icon_size); _icons[ICID_DOCUMENTS] = Icon(ICID_DOCUMENTS, IDI_DOCUMENTS, icon_size);