Fix the problem "the scrollbar remains if it was shown on the

[dolphin.git] / src / dolphinitemcategorizer.cpp

diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp
index 96e91b7cb29c9264e0e0524e31fd4f5fde9bf7db..88e6733c9eaa3dff0c7886753f5130e8ae4de959 100644 (file)
--- a/src/dolphinitemcategorizer.cpp
+++ b/src/dolphinitemcategorizer.cpp
@@ -24,6 +24,7 @@
 
 #include <klocale.h>
 #include <kdirmodel.h>
+#include <kdatetime.h>
 
 #include <QtGui/QSortFilterProxyModel>
 
@@ -46,25 +47,40 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
         return retString;
     }
 
-    int indexColumn;
+    int column;
 
     switch (sortRole)
     {
-        case DolphinView::SortByName:
-            indexColumn = KDirModel::Name;
+        case DolphinView::SortByName:        // KDirModel::Name
+            column = KDirModel::Name;
             break;
-        case DolphinView::SortBySize:
-            indexColumn = KDirModel::Size;
+        case DolphinView::SortBySize:        // KDirModel::Size
+            column = KDirModel::Size;
+            break;
+        case DolphinView::SortByDate:        // KDirModel::ModifiedTime
+            column = KDirModel::ModifiedTime;
+            break;
+        case DolphinView::SortByPermissions: // KDirModel::Permissions
+            column = KDirModel::Permissions;
+            break;
+        case DolphinView::SortByOwner:       // KDirModel::Owner
+            column = KDirModel::Owner;
+            break;
+        case DolphinView::SortByGroup:       // KDirModel::Group
+            column = KDirModel::Group;
+            break;
+        case DolphinView::SortByType:         // KDirModel::Type
+            column = KDirModel::Type;
             break;
         default:
-        return retString;
+            column = KDirModel::Name;
     }
 
     // KDirModel checks columns to know to which role are
     // we talking about
     QModelIndex theIndex = index.model()->index(index.row(),
-                                                indexColumn,
-                           index.parent());
+                                                column,
+                                                index.parent());
 
     if (!theIndex.isValid()) {
         return retString;
@@ -73,11 +89,13 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
     QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
 
     const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
-    KFileItem* item = dirModel->itemForIndex(index);
+    KFileItem *item = dirModel->itemForIndex(index);
 
+    int fileSize;
+    KDateTime modifiedTime;
     switch (sortRole)
     {
-    case DolphinView::SortByName:
+        case DolphinView::SortByName:
             if (data.toString().size())
             {
                 if (!item->isHidden() && data.toString().at(0).isLetter())
@@ -93,21 +111,73 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
                 else if (item->isHidden())
                     retString = data.toString().toUpper().at(0);
                 else
-                    retString = i18n("Others");
+                {
+                    bool validCategory = false;
+
+                    const QChar* currA = data.toString().toUpper().unicode(); // iterator over a
+                    while (!currA->isNull() && !validCategory) {
+                        if (currA->isLetter())
+                            validCategory = true;
+                        else if (currA->isDigit())
+                            return i18n("Others");
+                        else
+                            ++currA;
+                    }
+
+                    if (!validCategory)
+                        retString = i18n("Others");
+                    else
+                        retString = *currA;
+                }
             }
-        break;
-    case DolphinView::SortBySize:
-        int fileSize = (item) ? item->size() : -1;
-        if (item && item->isDir()) {
+            break;
+
+        case DolphinView::SortByDate:
+            modifiedTime.setTime_t(item->time(KIO::UDS_MODIFICATION_TIME));
+            modifiedTime = modifiedTime.toLocalZone();
+
+            if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)
+                retString = i18n("Today");
+            else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)
+                retString = i18n("Yesterday");
+            else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)
+                retString = i18n("Less than a week");
+            else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)
+                retString = i18n("Less than a month");
+            else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)
+                retString = i18n("Less than a year");
+            else
+                retString = i18n("More than a year");
+            break;
+
+        case DolphinView::SortByPermissions:
+            retString = item->permissionsString();
+            break;
+
+        case DolphinView::SortByOwner:
+            retString = item->user();
+            break;
+
+        case DolphinView::SortByGroup:
+            retString = item->group();
+            break;
+
+        case DolphinView::SortBySize:
+            fileSize = (item) ? item->size() : -1;
+            if (item && item->isDir()) {
                 retString = i18n("Folders");
-        } else if (fileSize < 5242880) {
-            retString = i18n("Small");
-        } else if (fileSize < 10485760) {
-            retString = i18n("Medium");
-        } else {
-            retString = i18n("Big");
-        }
-        break;
+            } else if (fileSize < 5242880) {
+                retString = i18nc("Size", "Small");
+            } else if (fileSize < 10485760) {
+                retString = i18nc("Size", "Medium");
+            } else {
+                retString = i18nc("Size", "Big");
+            }
+            break;
+
+        case DolphinView::SortByType:
+            retString = item->mimeComment();
+            break;
     }
 
     return retString;