When a grouping per date is done, per default the granularity is one month. This...

- "Weeks" are used for the last 4 weeks excluding the current week.
- "Days" are used for the current week.

Additionally some cleanups of the code has been done, as the method DolphinModel::data() was too long already.

No backport will be done as new strings are introduced. The patch has been reviewed by Rafael Fernández López.

BUG: 158267

svn path=/trunk/KDE/kdebase/apps/; revision=779438

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index baea204b345b60538e0765f7c4513d9e2a365069..1022aeeb68980d6ee857db41b543f74f2f100806 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -48,9 +48,9 @@
 #include <QDir>
 #include <QFileInfo>
 
 #include <QDir>
 #include <QFileInfo>
 

-static const char *others = I18N_NOOP2("@title:group Name", "Others");
+static const char* others = I18N_NOOP2("@title:group Name", "Others");

 
 

-DolphinModel::DolphinModel(QObject *parent)
+DolphinModel::DolphinModel(QObject* parent)

     : KDirModel(parent)
 {
 }
     : KDirModel(parent)
 {
 }


@@ -59,316 +59,363 @@ DolphinModel::~DolphinModel()
 {
 }
 
 {
 }
 

-QVariant DolphinModel::data(const QModelIndex &index, int role) const
+QVariant DolphinModel::data(const QModelIndex& index, int role) const

 {
 {

-    if (role == KCategorizedSortFilterProxyModel::CategoryDisplayRole) {
-        QString retString;
-
-        if (!index.isValid()) {
-            return retString;
-        }
-
-        const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
-        KFileItem item = dirModel->itemForIndex(index);
-
-        switch (index.column()) {
-            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()) {
-                    return retString;
-                }
-                QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
-                QString name = data.toString();
-                if (!name.isEmpty()) {
-                    if (!item.isHidden() && name.at(0).isLetter())
-                        retString = name.at(0).toUpper();
-                    else if (item.isHidden()) {
-                        if (name.at(0) == '.') {
-                            if (name.size() > 1 && name.at(1).isLetter()) {
-                                retString = name.at(1).toUpper();
-                            } else {
-                                retString = i18nc("@title:group Name", others);
-                            }
-                        } else {
-                            retString = name.at(0).toUpper();
-                        }
-                    } else {
-                        bool validCategory = false;
-
-                        const QString str(name.toUpper());
-                        const QChar* currA = str.unicode();
-                        while (!currA->isNull() && !validCategory) {
-                            if (currA->isLetter()) {
-                                validCategory = true;
-                            } else if (currA->isDigit()) {
-                                return i18nc("@title:group Name", others);
-                            } else {
-                                ++currA;
-                            }
-                        }
-
-                        if (!validCategory) {
-                            retString = validCategory ? *currA : i18nc("@title:group Name", others);
-                        } else {
-                            retString = *currA;
-                        }
-                    }
-                }
-                break;
-            }
-
-            case KDirModel::Size: {
-                const int fileSize = !item.isNull() ? item.size() : -1;
-                if (!item.isNull() && item.isDir()) {
-                    retString = i18nc("@title:group Size", "Folders");
-                } else if (fileSize < 5242880) {
-                    retString = i18nc("@title:group Size", "Small");
-                } else if (fileSize < 10485760) {
-                    retString = i18nc("@title:group Size", "Medium");
-                } else {
-                    retString = i18nc("@title:group Size", "Big");
-                }
-                break;
-            }
-
-            case KDirModel::ModifiedTime: {
-                KDateTime modifiedTime = item.time(KFileItem::ModificationTime);
-                modifiedTime = modifiedTime.toLocalZone();
+    switch (role) {
+    case KCategorizedSortFilterProxyModel::CategoryDisplayRole:
+        return displayRoleData(index);
+    case KCategorizedSortFilterProxyModel::CategorySortRole:
+        return sortRoleData(index);
+    default:
+        return KDirModel::data(index, role);
+    }
+}

 
 

-                retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
-                break;
-            }
+int DolphinModel::columnCount(const QModelIndex &parent) const
+{
+    return KDirModel::columnCount(parent) + (ExtraColumnCount - ColumnCount);
+}

 
 

-            case KDirModel::Permissions: {
-                QString user;
-                QString group;
-                QString others;
+quint32 DolphinModel::ratingForIndex(const QModelIndex& index)
+{
+#ifdef HAVE_NEPOMUK
+    quint32 rating = 0;

 
 

-                QFileInfo info(item.url().pathOrUrl());
+    const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
+    KFileItem item = dolphinModel->itemForIndex(index);
+    if (!item.isNull()) {
+        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());
+        rating = resource.rating();
+    }
+    return rating;
+#else
+    Q_UNUSED(index);
+    return 0;
+#endif
+}

 
 

-                if (info.permission(QFile::ReadUser))
-                    user = i18n("Read, ");
+QString DolphinModel::tagsForIndex(const QModelIndex& index)
+{
+#ifdef HAVE_NEPOMUK
+    QString tagsString;

 
 

-                if (info.permission(QFile::WriteUser))
-                    user += i18n("Write, ");
+    const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
+    KFileItem item = dolphinModel->itemForIndex(index);
+    if (!item.isNull()) {
+        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());
+        const QList<Nepomuk::Tag> tags = resource.tags();
+        QStringList stringList;
+        foreach (const Nepomuk::Tag& tag, tags) {
+            stringList.append(tag.label());
+        }
+        stringList.sort();

 
 

-                if (info.permission(QFile::ExeUser))
-                    user += i18n("Execute, ");
+        foreach (const QString& str, stringList) {
+            tagsString += str;
+            tagsString += ", ";
+        }

 
 

-                if (user.isEmpty())
-                    user = i18n("Forbidden");
-                else
-                    user = user.mid(0, user.count() - 2);
+        if (!tagsString.isEmpty()) {
+            tagsString.resize(tagsString.size() - 2);
+        }
+    }

 
 

-                if (info.permission(QFile::ReadGroup))
-                    group = i18n("Read, ");
+    return tagsString;
+#else
+    Q_UNUSED(index);
+    return QString();
+#endif
+}

 
 

