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

Tracker: Introduce "Restart Deskbar" option (+alpha3)

Browse Source 
* Matches "Restart Tracker" option in Deskbar
* Only shows up when 0 Deskbar processes exist
* Don't dereference fFileMenu if RepopulateMenus called
  on desktop (no menu bar)
* Regenerate desktop menu on each click
* Resolves #9039
This commit is contained in:
Alexander von Gluck IV
2012-10-02 18:25:17 +00:00
parent 9af3b83575
commit ff09527e4f
3 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/ContainerWindow.cpp
+36 -23
View File
@@ -873,34 +873,36 @@ BContainerWindow::RepopulateMenus()
fWindowContextMenu->SetFont(be_plain_font);
AddWindowContextMenus(fWindowContextMenu);
fMenuBar->RemoveItem(fFileMenu);
delete fFileMenu;
fFileMenu = new BMenu(B_TRANSLATE("File"));
AddFileMenu(fFileMenu);
fMenuBar->AddItem(fFileMenu);
if (fMenuBar != NULL) {
fMenuBar->RemoveItem(fFileMenu);
delete fFileMenu;
fFileMenu = new BMenu(B_TRANSLATE("File"));
AddFileMenu(fFileMenu);
fMenuBar->AddItem(fFileMenu);
fMenuBar->RemoveItem(fWindowMenu);
delete fWindowMenu;
fWindowMenu = new BMenu(B_TRANSLATE("Window"));
fMenuBar->AddItem(fWindowMenu);
AddWindowMenu(fWindowMenu);
fMenuBar->RemoveItem(fWindowMenu);
delete fWindowMenu;
fWindowMenu = new BMenu(B_TRANSLATE("Window"));
fMenuBar->AddItem(fWindowMenu);
AddWindowMenu(fWindowMenu);
// just create the attribute, decide to add it later
fMenuBar->RemoveItem(fAttrMenu);
delete fAttrMenu;
fAttrMenu = new BMenu(B_TRANSLATE("Attributes"));
NewAttributeMenu(fAttrMenu);
if (PoseView()->ViewMode() == kListMode)
ShowAttributeMenu();
// just create the attribute, decide to add it later
fMenuBar->RemoveItem(fAttrMenu);
delete fAttrMenu;
fAttrMenu = new BMenu(B_TRANSLATE("Attributes"));
NewAttributeMenu(fAttrMenu);
if (PoseView()->ViewMode() == kListMode)
ShowAttributeMenu();
PopulateArrangeByMenu(fArrangeByMenu);
PopulateArrangeByMenu(fArrangeByMenu);
int32 selectCount = PoseView()->SelectionList()->CountItems();
int32 selectCount = PoseView()->SelectionList()->CountItems();
SetupOpenWithMenu(fFileMenu);
SetupMoveCopyMenus(selectCount ? PoseView()->SelectionList()->
FirstItem()->TargetModel()->EntryRef() : NULL,
fFileMenu);
SetupOpenWithMenu(fFileMenu);
SetupMoveCopyMenus(selectCount ? PoseView()->SelectionList()
->FirstItem()->TargetModel()->EntryRef() : NULL,
fFileMenu);
}
}
@@ -1526,6 +1528,13 @@ BContainerWindow::MessageReceived(BMessage* message)
(new FindWindow())->Show();
break;
case kRestartDeskbar:
{
BRoster roster;
roster.Launch(kDeskbarSignature);
break;
}
case kQuitTracker:
be_app->PostMessage(B_QUIT_REQUESTED);
break;
@@ -2713,6 +2722,10 @@ BContainerWindow::ShowContextMenu(BPoint loc, const entry_ref* ref, BView*)
if (fWindowContextMenu->Window())
return;
// Repopulate desktop menu if IsDesktop
if (dynamic_cast<BDeskWindow*>(this))
RepopulateMenus();
MenusEnded();
// clicked on a window, show window context menu