X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2fdeb4f5bbbbb10ed98d43616740a52ed2fc14f7..ed0df8dc1fc9576e36c920882e7f4b00a2811113:/src/dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 9108d2c46..bb1fd36dd 100644
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -48,7 +48,7 @@
 #include <QDir>
 #include <QFileInfo>
 
-static const char* others = I18N_NOOP2("@title:group Name", "Others");
+const char* DolphinModel::m_others = I18N_NOOP2("@title:group Name", "Others");
 
 DolphinModel::DolphinModel(QObject* parent)
     : KDirModel(parent)
@@ -142,15 +142,12 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
     case KDirModel::Name: {
         // KDirModel checks columns to know to which role are
         // we talking about
-        QModelIndex theIndex = index.model()->index(index.row(),
-            KDirModel::Name,
-            index.parent());
-
-        if (!theIndex.isValid()) {
+        const QModelIndex nameIndex = index.model()->index(index.row(), KDirModel::Name, index.parent());
+        if (!nameIndex.isValid()) {
             return retString;
         }
-        QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
-        QString name = data.toString();
+        const QVariant data = nameIndex.model()->data(nameIndex, Qt::DisplayRole);
+        const QString name = data.toString();
         if (!name.isEmpty()) {
             if (!item.isHidden() && name.at(0).isLetter())
                 retString = name.at(0).toUpper();
@@ -159,7 +156,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     if (name.size() > 1 && name.at(1).isLetter()) {
                         retString = name.at(1).toUpper();
                     } else {
-                        retString = i18nc("@title:group Name", others);
+                        retString = i18nc("@title:group Name", m_others);
                     }
                 } else {
                     retString = name.at(0).toUpper();
@@ -173,14 +170,14 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     if (currA->isLetter()) {
                         validCategory = true;
                     } else if (currA->isDigit()) {
-                        return i18nc("@title:group Name", others);
+                        return i18nc("@title:group Name", m_others);
                     } else {
                         ++currA;
                     }
                 }
 
                 if (!validCategory) {
-                    retString = validCategory ? *currA : i18nc("@title:group Name", others);
+                    retString = validCategory ? *currA : i18nc("@title:group Name", m_others);
                 } else {
                     retString = *currA;
                 }
@@ -210,12 +207,24 @@ 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);
+
+        int yearForCurrentWeek = 0;
+        int currentWeek = currentDate.weekNumber(&yearForCurrentWeek);
+        if (yearForCurrentWeek == currentDate.year() + 1) {
+            currentWeek = 53;
+        }
+
+        int yearForModifiedWeek = 0;
+        int modifiedWeek = modifiedDate.weekNumber(&yearForModifiedWeek);
+        if (yearForModifiedWeek == modifiedDate.year() + 1) {
+            modifiedWeek = 53;
+        }
+
+        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"));
@@ -231,13 +240,31 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                 retString = i18nc("@title:group Date", "Three Weeks Ago");
                 break;
             case 4:
+            case 5:
                 retString = i18nc("@title:group Date", "Earlier this Month");
                 break;
             default:
                 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"));
+            const QDate lastMonthDate = currentDate.addMonths(-1);
+            if  (lastMonthDate.year() == modifiedDate.year() && lastMonthDate.month() == modifiedDate.month()) {
+                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;
     }
@@ -335,8 +362,8 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
     switch (index.column()) {
     case KDirModel::Name: {
         retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
-
-        if (retVariant == i18nc("@title:group Name", others)) {
+        if (retVariant == i18nc("@title:group Name", m_others)) {
+            // assure that the "Others" group is always the last categorization
             retVariant = QString(QChar(QChar::ReplacementCharacter));
         }
         break;
@@ -363,19 +390,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;
     }