-                if (info.permission(QFile::WriteGroup))
-                    group += i18n("Write, ");
+QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
+{
+    QString retString;

 
 

-                if (info.permission(QFile::ExeGroup))
-                    group += i18n("Execute, ");
+    if (!index.isValid()) {
+        return retString;
+    }

 
 

-                if (group.isEmpty())
-                    group = i18n("Forbidden");
-                else
-                    group = group.mid(0, group.count() - 2);
+    const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
+    KFileItem item = dirModel->itemForIndex(index);

 
 

-                if (info.permission(QFile::ReadOther))
-                    others = i18n("Read, ");
+    switch (index.column()) {
+    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 (info.permission(QFile::WriteOther))
-                    others += i18n("Write, ");
+        if (!theIndex.isValid()) {
+            return retString;
+        }
+        QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
+        QString name = data.toString();
+        if (!name.isEmpty()) {
+            if (!item.isHidden() && name.at(0).isLetter())
+                retString = name.at(0).toUpper();
+            else if (item.isHidden()) {
+                if (name.at(0) == '.') {
+                    if (name.size() > 1 && name.at(1).isLetter()) {
+                        retString = name.at(1).toUpper();
+                    } else {
+                        retString = i18nc("@title:group Name", others);
+                    }
+                } else {
+                    retString = name.at(0).toUpper();
+                }
+            } else {
+                bool validCategory = false;
+
+                const QString str(name.toUpper());
+                const QChar* currA = str.unicode();
+                while (!currA->isNull() && !validCategory) {
+                    if (currA->isLetter()) {
+                        validCategory = true;
+                    } else if (currA->isDigit()) {
+                        return i18nc("@title:group Name", others);
+                    } else {
+                        ++currA;
+                    }
+                }

 
 

-                if (info.permission(QFile::ExeOther))
-                    others += i18n("Execute, ");
+                if (!validCategory) {
+                    retString = validCategory ? *currA : i18nc("@title:group Name", others);
+                } else {
+                    retString = *currA;
+                }
+            }
+        }
+        break;
+    }

 
 

-                if (others.isEmpty())
-                    others = i18n("Forbidden");
-                else
-                    others = others.mid(0, others.count() - 2);
+    case KDirModel::Size: {
+        const int fileSize = !item.isNull() ? item.size() : -1;
+        if (!item.isNull() && item.isDir()) {
+            retString = i18nc("@title:group Size", "Folders");
+        } else if (fileSize < 5242880) {
+            retString = i18nc("@title:group Size", "Small");
+        } else if (fileSize < 10485760) {
+            retString = i18nc("@title:group Size", "Medium");
+        } else {
+            retString = i18nc("@title:group Size", "Big");
+        }
+        break;
+    }

 
 

-                retString = i18nc("This shows files and folders permissions: user, group and others", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
+    case KDirModel::ModifiedTime: {
+        KDateTime modifiedTime = item.time(KFileItem::ModificationTime);
+        modifiedTime = modifiedTime.toLocalZone();
+
+        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();
+            switch (currentWeek - modifiedWeek) {
+            case 0:
+                switch (modifiedDate.daysTo(currentDate)) {
+                case 0:  retString = i18nc("@title:group Date", "Today"); break;
+                case 1:  retString = i18nc("@title:group Date", "Yesterday"); break;
+                default: retString = modifiedTime.toString(i18nc("Prints out the week day name: %A", "%A"));
+                }

                 break;
                 break;

-            }
-
-            case KDirModel::Owner:
-                retString = item.user();
+            case 1:
+                retString = i18nc("@title:group Date", "Last Week");

                 break;
                 break;

-
-            case KDirModel::Group:
-                retString = item.group();
+            case 2:
+                retString = i18nc("@title:group Date", "Two Weeks Ago");

                 break;
                 break;

-
-            case KDirModel::Type:
-                retString = item.mimeComment();
+            case 3:
+                retString = i18nc("@title:group Date", "Three Weeks Ago");

                 break;
                 break;

-
-#ifdef HAVE_NEPOMUK
-            case DolphinModel::Rating: {
-                const quint32 rating = ratingForIndex(index);
-
-                retString = QString::number(rating);
+            case 4:
+                retString = i18nc("@title:group Date", "Earlier this Month");

                 break;
                 break;

+            default:
+                Q_ASSERT(false);

             }
             }

+        } else {
+            retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
+        }
+        break;
+    }

 
 

