Ticket #3560: bug#3560-status-line-enhancement-003.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"
 
 
@@ -56 +59 @@
 
 
 const bigtime_t kBarberPoleDelay = 500000;
-
+bool gMoreFiles;
 
 //  #pragma mark - BCountView
 
@@ -66 +69 @@
     BView(bounds, "CountVw", B_FOLLOW_LEFT + B_FOLLOW_BOTTOM,
         B_PULSE_NEEDED | B_WILL_DRAW),
     fLastCount(-1),
+    fFileCount(0),
+    fDirCount(0),
+    fTotalFilesSize(0),
     fPoseView(view),
     fShowingBarberPole(false),
     fBorderHighlighted(false),
@@ -198 +204 @@
     // invalidate the count text area if necessary
     if (fLastCount != fPoseView->CountItems()) {
         fLastCount = fPoseView->CountItems();
+        _UpdateCountsAndSizes();
         Invalidate(TextInvalRect());
     }
 
@@ -207 +214 @@
 
 
 void
+BCountView::_UpdateCountsAndSizes()
+{
+    fFileCount = 0;
+    fDirCount = 0;
+    fTotalFilesSize = 0;
+    fLastCount = fPoseView->CountItems();
+    gMoreFiles = false;
+
+    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) {
+            gMoreFiles = true;
+            continue;
+        }
+
+        if (S_ISDIR(statbuf.st_mode))
+            fDirCount++;
+        else {
+            fFileCount++;
+            fTotalFilesSize += statbuf.st_size;
+        }
+    }
+}
+
+
+void
 BCountView::Draw(BRect updateRect)
 {
     BRect bounds(Bounds());
@@ -222 +267 @@
         be_control_look->DrawMenuBarBackground(this, bounds, updateRect,
             ViewColor());
     }
-
     BString itemString;
+    BString fileString, folderString, sizeString;
     if (IsTypingAhead())
         itemString << TypeAhead();
     else if (IsFiltering()) {
@@ -232 +277 @@
         if (fLastCount == 0)
             itemString << B_TRANSLATE("no items");
         else {
-            static BMessageFormat format(B_TRANSLATE_COMMENT(
+            static BMessageFormat itemFormat(B_TRANSLATE_COMMENT(
                 "{0, plural, one{# item} other{# items}}",
                 "Number of selected items: \"1 item\" or \"2 items\""));
-            format.Format(itemString, fLastCount);
+            itemFormat.Format(itemString, fLastCount);
+
+            itemString += " | ";
+            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);
+            itemString += folderString;
+
+            itemString += " | ";
+            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%", (gMoreFiles?"+":"") );
+            char sizeBuffer[128];
+            sizeString = string_for_size((double)fTotalFilesSize, 
+                        sizeBuffer, sizeof(sizeBuffer));
+            fileString.ReplaceFirst("%size%", sizeString);
+            itemString += fileString;
         }
     }
-
     BRect textRect(TextInvalRect());
 
     TruncateString(&itemString, IsTypingAhead() ? B_TRUNCATE_BEGINNING

src/kits/tracker/CountView.h

@@ -78 +78 @@
     BRect TextInvalRect() const;
     BRect TextAndBarberPoleRect() const;
     void TrySpinningBarberPole();
+    void _UpdateCountsAndSizes();
 
     int32 fLastCount;
+    int32 fFileCount, fDirCount;
+    off_t fTotalFilesSize;
     BPoseView* fPoseView;
     bool fShowingBarberPole : 1;
     bool fBorderHighlighted : 1;

src/kits/tracker/PoseView.cpp

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