i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved TeamManager default button behaviour, closing #6051.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37063 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Joachim Seemer
2010-06-08 16:43:14 +00:00
parent 2434bdc4d9
commit 2d192e7a80
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+10 -3
View File
@@ -115,16 +115,17 @@ TeamMonitorWindow::TeamMonitorWindow()
fRestartButton = new BButton("restart", "Restart the Desktop", fRestartButton = new BButton("restart", "Restart the Desktop",
new BMessage(TM_RESTART_DESKTOP)); new BMessage(TM_RESTART_DESKTOP));
fRestartButton->Hide(); SetDefaultButton(fRestartButton);
groupView->GroupLayout()->AddView(fRestartButton); groupView->GroupLayout()->AddView(fRestartButton);
glue = BSpaceLayoutItem::CreateGlue(); glue = BSpaceLayoutItem::CreateGlue();
glue->SetExplicitMinSize(BSize(inset, -1)); glue->SetExplicitMinSize(BSize(inset, -1));
groupView->GroupLayout()->AddItem(glue); groupView->GroupLayout()->AddItem(glue);
BButton *cancel = new BButton("cancel", "Cancel", fCancelButton = new BButton("cancel", "Cancel",
new BMessage(TM_CANCEL)); new BMessage(TM_CANCEL));
groupView->GroupLayout()->AddView(cancel); SetDefaultButton(fCancelButton);
groupView->GroupLayout()->AddView(fCancelButton);
BSize preferredSize = layout->View()->PreferredSize(); BSize preferredSize = layout->View()->PreferredSize();
if (preferredSize.width > Bounds().Width()) if (preferredSize.width > Bounds().Width())
@@ -143,6 +144,8 @@ TeamMonitorWindow::TeamMonitorWindow()
SetSizeLimits(Bounds().Width(), Bounds().Width() * 2, SetSizeLimits(Bounds().Width(), Bounds().Width() * 2,
Bounds().Height(), screenFrame.Height()); Bounds().Height(), screenFrame.Height());
fRestartButton->Hide();
AddShortcut('T', B_COMMAND_KEY | B_OPTION_KEY, AddShortcut('T', B_COMMAND_KEY | B_OPTION_KEY,
new BMessage(kMsgLaunchTerminal)); new BMessage(kMsgLaunchTerminal));
AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED)); AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
@@ -181,6 +184,7 @@ TeamMonitorWindow::MessageReceived(BMessage *msg)
case TM_FORCE_REBOOT: case TM_FORCE_REBOOT:
_kern_shutdown(true); _kern_shutdown(true);
break; break;
case TM_KILL_APPLICATION: case TM_KILL_APPLICATION:
{ {
TeamListItem* item = (TeamListItem*)fListView->ItemAt( TeamListItem* item = (TeamListItem*)fListView->ItemAt(
@@ -197,6 +201,8 @@ TeamMonitorWindow::MessageReceived(BMessage *msg)
be_roster->Launch(kTrackerSignature); be_roster->Launch(kTrackerSignature);
if (!be_roster->IsRunning(kDeskbarSignature)) if (!be_roster->IsRunning(kDeskbarSignature))
be_roster->Launch(kDeskbarSignature); be_roster->Launch(kDeskbarSignature);
fRestartButton->Hide();
SetDefaultButton(fCancelButton);
break; break;
} }
case TM_SELECTED_TEAM: case TM_SELECTED_TEAM:
@@ -281,6 +287,7 @@ TeamMonitorWindow::UpdateList()
&& be_roster->IsRunning(kDeskbarSignature); && be_roster->IsRunning(kDeskbarSignature);
if (!desktopRunning && fRestartButton->IsHidden()) { if (!desktopRunning && fRestartButton->IsHidden()) {
fRestartButton->Show(); fRestartButton->Show();
SetDefaultButton(fRestartButton);
fRestartButton->Parent()->Layout(true); fRestartButton->Parent()->Layout(true);
} }
src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.h
+1
View File
@@ -37,6 +37,7 @@ private:
bool fQuitting; bool fQuitting;
BMessageRunner* fUpdateRunner; BMessageRunner* fUpdateRunner;
BListView* fListView; BListView* fListView;
BButton* fCancelButton;
BButton* fKillButton; BButton* fKillButton;
BButton* fRestartButton; BButton* fRestartButton;
TeamDescriptionView* fDescriptionView; TeamDescriptionView* fDescriptionView;