-            case DolphinModel::Tags: {
-                retString = tagsForIndex(index);
+    case KDirModel::Permissions: {
+        QString user;
+        QString group;
+        QString others;

 
 

-                if (retString.isEmpty()) {
-                    retString = i18nc("@title:group Tags", "Not yet tagged");
-                }
-                break;
-            }
-#endif
+        QFileInfo info(item.url().pathOrUrl());
+
+        // set user string
+        if (info.permission(QFile::ReadUser)) {
+            user = i18n("Read, ");

         }
         }

+        if (info.permission(QFile::WriteUser)) {
+            user += i18n("Write, ");
+        }
+        if (info.permission(QFile::ExeUser)) {
+            user += i18n("Execute, ");
+        }
+        user = user.isEmpty() ? i18n("Forbidden") : user.mid(0, user.count() - 2);

 
 

-        return retString;
-    }
-    else if (role == KCategorizedSortFilterProxyModel::CategorySortRole) {
-        QVariant retVariant;
+        // set group string
+        if (info.permission(QFile::ReadGroup)) {
+            group = i18n("Read, ");
+        }
+        if (info.permission(QFile::WriteGroup)) {
+            group += i18n("Write, ");
+        }
+        if (info.permission(QFile::ExeGroup)) {
+            group += i18n("Execute, ");
+        }
+        group = group.isEmpty() ? i18n("Forbidden") : group.mid(0, group.count() - 2);

 
 

-        if (!index.isValid()) {
-            return retVariant;
+        // set permission string
+        if (info.permission(QFile::ReadOther)) {
+            others = i18n("Read, ");
+        }
+        if (info.permission(QFile::WriteOther)) {
+            others += i18n("Write, ");
+        }
+        if (info.permission(QFile::ExeOther)) {
+            others += i18n("Execute, ");

         }
         }

+        others = others.isEmpty() ? i18n("Forbidden") : others.mid(0, others.count() - 2);

 
 

-        const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
-        KFileItem item = dirModel->itemForIndex(index);
+        retString = i18nc("This shows files and folders permissions: user, group and others", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
+        break;
+                                 }

 
 

-        switch (index.column()) {
-        case KDirModel::Name: {
-            retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
+    case KDirModel::Owner:
+        retString = item.user();
+        break;

 
 

-            if (retVariant == i18nc("@title:group Name", others))
-                retVariant = QString(QChar(QChar::ReplacementCharacter));
+    case KDirModel::Group:
+        retString = item.group();
+        break;

 
 

-            break;
-        }
+    case KDirModel::Type:
+        retString = item.mimeComment();
+        break;

 
 

-        case KDirModel::Size: {
-            const int fileSize = !item.isNull() ? item.size() : -1;
-            if (item.isDir()) {
-                retVariant = 0;
-            } else if (fileSize < 5242880) {
-                retVariant = 1;
-            } else if (fileSize < 10485760) {
-                retVariant = 2;
-            } else {
-                retVariant = 3;
-            }
-            break;
+#ifdef HAVE_NEPOMUK
+    case DolphinModel::Rating: {
+        const quint32 rating = ratingForIndex(index);
+        retString = QString::number(rating);
+        break;
+                               }
+
+    case DolphinModel::Tags: {
+        retString = tagsForIndex(index);
+        if (retString.isEmpty()) {
+            retString = i18nc("@title:group Tags", "Not yet tagged");

         }
         }

+        break;
+    }
+#endif
+    }

 
 

-        case KDirModel::ModifiedTime: {
-            KDateTime modifiedTime = item.time(KFileItem::ModificationTime);
-            modifiedTime = modifiedTime.toLocalZone();
-
-            retVariant = modifiedTime.date().year() * 100 + modifiedTime.date().month();
-            break;
-        }
+    return retString;
+}

 
 

