Ticket #3560: bug#3560-status-line-enhancement-005.patch

src/kits/tracker/CountView.cpp

@@ -47 +47 @@
 #include "Bitmaps.h"
 #include "ContainerWindow.h"
 #include "DirMenu.h"
+#include "Entry.h"
+#include "Model.h"
 #include "PoseView.h"
+#include "StringForSize.h"
 #include "Utilities.h"
 
 
@@ -66 +69 @@
     BView(bounds, "CountVw", B_FOLLOW_LEFT + B_FOLLOW_BOTTOM,
         B_PULSE_NEEDED | B_WILL_DRAW),
     fLastCount(-1),
+    fLastSelectionCount(0),
+    fFileCount(0),
+    fDirCount(0),
+    fTotalFilesSize(0),
     fPoseView(view),
+    fMoreFiles(false),
     fShowingBarberPole(false),
     fBorderHighlighted(false),
     fBarberPoleMap(NULL),
     fLastBarberPoleOffset(5),
     fStartSpinningAfter(0),
+    fStatusString(""),
     fTypeAheadString(""),
     fFilterString("")
 {
@@ -195 +204 @@
 void
 BCountView::CheckCount()
 {
+    PoseList* selectionList = fPoseView->SelectionList();
     // invalidate the count text area if necessary
-    if (fLastCount != fPoseView->CountItems()) {
+    if (fLastCount != fPoseView->CountItems() ||
+                    fLastSelectionCount != selectionList->CountItems()){
         fLastCount = fPoseView->CountItems();
+        fLastSelectionCount = selectionList->CountItems();
+        _UpdateCountsAndSizes(fLastSelectionCount);
         Invalidate(TextInvalRect());
     }
 
@@ -207 +220 @@
 
 
 void
+BCountView::_UpdateCountsAndSizes(int32 selectionCount)
+{
+    fFileCount = 0;
+    fDirCount = 0;
+    fTotalFilesSize = 0;
+    fLastCount = fPoseView->CountItems();
+    fMoreFiles = false;
+    bool hasSelection = selectionCount==0?false:true;
+
+    node_ref ref;
+    Model* model = fPoseView->TargetModel();
+    if (model->IsDirectory())
+        ref = *model->NodeRef();
+    else {
+        // we can't check for files and folders if model is not a directory
+        return;
+    }
+
+    BDirectory dir(&ref);
+    BEntry entry;
+    while (dir.GetNextEntry(&entry) == B_OK) {
+        StatStruct statbuf;
+        status_t status = entry.GetStat(&statbuf);
+        if (status != B_OK) {
+            fMoreFiles = true;
+            continue;
+        }
+
+        if (S_ISDIR(statbuf.st_mode))
+            fDirCount++;
+        else {
+            fFileCount++;
+            fTotalFilesSize += statbuf.st_size;
+        }
+    }
+        
+    BString itemString,selectionString;
+    BString fileString, folderString, sizeString;
+    BString empty = "--";
+    fStatusString = "";
+    if (IsTypingAhead())
+        fStatusString << TypeAhead();
+    else if (IsFiltering()) {
+        fStatusString << fLastCount << " " << Filter();
+    } else {
+        if (fLastCount == 0)
+            fStatusString << B_TRANSLATE("no items");
+        else {
+            if (!hasSelection) {
+            fStatusString = "";
+            static BMessageFormat itemFormat(B_TRANSLATE_COMMENT(
+                "{0, plural, one{# item} other{# items}}",
+                "Number of selected items: \"1 item\" or \"2 items\""));
+            itemFormat.Format(itemString, fLastCount);
+            fStatusString += itemString;
+
+            fStatusString += " | ";
+            static BMessageFormat folderFormat(B_TRANSLATE_COMMENT(
+                "{0, plural, one{# folder} other{# folders}}",
+                "Number of selected folders: \"1 folder\" or \"2 folders\""));
+            folderFormat.Format(folderString, fDirCount);
+            fStatusString += folderString;
+
+            fStatusString += " | ";
+            static BMessageFormat fileFormat(B_TRANSLATE_COMMENT(
+                "{0, plural, one{#%more% file} other{#%more% files}} (%size%)",
+                "Number of selected files: \"1 file\" or \"2 files\""));
+            fileFormat.Format(fileString, fFileCount);
+            fileString.ReplaceFirst("%more%", (fMoreFiles?"+":"") );
+            char sizeBuffer[128];
+            sizeString = string_for_size((double)fTotalFilesSize,
+                        sizeBuffer, sizeof(sizeBuffer));
+            fileString.ReplaceFirst("%size%", 
+                        (sizeString.Length()==0?empty:sizeString));
+            fStatusString += fileString;
+            }
+            else {
+                fStatusString = "";
+                static BMessageFormat selectionFormat(B_TRANSLATE_COMMENT(
+                    "{0, plural, one{# item} other{# items}} selected",
+                    "Number of selected items: \"1 item selected\"" 
+                        "or \"2 items selected\""));
+                selectionFormat.Format(selectionString, selectionCount);
+                fStatusString += selectionString;
+            }
+        }
+    }
+}
+
+
+void
 BCountView::Draw(BRect updateRect)
 {
     BRect bounds(Bounds());
@@ -223 +327 @@
             ViewColor());
     }
 
-    BString itemString;
-    if (IsTypingAhead())
-        itemString << TypeAhead();
-    else if (IsFiltering()) {
-        itemString << fLastCount << " " << Filter();
-    } else {
-        if (fLastCount == 0)
-            itemString << B_TRANSLATE("no items");
-        else {
-            static BMessageFormat format(B_TRANSLATE_COMMENT(
-                "{0, plural, one{# item} other{# items}}",
-                "Number of selected items: \"1 item\" or \"2 items\""));
-            format.Format(itemString, fLastCount);
-        }
-    }
-
     BRect textRect(TextInvalRect());
 
-    TruncateString(&itemString, IsTypingAhead() ? B_TRUNCATE_BEGINNING
+    TruncateString(&fStatusString, IsTypingAhead() ? B_TRUNCATE_BEGINNING
             : IsFiltering() ? B_TRUNCATE_MIDDLE : B_TRUNCATE_END,
         textRect.Width());
 
@@ -253 +341 @@
         SetHighColor(0, 0, 0);
 
     MovePenTo(textRect.LeftBottom());
-    DrawString(itemString.String());
+    DrawString(fStatusString.String());
 
     bounds.top++;
 

src/kits/tracker/CountView.h

@@ -78 +78 @@
     BRect TextInvalRect() const;
     BRect TextAndBarberPoleRect() const;
     void TrySpinningBarberPole();
+    void _UpdateCountsAndSizes(int32);
 
-    int32 fLastCount;
+    int32 fLastCount, fLastSelectionCount;
+    int32 fFileCount, fDirCount;
+    off_t fTotalFilesSize;
     BPoseView* fPoseView;
+    bool fMoreFiles : 1;
     bool fShowingBarberPole : 1;
     bool fBorderHighlighted : 1;
     BBitmap* fBarberPoleMap;
     float fLastBarberPoleOffset;
     bigtime_t fStartSpinningAfter;
+    BString fStatusString;
     BString fTypeAheadString;
     BString fFilterString;
 };

src/kits/tracker/PoseView.cpp

@@ -111 +111 @@
 
 
 const float kDoubleClickTresh = 6;
-const float kCountViewWidth = 76;
+const float kCountViewWidth = 250;
 
 const uint32 kAddNewPoses = 'Tanp';
 const uint32 kAddPosesCompleted = 'Tapc';