[Details mode] Allow to fill the column size of directories with actual size

[dolphin.git] / src / kitemviews / kfileitemlistwidget.cpp

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 4938e9d6dbf70ea8adba4b58d4550cf2e15b4b9f..a495a4c2ff63095511f421b740cc68c23f1e1388 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,13 +21,11 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 

-#include <kmimetype.h>
-#include <KDebug>
-#include <KGlobal>
-#include <KLocale>
-#include <KIO/MetaData>
-#include <QDateTime>
+#include "dolphin_detailsmodesettings.h"
+

 #include <KFormat>
 #include <KFormat>

+#include <KLocalizedString>
+

 #include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
 #include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :


@@ -68,23 +66,39 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
 
     if (role == "size") {
         if (values.value("isDir").toBool()) {
 
     if (role == "size") {
         if (values.value("isDir").toBool()) {

-            // The item represents a directory. Show the number of sub directories
-            // instead of the file size of the directory.
+            // The item represents a directory.

             if (!roleValue.isNull()) {
             if (!roleValue.isNull()) {

-                const int count = roleValue.toInt();
+                const int count = values.value("count").toInt();

                 if (count < 0) {
                     text = i18nc("@item:intable", "Unknown");
                 } else {
                 if (count < 0) {
                     text = i18nc("@item:intable", "Unknown");
                 } else {

-                    text = i18ncp("@item:intable", "%1 item", "%1 items", count);
+                    if (DetailsModeSettings::directorySizeCount()) {
+                        //  Show the number of sub directories instead of the file size of the directory.
+                        text = i18ncp("@item:intable", "%1 item", "%1 items", count);
+                    } else {
+                        // if we have directory size available
+                        if (roleValue == -1) {
+                            text = i18nc("@item:intable", "Unknown");
+                        } else {
+                            const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();
+                            text = KFormat().formatByteSize(size);
+                        }
+                    }

                 }
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();
             text = KFormat().formatByteSize(size);
         }
                 }
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();
             text = KFormat().formatByteSize(size);
         }

-    } else if (role == "date") {
+    } else if (role == "modificationtime" || role == "creationtime" || role == "accesstime") {
+            bool ok;
+            const long long time = roleValue.toLongLong(&ok);
+            if (ok && time != -1) {
+                return QLocale().toString(QDateTime::fromSecsSinceEpoch(time), QLocale::ShortFormat);
+            }
+    } else if (role == "deletiontime" || role == "imageDateTime") {

         const QDateTime dateTime = roleValue.toDateTime();
         const QDateTime dateTime = roleValue.toDateTime();

-        text = KLocale::global()->formatDateTime(dateTime);
+        text = QLocale().toString(dateTime, QLocale::ShortFormat);

     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }
     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }


@@ -122,7 +136,7 @@ bool KFileItemListWidget::isRoleRightAligned(const QByteArray& role) const
 
 bool KFileItemListWidget::isHidden() const
 {
 
 bool KFileItemListWidget::isHidden() const
 {

-    return data().value("text").toString().startsWith(QLatin1Char('.'));
+    return data().value("isHidden").toBool();

 }
 
 QFont KFileItemListWidget::customizedFont(const QFont& baseFont) const
 }
 
 QFont KFileItemListWidget::customizedFont(const QFont& baseFont) const