Use a QActionGroup and save 6 slots (and the duplication of the action names in the...

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 525c8a4fd23acd5f320c701e0302efcd869321e4..1b94e0339d2b5bd26c9a419873574851dc36a0d9 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -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>


@@ -47,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)
 {


@@ -80,38 +83,40 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                     return retString;
                 }
                 QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
                     return retString;
                 }
                 QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);

-               QString name = data.toString();
+                QString name = data.toString();

                 if (!name.isEmpty()) {
                     if (!item.isHidden() && name.at(0).isLetter())
                         retString = name.at(0).toUpper();
                 if (!name.isEmpty()) {
                     if (!item.isHidden() && name.at(0).isLetter())
                         retString = name.at(0).toUpper();

-                    else if (item.isHidden()) { 
-                       if(name.at(0) == '.') {
-                           if(data.size() > 1 && name.at(1).isLetter())
+                    else if (item.isHidden()) {
+                        if (name.at(0) == '.') {
+                            if (name.size() > 1 && name.at(1).isLetter()) {

                                 retString = name.at(1).toUpper();
                                 retString = name.at(1).toUpper();

-                           else
-                                retString = i18nc("@title:group Name", "Others");
-                       } else
+                            } else {
+                                retString = i18nc("@title:group Name", others);
+                            }
+                        } else {

                             retString = name.at(0).toUpper();
                             retString = name.at(0).toUpper();

-                   }
-                   else
-                    {
+                        }
+                    } else {

                         bool validCategory = false;
 
                         const QString str(name.toUpper());
                         const QChar* currA = str.unicode();
                         while (!currA->isNull() && !validCategory) {
                         bool validCategory = false;
 
                         const QString str(name.toUpper());
                         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;


@@ -216,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


@@ -239,6 +244,10 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
         switch (index.column()) {
         case KDirModel::Name: {
             retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
         switch (index.column()) {
         case KDirModel::Name: {
             retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);

+
+            if (retVariant == i18nc("@title:group Name", others))
+                retVariant = QString(QChar(QChar::ReplacementCharacter));
+

             break;
         }
 
             break;
         }
 


@@ -261,7 +270,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
             modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
             modifiedTime = modifiedTime.toLocalZone();
 
             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;
         }
 
             break;
         }
 


@@ -323,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;


@@ -341,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) {