Ticket #6051: TeamMonitor.diff

HiQ-Data/source/haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp

@@ -115 +115 @@
 
     fRestartButton = new BButton("restart", "Restart the Desktop",
         new BMessage(TM_RESTART_DESKTOP));
-    fRestartButton->Hide();
+    SetDefaultButton(fRestartButton);
     groupView->GroupLayout()->AddView(fRestartButton);
 
     glue = BSpaceLayoutItem::CreateGlue();
     glue->SetExplicitMinSize(BSize(inset, -1));
     groupView->GroupLayout()->AddItem(glue);
 
-    BButton *cancel = new BButton("cancel", "Cancel",
+    fCancelButton = new BButton("cancel", "Cancel",
         new BMessage(TM_CANCEL));
-    groupView->GroupLayout()->AddView(cancel);
+    SetDefaultButton(fCancelButton);
+    groupView->GroupLayout()->AddView(fCancelButton);
 
     BSize preferredSize = layout->View()->PreferredSize();
     if (preferredSize.width > Bounds().Width())
@@ -143 +144 @@
     SetSizeLimits(Bounds().Width(), Bounds().Width() * 2,
         Bounds().Height(), screenFrame.Height());
 
+    fRestartButton->Hide();
+
     AddShortcut('T', B_COMMAND_KEY | B_OPTION_KEY,
         new BMessage(kMsgLaunchTerminal));
     AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
@@ -181 +184 @@
         case TM_FORCE_REBOOT:
             _kern_shutdown(true);
             break;
+            
         case TM_KILL_APPLICATION:
         {
             TeamListItem* item = (TeamListItem*)fListView->ItemAt(
@@ -197 +201 @@
                 be_roster->Launch(kTrackerSignature);
             if (!be_roster->IsRunning(kDeskbarSignature))
                 be_roster->Launch(kDeskbarSignature);
+            fRestartButton->Hide();
+            SetDefaultButton(fCancelButton);
             break;
         }
         case TM_SELECTED_TEAM:
@@ -281 +287 @@
         && be_roster->IsRunning(kDeskbarSignature);
     if (!desktopRunning && fRestartButton->IsHidden()) {
         fRestartButton->Show();
+        SetDefaultButton(fRestartButton);
         fRestartButton->Parent()->Layout(true);
     }
 

HiQ-Data/source/haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.h

@@ -37 +37 @@
             bool            fQuitting;
             BMessageRunner* fUpdateRunner;
             BListView*      fListView;
+            BButton*        fCancelButton;
             BButton*        fKillButton;
             BButton*        fRestartButton;
             TeamDescriptionView*        fDescriptionView;