prevent that the user can open more than one instance of the settings dialog

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index d2157297726aac1e184577074d7ffdb9ae43a16c..76bd86264693c17c562479aa13b6b3777f893564 100644 (file)
--- 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;
                 }
@@ -211,8 +208,18 @@ 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();
+
+        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()) {
@@ -234,6 +241,7 @@ 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:
@@ -354,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;