-        case KDirModel::Permissions: {
-            QFileInfo info(item.url().pathOrUrl());
+QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
+{
+    QVariant retVariant;

 
 

-            retVariant = -KDirSortFilterProxyModel::pointsForPermissions(info);
-            break;
-        }
+    if (!index.isValid()) {
+        return retVariant;
+    }

 
 

-        case KDirModel::Owner:
-            retVariant = item.user();
-            break;
+    const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
+    KFileItem item = dirModel->itemForIndex(index);

 
 

-        case KDirModel::Group:
-            retVariant = item.group();
-            break;
+    switch (index.column()) {
+    case KDirModel::Name: {
+        retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);

 
 

-        case KDirModel::Type:
-            if (item.isDir())
-                retVariant = QString(); // when sorting we want folders to be placed first
-            else
-                retVariant = item.mimeComment();
-            break;
+        if (retVariant == i18nc("@title:group Name", others)) {
+            retVariant = QString(QChar(QChar::ReplacementCharacter));
+        }
+        break;
+    }

 
 

-#ifdef HAVE_NEPOMUK
-        case DolphinModel::Rating: {
-            retVariant = ratingForIndex(index);
-            break;
+    case KDirModel::Size: {
+        const int fileSize = !item.isNull() ? item.size() : -1;
+        if (item.isDir()) {
+            retVariant = 0;
+        } else if (fileSize < 5242880) {
+            retVariant = 1;
+        } else if (fileSize < 10485760) {
+            retVariant = 2;
+        } else {
+            retVariant = 3;

         }
         }

+        break;
+    }

 
 

-        case DolphinModel::Tags: {
-            retVariant = tagsForIndex(index).count();
-            break;
+    case KDirModel::ModifiedTime: {
+        KDateTime modifiedTime = item.time(KFileItem::ModificationTime);
+        modifiedTime = modifiedTime.toLocalZone();
+
+        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();
+            }

         }
         }

-#endif

 
 

