Ticket #2833: CloseAllWorkspace.diff

Tracker.h

@@ -192 +192 @@
 
         void CloseAllWindows();
         void CloseWindowAndChildren(const node_ref *);
+        void CloseAllInWorkspace();
         void OpenInfoWindows(BMessage*);
         void MoveRefsToTrash(const BMessage *);
         void OpenContainerWindow(Model *, BMessage *refsList = NULL,

ContainerWindow.cpp

@@ -1488 +1488 @@
             be_app->PostMessage(B_QUIT_REQUESTED);
             break;
 
+        case kCloseAllWindows:
+            be_app->PostMessage(kCloseAllWindows);
+            break;
+
+        case kCloseAllInWorkspace:
+            be_app->PostMessage(kCloseAllInWorkspace);
+            break;
+
         case kRestoreBackgroundImage:
             UpdateBackgroundImage();
             break;
@@ -1975 +1983 @@
     item->SetTarget(this);
     menu->AddItem(item);
 
+    item = new BMenuItem("Close All", new BMessage(kCloseAllWindows), 'Q');
+    item->SetTarget(this);
+    menu->AddItem(item);
+
+    item = new BMenuItem("Close All In Workspace", new BMessage(kCloseAllInWorkspace),
+        'Q', B_SHIFT_KEY);
+    item->SetTarget(this);
+    menu->AddItem(item);
+
     menu->AddSeparatorItem();
 
     item = new BMenuItem("Preferences"B_UTF8_ELLIPSIS, new BMessage(kShowSettingsWindow));

Tracker.cpp

@@ -387 +387 @@
             CloseAllWindows();
             break;
 
+        case kCloseAllInWorkspace:
+            CloseAllInWorkspace();
+            break;
+
         case kFindButton:
             (new FindWindow())->Show();
             break;
@@ -837 +841 @@
     }
 }
 
-
 void
 TTracker::OpenContainerWindow(Model *model, BMessage *originalRefsList,
     OpenSelector openSelector, uint32 openFlags, bool checkAlreadyOpen,
@@ -1173 +1176 @@
 
 
 void
+TTracker::CloseAllInWorkspace()
+{
+    AutoLock<WindowList> lock(&fWindowList);
+
+    int32 currentWorkspace = 1 << current_workspace();
+    // count from end to beginning so we can remove items safely
+    for (int32 index = fWindowList.CountItems() - 1; index >= 0; index--) {
+        BWindow *window = fWindowList.ItemAt(index);
+        if (window->Workspaces() & currentWorkspace)
+            // avoid the desktop
+            if (!dynamic_cast<BDeskWindow *>(window) 
+                && !dynamic_cast<BStatusWindow *>(window))
+                window->PostMessage(B_QUIT_REQUESTED);
+    }   
+}   
+
+
+void
 TTracker::CloseAllWindows()
 {
     // this is a response to the DeskBar sending us a B_QUIT, when it really

Commands.h

@@ -50 +50 @@
 const uint32 kOpenSelectionWith = 'Tosu';
 const uint32 kCloseAllWindows = 'Tall';
 const uint32 kCloseWindowAndChildren = 'Tcwc';
+const uint32 kCloseAllInWorkspace = 'Tciw';
 
 // end external app messages