don't forget to delete the proxy model

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index f541fe20c48b28da9b848626d832d5bb1e985148..8a5b6c73215df52b3aecf12d22eb60b1ade5bfe7 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -47,6 +47,8 @@
 #include <QDir>
 #include <QFileInfo>
 
+static const char *others = I18N_NOOP2("@title:group Name", "Others");
+
 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)
 {
@@ -58,22 +60,18 @@ DolphinModel::~DolphinModel()
 
 QVariant DolphinModel::data(const QModelIndex &index, int role) const
 {
-    if (role == KCategorizedSortFilterProxyModel::CategoryDisplayRole)
-    {
+    if (role == KCategorizedSortFilterProxyModel::CategoryDisplayRole) {
         QString retString;
 
-        if (!index.isValid())
-        {
+        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:
-            {
+        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(),
@@ -83,41 +81,41 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 if (!theIndex.isValid()) {
                     return retString;
                 }
-
                 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;
 
-                        const QString str(data.toString().toUpper());
+                        const QString str(name.toUpper());
                         const QChar* currA = str.unicode();
                         while (!currA->isNull() && !validCategory) {
-                            if (currA->isLetter())
+                            if (currA->isLetter()) {
                                 validCategory = true;
-                            else if (currA->isDigit())
-                                return i18nc("@title:group", "Others");
-                            else
+                            } else if (currA->isDigit()) {
+                                return i18nc("@title:group Name", others);
+                            } else {
                                 ++currA;
+                            }
                         }
 
-                        if (!validCategory)
-                            retString = i18nc("@title:group Name", "Others");
-                        else
+                        if (!validCategory) {
+                            retString = validCategory ? *currA : i18nc("@title:group Name", others);
+                        } else {
                             retString = *currA;
+                        }
                     }
                 }
                 break;
@@ -137,8 +135,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 break;
             }
 
-            case KDirModel::ModifiedTime:
-            {
+            case KDirModel::ModifiedTime: {
                 KDateTime modifiedTime;
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();
@@ -147,8 +144,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 break;
             }
 
-            case KDirModel::Permissions:
-            {
+            case KDirModel::Permissions: {
                 QString user;
                 QString group;
                 QString others;
@@ -224,9 +220,9 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
             case DolphinModel::Tags: {
                 retString = tagsForIndex(index);
 
-                if (retString.isEmpty())
+                if (retString.isEmpty()) {
                     retString = i18nc("@title:group Tags", "Not yet tagged");
-
+                }
                 break;
             }
 #endif
@@ -234,12 +230,10 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
 
         return retString;
     }
-    else if (role == KCategorizedSortFilterProxyModel::CategorySortRole)
-    {
+    else if (role == KCategorizedSortFilterProxyModel::CategorySortRole) {
         QVariant retVariant;
 
-        if (!index.isValid())
-        {
+        if (!index.isValid()) {
             return retVariant;
         }
 
@@ -249,27 +243,37 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
         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;
-            retVariant = fileSize;
+            if (item.isDir()) {
+                retVariant = 0;
+            } else if (fileSize < 5242880) {
+                retVariant = 1;
+            } else if (fileSize < 10485760) {
+                retVariant = 2;
+            } else {
+                retVariant = 3;
+            }
             break;
         }
 
-        case KDirModel::ModifiedTime:
-        {
+        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();
+            retVariant = -(modifiedTime.date().year() * 100 + modifiedTime.date().month());
             break;
         }
 
-        case KDirModel::Permissions:
-        {
+        case KDirModel::Permissions: {
             QFileInfo info(item.url().pathOrUrl());
 
             retVariant = -KDirSortFilterProxyModel::pointsForPermissions(info);