Fix the problem with the column views.

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 26221a094ed5da31c38b5c5076353eb7c08fea67..1b94e0339d2b5bd26c9a419873574851dc36a0d9 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -1,6 +1,6 @@
 /**
   * This file is part of the KDE project
 /**
   * This file is part of the KDE project

-  * Copyright (C) 2007 Rafael Fernández López <ereslibre@gmail.com>
+  * Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>

   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Library General Public
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Library General Public


@@ -29,6 +29,7 @@
 #include <nepomuk/global.h>
 #include <nepomuk/resource.h>
 #include <nepomuk/tag.h>
 #include <nepomuk/global.h>
 #include <nepomuk/resource.h>
 #include <nepomuk/tag.h>

+#include <Soprano/Vocabulary/Xesam>

 #endif
 
 #include <kdatetime.h>
 #endif
 
 #include <kdatetime.h>


@@ -40,7 +41,6 @@
 #include <kuser.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>

-#include <kpixmapeffect.h>

 
 #include <QList>
 #include <QSortFilterProxyModel>
 
 #include <QList>
 #include <QSortFilterProxyModel>


@@ -48,6 +48,8 @@
 #include <QDir>
 #include <QFileInfo>
 
 #include <QDir>
 #include <QFileInfo>
 

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

 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)
 {
 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)
 {


@@ -59,22 +61,18 @@ DolphinModel::~DolphinModel()
 
 QVariant DolphinModel::data(const QModelIndex &index, int role) const
 {
 
 QVariant DolphinModel::data(const QModelIndex &index, int role) const
 {

-    if (role == KCategorizedSortFilterProxyModel::CategoryRole)
-    {
+    if (role == KCategorizedSortFilterProxyModel::CategoryDisplayRole) {

         QString retString;
 
         QString retString;
 

-        if (!index.isValid())
-        {
+        if (!index.isValid()) {

             return retString;
         }
 
         const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
         KFileItem item = dirModel->itemForIndex(index);
 
             return retString;
         }
 
         const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
         KFileItem item = dirModel->itemForIndex(index);
 

-        switch (index.column())
-        {
-            case KDirModel::Name:
-            {
+        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 checks columns to know to which role are
                 // we talking about
                 QModelIndex theIndex = index.model()->index(index.row(),


@@ -84,41 +82,41 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 if (!theIndex.isValid()) {
                     return retString;
                 }
                 if (!theIndex.isValid()) {
                     return retString;
                 }

-

                 QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
                 QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);

-                if (data.toString().size())
-                {
-                    if (!item.isHidden() && data.toString().at(0).isLetter())
-                        retString = data.toString().toUpper().at(0);
-                    else if (item.isHidden() && data.toString().at(0) == '.' &&
-                            data.toString().at(1).isLetter())
-                        retString = data.toString().toUpper().at(1);
-                    else if (item.isHidden() && data.toString().at(0) == '.' &&
-                            !data.toString().at(1).isLetter())
-                        retString = i18nc("@title:group Name", "Others");
-                    else if (item.isHidden() && data.toString().at(0) != '.')
-                        retString = data.toString().toUpper().at(0);
-                    else if (item.isHidden())
-                        retString = data.toString().toUpper().at(0);
-                    else
-                    {
+                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;
 
                         bool validCategory = false;
 

-                        const QString str(data.toString().toUpper());
+                        const QString str(name.toUpper());

                         const QChar* currA = str.unicode();
                         while (!currA->isNull() && !validCategory) {
                         const QChar* currA = str.unicode();
                         while (!currA->isNull() && !validCategory) {

-                            if (currA->isLetter())
+                            if (currA->isLetter()) {

                                 validCategory = true;
                                 validCategory = true;

-                            else if (currA->isDigit())
-                                return i18nc("@title:group", "Others");
-                            else
+                            } else if (currA->isDigit()) {
+                                return i18nc("@title:group Name", others);
+                            } else {

                                 ++currA;
                                 ++currA;

+                            }

                         }
 
                         }
 

-                        if (!validCategory)
-                            retString = i18nc("@title:group Name", "Others");
-                        else
+                        if (!validCategory) {
+                            retString = validCategory ? *currA : i18nc("@title:group Name", others);
+                        } else {

                             retString = *currA;
                             retString = *currA;

+                        }

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -138,29 +136,16 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 break;
             }
 
                 break;
             }
 

-            case KDirModel::ModifiedTime:
-            {
+            case KDirModel::ModifiedTime: {

                 KDateTime modifiedTime;
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();
 
                 KDateTime modifiedTime;
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();
 

-                if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)
-                    retString = i18nc("@title:group Date", "Today");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)
-                    retString = i18nc("@title:group Date", "Yesterday");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)
-                    retString = i18nc("@title:group Date", "Less than a week");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)
-                    retString = i18nc("@title:group Date", "Less than a month");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)
-                    retString = i18nc("@title:group Date", "Less than a year");
-                else
-                    retString = i18nc("@title:group Date", "More than a year");
+                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;
             }
 
                 break;
             }
 

-            case KDirModel::Permissions:
-            {
+            case KDirModel::Permissions: {

                 QString user;
                 QString group;
                 QString others;
                 QString user;
                 QString group;
                 QString others;


@@ -236,9 +221,9 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
             case DolphinModel::Tags: {
                 retString = tagsForIndex(index);
 
             case DolphinModel::Tags: {
                 retString = tagsForIndex(index);
 

-                if (retString.isEmpty())
+                if (retString.isEmpty()) {

                     retString = i18nc("@title:group Tags", "Not yet tagged");
                     retString = i18nc("@title:group Tags", "Not yet tagged");

-
+                }

                 break;
             }
 #endif
                 break;
             }
 #endif


@@ -246,6 +231,90 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
 
         return retString;
     }
 
         return retString;
     }

+    else if (role == KCategorizedSortFilterProxyModel::CategorySortRole) {
+        QVariant retVariant;
+
+        if (!index.isValid()) {
+            return retVariant;
+        }
+
+        const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
+        KFileItem item = dirModel->itemForIndex(index);
+
+        switch (index.column()) {
+        case KDirModel::Name: {
+            retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
+
+            if (retVariant == i18nc("@title:group Name", others))
+                retVariant = QString(QChar(QChar::ReplacementCharacter));
+
+            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 KDirModel::ModifiedTime: {
+            KDateTime modifiedTime;
+            modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
+            modifiedTime = modifiedTime.toLocalZone();
+
+            retVariant = -(modifiedTime.date().year() * 100 + modifiedTime.date().month());
+            break;
+        }
+
+        case KDirModel::Permissions: {
+            QFileInfo info(item.url().pathOrUrl());
+
+            retVariant = -KDirSortFilterProxyModel::pointsForPermissions(info);
+            break;
+        }
+
+        case KDirModel::Owner:
+            retVariant = item.user();
+            break;
+
+        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;
+
+#ifdef HAVE_NEPOMUK
+        case DolphinModel::Rating: {
+            retVariant = ratingForIndex(index);
+            break;
+        }
+
+        case DolphinModel::Tags: {
+            retVariant = tagsForIndex(index).count();
+            break;
+        }
+#endif
+
+        default:
+            break;
+
+        }
+
+        return retVariant;
+    }

 
     return KDirModel::data(index, role);
 }
 
     return KDirModel::data(index, role);
 }


@@ -263,7 +332,7 @@ quint32 DolphinModel::ratingForIndex(const QModelIndex& index)
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {

-        const Nepomuk::Resource resource(item.url().url(), Nepomuk::NFO::File());
+        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());

         rating = resource.rating();
     }
     return rating;
         rating = resource.rating();
     }
     return rating;


@@ -281,7 +350,7 @@ QString DolphinModel::tagsForIndex(const QModelIndex& index)
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {

-        const Nepomuk::Resource resource(item.url().url(), Nepomuk::NFO::File());
+        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) {
         const QList<Nepomuk::Tag> tags = resource.tags();
         QStringList stringList;
         foreach (const Nepomuk::Tag& tag, tags) {