Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cpp
Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h
Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc
Modified: branches/lean-explorer/reactos/subsys/system/explorer/globals.h
Modified: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp
Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp
Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar.cpp
Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu.cpp
--- branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-05-01 21:12:50 UTC (rev 14930)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
--- branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-05-01 21:12:50 UTC (rev 14930)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
--- branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 21:12:50 UTC (rev 14930)
@@ -258,7 +258,9 @@
3 TEXTINCLUDE DISCARDABLE
BEGIN
+ "#ifndef ROSSHELL\r\n"
"IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n"
+ "#endif\r\n"
"#ifndef _ROS_\r\n"
"LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n"
"STRINGTABLE DISCARDABLE \r\n"
--- branches/lean-explorer/reactos/subsys/system/explorer/globals.h 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/globals.h 2005-05-01 21:12:50 UTC (rev 14930)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
--- branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 21:12:50 UTC (rev 14930)
@@ -297,7 +297,7 @@
# End Source File
# Begin Source File
-SOURCE=".\rosshell-jp.rc"
+SOURCE=".\explorer-jp.rc"
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
--- branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp 2005-05-01 21:12:50 UTC (rev 14930)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
--- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-05-01 21:12:50 UTC (rev 14930)
@@ -131,9 +131,9 @@
void DesktopBar::ProcessHotKey(int id_hotkey)
{
switch(id_hotkey) {
- case 0:
- explorer_show_frame(SW_SHOWNORMAL);
+ case 0: explorer_show_frame(SW_SHOWNORMAL);
break;
+
///@todo implement all common hotkeys
}
}
--- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-01 21:03:02 UTC (rev 14929)
+++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-01 21:12:50 UTC (rev 14930)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public