Ticket #9039: Tracker-RestartDeskbar.diff

src/kits/tracker/Commands.h

@@ -78 +78 @@
 const uint32 kEmptyTrash = 'Tetr';
 const uint32 kAddPrinter = 'Tadp';
 const uint32 kMakeActivePrinter = 'Tmap';
+const uint32 kRestartDeskbar = 'DBar';
 
 const uint32 kRunAutomounterSettings = 'Tram';
 

src/kits/tracker/ContainerWindow.cpp

@@ -873 +873 @@
     fWindowContextMenu->SetFont(be_plain_font);
     AddWindowContextMenus(fWindowContextMenu);
 
-    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);
-
-    // 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();
+    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);
+
+        // 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 +1528 @@
             (new FindWindow())->Show();
             break;
 
+        case kRestartDeskbar:
+        {
+            BRoster roster;
+            roster.Launch(kDeskbarSignature);
+            break;
+        }
+
         case kQuitTracker:
             be_app->PostMessage(B_QUIT_REQUESTED);
             break;
@@ -2713 +2722 @@
         if (fWindowContextMenu->Window())
             return;
 
+        // Repopulate desktop menu if IsDesktop
+        if (dynamic_cast<BDeskWindow*>(this))
+            RepopulateMenus();
+
         MenusEnded();
 
         // clicked on a window, show window context menu

src/kits/tracker/DeskWindow.cpp

@@ -39 +39 @@
 #include <NodeMonitor.h>
 #include <Path.h>
 #include <PopUpMenu.h>
+#include <Roster.h>
 #include <Screen.h>
 #include <Volume.h>
 #include <VolumeRoster.h>
@@ -274 +275 @@
 void
 BDeskWindow::AddWindowContextMenus(BMenu* menu)
 {
+    BMenuItem* item;
+
+    BRoster roster;
+    if (!roster.IsRunning(kDeskbarSignature)) {
+        item = new BMenuItem(B_TRANSLATE("Restart Deskbar"),
+            new BMessage(kRestartDeskbar));
+        menu->AddItem(item);
+        menu->AddSeparatorItem();
+    }
+
     TemplatesMenu* tempateMenu = new TemplatesMenu(PoseView(),
         B_TRANSLATE("New"));
 
@@ -287 +298 @@
 
     BMessage* message = new BMessage(kIconMode);
     message->AddInt32("size", 32);
-    BMenuItem* item = new BMenuItem(B_TRANSLATE("32 x 32"), message);
+    item = new BMenuItem(B_TRANSLATE("32 x 32"), message);
     item->SetMarked(PoseView()->IconSizeInt() == 32);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);