use "Sort by" instead of "Sort By"

[dolphin.git] / src / dolphinitemcategorizer.cpp

diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp
index e72edd3006d174c425a71060f722071cbdad3ccb..1a8f934719d4099b60607a15f1a5801908e27378 100644 (file)
--- a/src/dolphinitemcategorizer.cpp
+++ b/src/dolphinitemcategorizer.cpp
@@ -65,7 +65,7 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
     }
 
     const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
     }
 
     const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());

-    KFileItem *item = dirModel->itemForIndex(index);
+    KFileItem item = dirModel->itemForIndex(index);

 
     switch (sortRole)
     {
 
     switch (sortRole)
     {


@@ -84,17 +84,17 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
             QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
             if (data.toString().size())
             {
             QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
             if (data.toString().size())
             {

-                if (!item->isHidden() && data.toString().at(0).isLetter())
+                if (!item.isHidden() && data.toString().at(0).isLetter())

                     retString = data.toString().toUpper().at(0);
                     retString = data.toString().toUpper().at(0);

-                else if (item->isHidden() && data.toString().at(0) == '.' &&
+                else if (item.isHidden() && data.toString().at(0) == '.' &&

                          data.toString().at(1).isLetter())
                     retString = data.toString().toUpper().at(1);
                          data.toString().at(1).isLetter())
                     retString = data.toString().toUpper().at(1);

-                else if (item->isHidden() && data.toString().at(0) == '.' &&
+                else if (item.isHidden() && data.toString().at(0) == '.' &&

                          !data.toString().at(1).isLetter())
                          !data.toString().at(1).isLetter())

-                    retString = i18n("Others");
-                else if (item->isHidden() && data.toString().at(0) != '.')
+                    retString = i18nc("@title:group Name", "Others");
+                else if (item.isHidden() && data.toString().at(0) != '.')

                     retString = data.toString().toUpper().at(0);
                     retString = data.toString().toUpper().at(0);

-                else if (item->isHidden())
+                else if (item.isHidden())

                     retString = data.toString().toUpper().at(0);
                 else
                 {
                     retString = data.toString().toUpper().at(0);
                 else
                 {


@@ -106,13 +106,13 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
                         if (currA->isLetter())
                             validCategory = true;
                         else if (currA->isDigit())
                         if (currA->isLetter())
                             validCategory = true;
                         else if (currA->isDigit())

-                            return i18n("Others");
+                            return i18nc("@title:group", "Others");

                         else
                             ++currA;
                     }
 
                     if (!validCategory)
                         else
                             ++currA;
                     }
 
                     if (!validCategory)

-                        retString = i18n("Others");
+                        retString = i18nc("@title:group Name", "Others");

                     else
                         retString = *currA;
                 }
                     else
                         retString = *currA;
                 }


@@ -122,53 +122,52 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
 
         case DolphinView::SortByDate:
         {
 
         case DolphinView::SortByDate:
         {

-            KDateTime modifiedTime;
-            modifiedTime.setTime_t(item->time(KIO::UDS_MODIFICATION_TIME));
+            KDateTime modifiedTime = item.time(KFileItem::ModificationTime);

             modifiedTime = modifiedTime.toLocalZone();
 
             if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)
             modifiedTime = modifiedTime.toLocalZone();
 
             if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)

-                retString = i18n("Today");
+                retString = i18nc("@title:group Date", "Today");

             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)

-                retString = i18n("Yesterday");
+                retString = i18nc("@title:group Date", "Yesterday");

             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)

-                retString = i18n("Less than a week");
+                retString = i18nc("@title:group Date", "Less than a week");

             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)

-                retString = i18n("Less than a month");
+                retString = i18nc("@title:group Date", "Less than a month");

             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)

-                retString = i18n("Less than a year");
+                retString = i18nc("@title:group Date", "Less than a year");

             else
             else

-                retString = i18n("More than a year");
+                retString = i18nc("@title:group Date", "More than a year");

             break;
         }
 
         case DolphinView::SortByPermissions:
             break;
         }
 
         case DolphinView::SortByPermissions:

-            retString = item->permissionsString();
+            retString = item.permissionsString();

             break;
 
         case DolphinView::SortByOwner:
             break;
 
         case DolphinView::SortByOwner:

