SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 14d9af12b5ecddacb5b53850f9fb95fc485d2554..2808736eeba61d0f5385eaf9774ecf537298672a 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -208,11 +208,20 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
         const QDate modifiedDate = modifiedTime.date();
 
         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()) {
+        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 (daysDistance) {
@@ -231,13 +240,15 @@ 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 {
-            if (daysDistance <= (currentDate.day() + modifiedDate.daysInMonth())) {
+            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) {
@@ -303,7 +314,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
 
         retString = i18nc("@title:group Files and folders by permissions", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
         break;
-                                 }
+    }
 
     case KDirModel::Owner:
         retString = item.user();
@@ -322,7 +333,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
         const quint32 rating = ratingForIndex(index);
         retString = QString::number(rating);
         break;
-                               }
+    }
 
     case DolphinModel::Tags: {
         retString = tagsForIndex(index);
@@ -351,6 +362,10 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
     switch (index.column()) {
     case KDirModel::Name: {
         retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
+        if (retVariant == i18nc("@title:group Name", m_others)) {
+            // assure that the "Others" group is always the last categorization
+            retVariant = QString(QChar(QChar::ReplacementCharacter));
+        }
         break;
     }
 
@@ -395,10 +410,11 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
         break;
 
     case KDirModel::Type:
-        if (item.isDir())
-            retVariant = QString(); // when sorting we want folders to be placed first
-        else
+        if (item.isDir()) {
+            retVariant.clear(); // when sorting we want folders to be placed first
+        } else {
             retVariant = item.mimeComment();
+        }
         break;
 
 #ifdef HAVE_NEPOMUK