X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/428a5cacceb9944b0ad803608de663cc84fcdadc..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index eab1204bf..d21572977 100644
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -190,7 +190,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
     }
 
     case KDirModel::Size: {
-        const int fileSize = !item.isNull() ? item.size() : -1;
+        const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;
         if (!item.isNull() && item.isDir()) {
             retString = i18nc("@title:group Size", "Folders");
         } else if (fileSize < 5242880) {
@@ -210,12 +210,15 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
         const QDate currentDate = KDateTime::currentLocalDateTime().date();
         const QDate modifiedDate = modifiedTime.date();
 
-        if ((currentDate.year() == modifiedDate.year()) && (currentDate.month() == modifiedDate.month())) {
-            const int currentWeek = currentDate.weekNumber();
-            const int modifiedWeek = modifiedDate.weekNumber();
+        const int daysDistance = modifiedDate.daysTo(currentDate);
+        const int currentWeek = currentDate.weekNumber();
+        const int modifiedWeek = modifiedDate.weekNumber();
+
+        if (currentDate.year() == modifiedDate.year() &&
+            currentDate.month() == modifiedDate.month()) {
             switch (currentWeek - modifiedWeek) {
             case 0:
-                switch (modifiedDate.daysTo(currentDate)) {
+                switch (daysDistance) {
                 case 0:  retString = i18nc("@title:group Date", "Today"); break;
                 case 1:  retString = i18nc("@title:group Date", "Yesterday"); break;
                 default: retString = modifiedTime.toString(i18nc("@title:group The week day name: %A", "%A"));
@@ -237,7 +240,23 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                 Q_ASSERT(false);
             }
         } else {
-            retString = modifiedTime.toString(i18nc("@title:group The month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
+            if (daysDistance <= (currentDate.day() + modifiedDate.daysInMonth())) {
+                if (daysDistance == 1) {
+                    retString = i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Yesterday (%B, %Y)");
+                } else if (daysDistance <= 7) {
+                    retString = modifiedTime.toString(i18nc("@title:group The week day name: %A, %B is full month name in current locale, and %Y is full year number", "%A (%B, %Y)"));
+                } else if (daysDistance <= 7 * 2) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Last Week (%B, %Y)"));
+                } else if (daysDistance <= 7 * 3) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Two Weeks Ago (%B, %Y)"));
+                } else if (daysDistance <= 7 * 4) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Three Weeks Ago (%B, %Y)"));
+                } else {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Earlier on %B, %Y"));
+                }
+            } else {
+                retString = modifiedTime.toString(i18nc("@title:group The month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
+            }
         }
         break;
     }
@@ -343,7 +362,7 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
     }
 
     case KDirModel::Size: {
-        const int fileSize = !item.isNull() ? item.size() : -1;
+        const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;
         if (item.isDir()) {
             retVariant = 0;
         } else if (fileSize < 5242880) {
@@ -363,19 +382,7 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
         const QDate currentDate = KDateTime::currentLocalDateTime().date();
         const QDate modifiedDate = modifiedTime.date();
 
-        int weekOfMonth = 0;
-        int dayOfWeek = 0;
-        if ((currentDate.year() == modifiedDate.year()) && (currentDate.month() == modifiedDate.month())) {
-            weekOfMonth = 4 - currentDate.weekNumber() + modifiedDate.weekNumber();
-            Q_ASSERT(weekOfMonth >= 0);
-            Q_ASSERT(weekOfMonth <= 4);
-            if (weekOfMonth == 0) {
-                dayOfWeek = modifiedDate.dayOfWeek();
-            }
-        }
-
-        retVariant = modifiedDate.year() * 10000 + modifiedDate.month() * 100 +
-                     weekOfMonth * 10 + dayOfWeek;
+        retVariant = -modifiedDate.daysTo(currentDate);
         break;
     }