-            retString = item->user();
+            retString = item.user();

             break;
 
         case DolphinView::SortByGroup:
             break;
 
         case DolphinView::SortByGroup:

-            retString = item->group();
+            retString = item.group();

             break;
 
         case DolphinView::SortBySize: {
             break;
 
         case DolphinView::SortBySize: {

-            const int fileSize = item ? item->size() : -1;
-            if (item && item->isDir()) {
-                retString = i18n("Folders");
+            const int fileSize = !item.isNull() ? item.size() : -1;
+            if (!item.isNull() && item.isDir()) {
+                retString = i18nc("@title:group Size", "Folders");

             } else if (fileSize < 5242880) {
             } else if (fileSize < 5242880) {

-                retString = i18nc("Size", "Small");
+                retString = i18nc("@title:group Size", "Small");

             } else if (fileSize < 10485760) {
             } else if (fileSize < 10485760) {

-                retString = i18nc("Size", "Medium");
+                retString = i18nc("@title:group Size", "Medium");

             } else {
             } else {

-                retString = i18nc("Size", "Big");
+                retString = i18nc("@title:group Size", "Big");

             }
             break;
         }
 
         case DolphinView::SortByType:
             }
             break;
         }
 
         case DolphinView::SortByType:

-            retString = item->mimeComment();
+            retString = item.mimeComment();

             break;
 
 #ifdef HAVE_NEPOMUK
             break;
 
 #ifdef HAVE_NEPOMUK


@@ -183,7 +182,7 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
             retString = DolphinSortFilterProxyModel::tagsForIndex(index);
 
             if (retString.isEmpty())
             retString = DolphinSortFilterProxyModel::tagsForIndex(index);
 
             if (retString.isEmpty())

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

 
             break;
         }
 
             break;
         }


@@ -199,8 +198,8 @@ void DolphinItemCategorizer::drawCategory(const QModelIndex &index,
                                           QPainter *painter) const
 {
     QRect starRect = option.rect;
                                           QPainter *painter) const
 {
     QRect starRect = option.rect;

-    int iconSize = KIconLoader::global()->theme()->defaultSize(K3Icon::Small);

 
 

+    int iconSize =  KIconLoader::global()->currentSize(K3Icon::Small);

     const QString category = categoryForItem(index, sortRole);
 
     QColor color = option.palette.color(QPalette::Text);
     const QString category = categoryForItem(index, sortRole);
 
     QColor color = option.palette.color(QPalette::Text);


@@ -296,8 +295,8 @@ void DolphinItemCategorizer::drawCategory(const QModelIndex &index,
         case DolphinView::SortByType: {
             opt.rect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
             const KDirModel *model = static_cast<const KDirModel*>(index.model());
         case DolphinView::SortByType: {
             opt.rect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
             const KDirModel *model = static_cast<const KDirModel*>(index.model());

-            KFileItem *item = model->itemForIndex(index);
-            icon = KIconLoader::global()->loadIcon(KMimeType::iconNameForUrl(item->url()),
+            KFileItem item = model->itemForIndex(index);
+            icon = KIconLoader::global()->loadIcon(KMimeType::iconNameForUrl(item.url()),

                                                    K3Icon::Small);
             break;
         }
                                                    K3Icon::Small);
             break;
         }


@@ -366,7 +365,7 @@ void DolphinItemCategorizer::drawCategory(const QModelIndex &index,
 
 int DolphinItemCategorizer::categoryHeight(const QStyleOption &option) const
 {
 
 int DolphinItemCategorizer::categoryHeight(const QStyleOption &option) const
 {

-    int iconSize = KIconLoader::global()->theme()->defaultSize(K3Icon::Small);
+    int iconSize = KIconLoader::global()->currentSize(K3Icon::Small);

 
     return qMax(option.fontMetrics.height() + (iconSize / 4) * 2 + 2, iconSize + (iconSize / 4) * 2 + 2) /* 2 gradient */;
 }
 
     return qMax(option.fontMetrics.height() + (iconSize / 4) * 2 + 2, iconSize + (iconSize / 4) * 2 + 2) /* 2 gradient */;
 }