Ticket #8156: workspaces2.patch

src/apps/workspaces/Workspaces.cpp

@@ -14 +14 @@
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
+#include <Deskbar.h>
 #include <Dragger.h>
 #include <Entry.h>
 #include <File.h>
@@ -40 +41 @@
 #define B_TRANSLATE_CONTEXT "Workspaces"
 
 
+static const char* kDeskbarItemName = "workspaces";
 static const char* kSignature = "application/x-vnd.Be-WORK";
+static const char* kDeskbarSignature = "application/x-vnd.Be-TSKB";
 static const char* kScreenPrefletSignature = "application/x-vnd.Haiku-Screen";
 static const char* kOldSettingFile = "Workspace_data";
 static const char* kSettingsFile = "Workspaces_settings";
@@ -50 +53 @@
 static const uint32 kMsgToggleBorder = 'tgBd';
 static const uint32 kMsgToggleAutoRaise = 'tgAR';
 static const uint32 kMsgToggleAlwaysOnTop = 'tgAT';
+static const uint32 kMsgToggleLiveInDeskbar = 'tgDb';
 
 static const float kScreenBorderOffset = 10.0;
 
+extern "C" _EXPORT BView* instantiate_deskbar_item();
 
 class WorkspacesSettings {
     public:
@@ -89 +94 @@
 
 class WorkspacesView : public BView {
     public:
-        WorkspacesView(BRect frame);
+        WorkspacesView(BRect frame, bool showDragger);
         WorkspacesView(BMessage* archive);
         ~WorkspacesView();
 
@@ -106 +111 @@
         virtual void MouseDown(BPoint where);
 
     private:
-        void _AboutRequested();
-
         void _UpdateParentClipping();
         void _ExcludeFromParentClipping();
         void _CleanupParentClipping();
@@ -142 +145 @@
         WorkspacesApp();
         virtual ~WorkspacesApp();
 
-        virtual void AboutRequested();
         virtual void ArgvReceived(int32 argc, char **argv);
         virtual void ReadyToRun();
 
@@ -331 +333 @@
 //  #pragma mark -
 
 
-WorkspacesView::WorkspacesView(BRect frame)
+WorkspacesView::WorkspacesView(BRect frame, bool showDragger=true)
     :
-    BView(frame, "workspaces", B_FOLLOW_ALL,
+    BView(frame, kDeskbarItemName, B_FOLLOW_ALL,
         kWorkspacesViewFlag | B_FRAME_EVENTS),
     fParentWhichDrawsOnChildren(NULL),
     fCurrentFrame(frame)
 {
-    frame.OffsetTo(B_ORIGIN);
-    frame.top = frame.bottom - 7;
-    frame.left = frame.right - 7;
-    BDragger* dragger = new BDragger(frame, this,
-        B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    AddChild(dragger);
+    if(showDragger) {
+        frame.OffsetTo(B_ORIGIN);
+        frame.top = frame.bottom - 7;
+        frame.left = frame.right - 7;
+        BDragger* dragger = new BDragger(frame, this,
+            B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+        AddChild(dragger);
+    }
 }
 
 
@@ -391 +395 @@
 
 
 void
-WorkspacesView::_AboutRequested()
-{
-    BString text = B_TRANSLATE("Workspaces\n"
-        "written by %1, and %2.\n\n"
-        "Copyright %3, Haiku.\n\n"
-        "Send windows behind using the Option key. "
-        "Move windows to front using the Control key.\n");
-    text.ReplaceFirst("%1", "François Revol, Axel Dörfler");
-    text.ReplaceFirst("%2", "Matt Madia");
-    text.ReplaceFirst("%3", "2002-2008");
-        
-    BAlert *alert = new BAlert("about", text.String(), B_TRANSLATE("OK"));
-    BTextView *view = alert->TextView();
-    BFont font;
-
-    view->SetStylable(true);
-
-    view->GetFont(&font);
-    font.SetSize(18);
-    font.SetFace(B_BOLD_FACE);
-    view->SetFontAndColor(0, 10, &font);
-
-    alert->Go();
-}
-
-
-void
 WorkspacesView::AttachedToWindow()
 {
     BView* parent = Parent();
@@ -490 +467 @@
 WorkspacesView::MessageReceived(BMessage* message)
 {
     switch (message->what) {
-        case B_ABOUT_REQUESTED:
-            _AboutRequested();
-            break;
-
         case kMsgChangeCount:
             be_roster->Launch(kScreenPrefletSignature);
             break;
@@ -576 +549 @@
             new BMessage(kMsgToggleAutoRaise)));
         if (window->IsAutoRaising())
             item->SetMarked(true);
+        if (be_roster->IsRunning(kDeskbarSignature)) {
+            menu->AddItem(item = new BMenuItem(B_TRANSLATE("Live in the Deskbar"),
+            new BMessage(kMsgToggleLiveInDeskbar)));
+            BDeskbar deskbar;
+            item->SetMarked(deskbar.HasItem(kDeskbarItemName));
+        }
 
         menu->AddSeparatorItem();
-        menu->AddItem(new BMenuItem(B_TRANSLATE("About Workspaces" 
-            B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)));
         menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), 
             new BMessage(B_QUIT_REQUESTED)));
         menu->SetTargetForItems(window);
@@ -712 +689 @@
             break;
         }
 
-        case B_ABOUT_REQUESTED:
-            PostMessage(message, ChildAt(0));
-            break;
-
         case kMsgToggleBorder:
         {
             bool enable = false;
@@ -772 +745 @@
             fSettings->SetAlwaysOnTop(enable);
             break;
         }
+        
+        case kMsgToggleLiveInDeskbar:
+        {
+            BDeskbar deskbar;
+            if (deskbar.HasItem (kDeskbarItemName))
+                deskbar.RemoveItem (kDeskbarItemName);
+            else {
+                entry_ref ref;
+                be_roster->FindApp(kSignature, &ref);
+                deskbar.AddItem(&ref);
+            }
+            break;
+        }
 
         default:
             BWindow::MessageReceived(message);
@@ -820 +806 @@
 
 
 void
-WorkspacesApp::AboutRequested()
-{
-    fWindow->PostMessage(B_ABOUT_REQUESTED);
-}
-
-
-void
 WorkspacesApp::Usage(const char *programName)
 {
     printf(B_TRANSLATE("Usage: %s [options] [workspace]\n"
@@ -904 +883 @@
 }
 
 
+BView* instantiate_deskbar_item()
+{
+    return new WorkspacesView(BRect (0, 0, 75, 15), false);
+}
+
+
 void
 WorkspacesApp::ReadyToRun()
 {