Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workspaces: remove "about" menu item.

Browse Source 
The about box is kept, and can be shown from the replicants.

Fixes #8165.
This commit is contained in:
Adrien Destugues 2014-11-26 16:42:50 +01:00
parent 7b5ea03f20
commit 052e5d936f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/apps/workspaces/Workspaces.cpp
View File

@ -276,9 +276,9 @@ WorkspacesSettings::_Open(BFile& file, int mode)
{ {
BPath path; BPath path;
status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path); status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
if (status != B_OK) if (status != B_OK)
status = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path); status = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
if (status != B_OK) if (status != B_OK)
return status; return status;
path.Append(kSettingsFile); path.Append(kSettingsFile);
@ -343,7 +343,7 @@ WorkspacesView::WorkspacesView(BRect frame, bool showDragger=true)
fParentWhichDrawsOnChildren(NULL), fParentWhichDrawsOnChildren(NULL),
fCurrentFrame(frame) fCurrentFrame(frame)
{ {
if(showDragger) { if (showDragger) {
frame.OffsetTo(B_ORIGIN); frame.OffsetTo(B_ORIGIN);
frame.top = frame.bottom - 7; frame.top = frame.bottom - 7;
frame.left = frame.right - 7; frame.left = frame.right - 7;
@ -609,16 +609,15 @@ WorkspacesView::MouseDown(BPoint where)
if (window->IsAutoRaising()) if (window->IsAutoRaising())
item->SetMarked(true); item->SetMarked(true);
if (be_roster->IsRunning(kDeskbarSignature)) { if (be_roster->IsRunning(kDeskbarSignature)) {
menu->AddItem(item = new BMenuItem(B_TRANSLATE("Live in the Deskbar"), menu->AddItem(item = new BMenuItem(
B_TRANSLATE("Live in the Deskbar"),
new BMessage(kMsgToggleLiveInDeskbar))); new BMessage(kMsgToggleLiveInDeskbar)));
BDeskbar deskbar; BDeskbar deskbar;
item->SetMarked(deskbar.HasItem(kDeskbarItemName)); item->SetMarked(deskbar.HasItem(kDeskbarItemName));
} }
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem(B_TRANSLATE("About Workspaces" menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)));
menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
new BMessage(B_QUIT_REQUESTED))); new BMessage(B_QUIT_REQUESTED)));
menu->SetTargetForItems(window); menu->SetTargetForItems(window);
} else { } else {