- launch task manager

- set foregroundwindow when opening start menu (CTRL-ESC shortcut)

svn path=/branches/lean-explorer/; revision=8353

diff --git a/reactos/subsys/system/explorer/explorer_intres.h b/reactos/subsys/system/explorer/explorer_intres.h
index 80433d3..b4d991a 100644 (file)
--- a/reactos/subsys/system/explorer/explorer_intres.h
+++ b/reactos/subsys/system/explorer/explorer_intres.h
@@ -107,7 +107,8 @@
 #define ID_STOP                         40009
 #define ID_MINIMIZE_ALL                 40010
 #define ID_EXPLORE                      40011
-#define ID_SWITCH_DESKTOP_1             40012
+#define ID_SWITCH_DESKTOP_1             50000
+#define ID_TASKMGR                      40012
 #define ID_WINDOW_NEW                   0xE130
 #define ID_EDIT_PROPERTIES              57656
 #define ID_FILE_EXIT                    0xE141

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index c41b543..8611fd3 100644 (file)
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -409,6 +409,7 @@ BEGIN
     BEGIN
         MENUITEM "&About Explorer...",          ID_ABOUT_EXPLORER
         MENUITEM "&Settings...",                ID_DESKTOPBAR_SETTINGS
+        MENUITEM "&Task Manager...",            ID_TASKMGR
     END
 END
 

diff --git a/reactos/subsys/system/explorer/taskbar/desktopbar.cpp b/reactos/subsys/system/explorer/taskbar/desktopbar.cpp
index 9fb0121..759d7d2 100644 (file)
--- a/reactos/subsys/system/explorer/taskbar/desktopbar.cpp
+++ b/reactos/subsys/system/explorer/taskbar/desktopbar.cpp
@@ -245,6 +245,10 @@ int DesktopBar::Command(int id, int code)
                explorer_show_frame(SW_SHOWNORMAL);
                break;
 
+         case ID_TASKMGR:
+               launch_file(_hwnd, TEXT("taskmgr.exe"), SW_SHOWNORMAL);
+               break;
+
          case ID_SWITCH_DESKTOP_1:
          case ID_SWITCH_DESKTOP_1+1:
          case ID_SWITCH_DESKTOP_1+2:

diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index dc7d96b..e9be4de 100644 (file)
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
@@ -1359,6 +1359,7 @@ void StartMenuRoot::TrackStartmenu()
 
         // show previously hidden start menu
        ShowWindow(hwnd, SW_SHOW);
+       SetForegroundWindow(hwnd);
 
        while(IsWindow(hwnd)) {
                if (!GetMessage(&msg, 0, 0, 0)) {