-        default:
-            break;
+        retVariant = modifiedDate.year() * 10000 + modifiedDate.month() * 100 +
+                     weekOfMonth * 10 + dayOfWeek;
+        break;
+    }

 
 

-        }
+    case KDirModel::Permissions: {
+        QFileInfo info(item.url().pathOrUrl());

 
 

-        return retVariant;
+        retVariant = -KDirSortFilterProxyModel::pointsForPermissions(info);
+        break;

     }
 
     }
 

-    return KDirModel::data(index, role);
-}
+    case KDirModel::Owner:
+        retVariant = item.user();
+        break;

 
 

-int DolphinModel::columnCount(const QModelIndex &parent) const
-{
-    return KDirModel::columnCount(parent) + (ExtraColumnCount - ColumnCount);
-}
+    case KDirModel::Group:
+        retVariant = item.group();
+        break;
+
+    case KDirModel::Type:
+        if (item.isDir())
+            retVariant = QString(); // when sorting we want folders to be placed first
+        else
+            retVariant = item.mimeComment();
+        break;

 
 

-quint32 DolphinModel::ratingForIndex(const QModelIndex& index)
-{

 #ifdef HAVE_NEPOMUK
 #ifdef HAVE_NEPOMUK

-    quint32 rating = 0;
+    case DolphinModel::Rating: {
+        retVariant = ratingForIndex(index);
+        break;
+    }

 
 

-    const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
-    KFileItem item = dolphinModel->itemForIndex(index);
-    if (!item.isNull()) {
-        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());
-        rating = resource.rating();
+    case DolphinModel::Tags: {
+        retVariant = tagsForIndex(index).count();
+        break;

     }
     }

-    return rating;
-#else
-    Q_UNUSED(index);
-    return 0;

 #endif
 #endif

-}
-
-QString DolphinModel::tagsForIndex(const QModelIndex& index)
-{
-#ifdef HAVE_NEPOMUK
-    QString tagsString;
-
-    const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
-    KFileItem item = dolphinModel->itemForIndex(index);
-    if (!item.isNull()) {
-        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());
-        const QList<Nepomuk::Tag> tags = resource.tags();
-        QStringList stringList;
-        foreach (const Nepomuk::Tag& tag, tags) {
-            stringList.append(tag.label());
-        }
-        stringList.sort();

 
 

-        foreach (const QString& str, stringList) {
-            tagsString += str;
-            tagsString += ", ";
-        }
-
-        if (!tagsString.isEmpty()) {
-            tagsString.resize(tagsString.size() - 2);
-        }
+    default:
+        break;

     }
 
     }
 

-    return tagsString;
-#else
-    Q_UNUSED(index);
-    return QString();
-#endif
+    return retVariant;

 }
 }

diff --git a/src/dolphinmodel.h b/src/dolphinmodel.h
index 4bca6aca025095f7cda88e9595c16eb8ec67a30e..abd53a7c3b4f5afe4805e7ccc2f27a613852f275 100644 (file)
--- a/src/dolphinmodel.h
+++ b/src/dolphinmodel.h
@@ -35,12 +35,12 @@ public:
         ExtraColumnCount
     };
 
         ExtraColumnCount
     };
 

-    DolphinModel(QObject *parent = 0);
+    DolphinModel(QObject* parent = 0);

     virtual ~DolphinModel();
 
     virtual ~DolphinModel();
 

-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

 
 

-    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;

 
     /**
      * Returns the rating for the item with the index \a index. 0 is
 
     /**
      * Returns the rating for the item with the index \a index. 0 is


@@ -53,6 +53,10 @@ public:
      * tag is applied, a predefined string will be returned.
      */
     static QString tagsForIndex(const QModelIndex& index);
      * tag is applied, a predefined string will be returned.
      */
     static QString tagsForIndex(const QModelIndex& index);

+
+private:
+    QVariant displayRoleData(const QModelIndex& index) const;
+    QVariant sortRoleData(const QModelIndex& index) const;

 };
 
 #endif // DOLPHINMODEL_H
 };
 
 #endif // DOLPHINMODEL_H