Enable Dolphin to show the revision states of files that are under revision control...

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 9108d2c46be4d5cf9409f77dda41cca5566a1ca5..f399c33048476980894e905d8cf5ac39e9b66be3 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -45,13 +45,16 @@
 #include <QList>
 #include <QSortFilterProxyModel>
 #include <QPainter>
 #include <QList>
 #include <QSortFilterProxyModel>
 #include <QPainter>

+#include <QPersistentModelIndex>

 #include <QDir>
 #include <QFileInfo>
 
 #include <QDir>
 #include <QFileInfo>
 

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

 
 

-DolphinModel::DolphinModel(QObject* parent)
-    : KDirModel(parent)
+DolphinModel::DolphinModel(QObject* parent) :
+    KDirModel(parent),
+    m_hasRevisionData(false),
+    m_revisionHash()

 {
 }
 
 {
 }
 


@@ -59,72 +62,80 @@ DolphinModel::~DolphinModel()
 {
 }
 
 {
 }
 

+bool DolphinModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+    if ((index.column() == DolphinModel::Revision) && (role == Qt::DecorationRole)) {
+        // TODO: remove data again when items are deleted...
+
+        const QPersistentModelIndex key = index;
+        const RevisionState state = static_cast<RevisionState>(value.toInt());
+        if (m_revisionHash.value(key, LocalRevision) != state) {
+            m_hasRevisionData = true;
+            m_revisionHash.insert(key, state);
+            emit dataChanged(index, index);
+            return true;
+        }
+    }
+
+    return KDirModel::setData(index, value, role);
+}
+

 QVariant DolphinModel::data(const QModelIndex& index, int role) const
 {
     switch (role) {
     case KCategorizedSortFilterProxyModel::CategoryDisplayRole:
         return displayRoleData(index);
 QVariant DolphinModel::data(const QModelIndex& index, int role) const
 {
     switch (role) {
     case KCategorizedSortFilterProxyModel::CategoryDisplayRole:
         return displayRoleData(index);

+

     case KCategorizedSortFilterProxyModel::CategorySortRole:
         return sortRoleData(index);
     case KCategorizedSortFilterProxyModel::CategorySortRole:
         return sortRoleData(index);

+
+    case Qt::DecorationRole:
+        if (index.column() == DolphinModel::Revision) {
+            return m_revisionHash.value(index, LocalRevision);
+        }
+        break;
+
+    case Qt::DisplayRole:
+        if (index.column() == DolphinModel::Revision) {
+            switch (m_revisionHash.value(index, LocalRevision)) {
+            case LatestRevision:
+                return i18nc("@item::intable", "Latest");
+
+            case LocalRevision:
+            default:
+                return i18nc("@item::intable", "Local");
+            }
+        }
+        break;
+

     default:
     default:

-        return KDirModel::data(index, role);
+        break;

     }
     }

-}

 
 

-int DolphinModel::columnCount(const QModelIndex &parent) const
-{
-    return KDirModel::columnCount(parent) + (ExtraColumnCount - ColumnCount);
+    return KDirModel::data(index, role);

 }
 
 }
 

-quint32 DolphinModel::ratingForIndex(const QModelIndex& index)
+QVariant DolphinModel::headerData(int section, Qt::Orientation orientation, int role) const

 {
 {

-#ifdef HAVE_NEPOMUK
-    quint32 rating = 0;
+    if ((orientation == Qt::Horizontal) && (role == Qt::DisplayRole)) {
+        if (section < KDirModel::ColumnCount) {
+            return KDirModel::headerData(section, orientation, role);
+        }

 
 

-    const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
-    KFileItem item = dolphinModel->itemForIndex(index);
-    if (!item.isNull()) {
-        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());
-        rating = resource.rating();
+        Q_ASSERT(section == DolphinModel::Revision);
+        return i18nc("@title::column", "Revision");

     }
     }

-    return rating;
-#else
-    Q_UNUSED(index);
-    return 0;
-#endif
+    return QVariant();

 }
 
 }
 

-QString DolphinModel::tagsForIndex(const QModelIndex& index)
+int DolphinModel::columnCount(const QModelIndex& parent) const

 {
 {

-#ifdef HAVE_NEPOMUK
-    QString tagsString;
-
-    const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
-    KFileItem item = dolphinModel->itemForIndex(index);
-    if (!item.isNull()) {
-        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) {
-            stringList.append(tag.label());
-        }
-        stringList.sort();
-
-        foreach (const QString& str, stringList) {
-            tagsString += str;
-            tagsString += ", ";
-        }
-
-        if (!tagsString.isEmpty()) {
-            tagsString.resize(tagsString.size() - 2);
-        }
-    }
+    return KDirModel::columnCount(parent) + (ExtraColumnCount - ColumnCount);
+}

 
 

-    return tagsString;
-#else
-    Q_UNUSED(index);
-    return QString();
-#endif
+bool DolphinModel::hasRevisionData() const
+{
+    return m_hasRevisionData;

 }
 
 QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
 }
 
 QVariant DolphinModel::displayRoleData(const QModelIndex& index) const


@@ -142,15 +153,12 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
     case KDirModel::Name: {
         // KDirModel checks columns to know to which role are
         // we talking about
     case KDirModel::Name: {
         // KDirModel checks columns to know to which role are
         // we talking about

-        QModelIndex theIndex = index.model()->index(index.row(),
-            KDirModel::Name,
-            index.parent());
-
-        if (!theIndex.isValid()) {
+        const QModelIndex nameIndex = index.model()->index(index.row(), KDirModel::Name, index.parent());
+        if (!nameIndex.isValid()) {

             return retString;
         }
             return retString;
         }

-        QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
-        QString name = data.toString();
+        const QVariant data = nameIndex.model()->data(nameIndex, Qt::DisplayRole);
+        const 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();


@@ -159,7 +167,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     if (name.size() > 1 && name.at(1).isLetter()) {
                         retString = name.at(1).toUpper();
                     } else {
                     if (name.size() > 1 && name.at(1).isLetter()) {
                         retString = name.at(1).toUpper();
                     } else {

-                        retString = i18nc("@title:group Name", others);
+                        retString = i18nc("@title:group Name", m_others);

                     }
                 } else {
                     retString = name.at(0).toUpper();
                     }
                 } else {
                     retString = name.at(0).toUpper();


@@ -173,14 +181,14 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     if (currA->isLetter()) {
                         validCategory = true;
                     } else if (currA->isDigit()) {
                     if (currA->isLetter()) {
                         validCategory = true;
                     } else if (currA->isDigit()) {

-                        return i18nc("@title:group Name", others);
+                        return i18nc("@title:group Name", m_others);

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

-                    retString = validCategory ? *currA : i18nc("@title:group Name", others);
+                    retString = validCategory ? *currA : i18nc("@title:group Name", m_others);

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


@@ -210,12 +218,24 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
         const QDate currentDate = KDateTime::currentLocalDateTime().date();
         const QDate modifiedDate = modifiedTime.date();
 
         const QDate currentDate = KDateTime::currentLocalDateTime().date();
         const QDate modifiedDate = modifiedTime.date();
 

-        if ((currentDate.year() == modifiedDate.year()) && (currentDate.month() == modifiedDate.month())) {
-            const int currentWeek = currentDate.weekNumber();
-            const int modifiedWeek = modifiedDate.weekNumber();
+        const int daysDistance = modifiedDate.daysTo(currentDate);
+
+        int yearForCurrentWeek = 0;
+        int currentWeek = currentDate.weekNumber(&yearForCurrentWeek);
+        if (yearForCurrentWeek == currentDate.year() + 1) {
+            currentWeek = 53;
+        }
+
+        int yearForModifiedWeek = 0;
+        int modifiedWeek = modifiedDate.weekNumber(&yearForModifiedWeek);
+        if (yearForModifiedWeek == modifiedDate.year() + 1) {
+            modifiedWeek = 53;
+        }
+
+        if (currentDate.year() == modifiedDate.year() && currentDate.month() == modifiedDate.month()) {

             switch (currentWeek - modifiedWeek) {
             case 0:
             switch (currentWeek - modifiedWeek) {
             case 0:

-                switch (modifiedDate.daysTo(currentDate)) {
+                switch (daysDistance) {

                 case 0:  retString = i18nc("@title:group Date", "Today"); break;
                 case 1:  retString = i18nc("@title:group Date", "Yesterday"); break;
                 default: retString = modifiedTime.toString(i18nc("@title:group The week day name: %A", "%A"));
                 case 0:  retString = i18nc("@title:group Date", "Today"); break;
                 case 1:  retString = i18nc("@title:group Date", "Yesterday"); break;
                 default: retString = modifiedTime.toString(i18nc("@title:group The week day name: %A", "%A"));


@@ -231,13 +251,31 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                 retString = i18nc("@title:group Date", "Three Weeks Ago");
                 break;
             case 4:
                 retString = i18nc("@title:group Date", "Three Weeks Ago");
                 break;
             case 4:

+            case 5:

                 retString = i18nc("@title:group Date", "Earlier this Month");
                 break;
             default:
                 Q_ASSERT(false);
             }
         } else {
                 retString = i18nc("@title:group Date", "Earlier this Month");
                 break;
             default:
                 Q_ASSERT(false);
             }
         } else {

-            retString = modifiedTime.toString(i18nc("@title:group The month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
+            const QDate lastMonthDate = currentDate.addMonths(-1);
+            if  (lastMonthDate.year() == modifiedDate.year() && lastMonthDate.month() == modifiedDate.month()) {
+                if (daysDistance == 1) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Yesterday (%B, %Y)"));
+                } else if (daysDistance <= 7) {
+                    retString = modifiedTime.toString(i18nc("@title:group The week day name: %A, %B is full month name in current locale, and %Y is full year number", "%A (%B, %Y)"));
+                } else if (daysDistance <= 7 * 2) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Last Week (%B, %Y)"));
+                } else if (daysDistance <= 7 * 3) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Two Weeks Ago (%B, %Y)"));
+                } else if (daysDistance <= 7 * 4) {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Three Weeks Ago (%B, %Y)"));
+                } else {
+                    retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Earlier on %B, %Y"));
+                }
+            } else {
+                retString = modifiedTime.toString(i18nc("@title:group The month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
+            }

         }
         break;
     }
         }
         break;
     }


@@ -287,7 +325,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
 
         retString = i18nc("@title:group Files and folders by permissions", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
         break;
 
         retString = i18nc("@title:group Files and folders by permissions", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
         break;

-                                 }
+    }

 
     case KDirModel::Owner:
         retString = item.user();
 
     case KDirModel::Owner:
         retString = item.user();


@@ -301,22 +339,10 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
         retString = item.mimeComment();
         break;
 
         retString = item.mimeComment();
         break;
 

-#ifdef HAVE_NEPOMUK
-    case DolphinModel::Rating: {
-        const quint32 rating = ratingForIndex(index);
-        retString = QString::number(rating);
-        break;
-                               }
-
-    case DolphinModel::Tags: {
-        retString = tagsForIndex(index);
-        if (retString.isEmpty()) {
-            retString = i18nc("@title:group Tags", "Not yet tagged");
-        }
+    case DolphinModel::Revision:
+        retString = "test";

         break;
     }
         break;
     }

-#endif
-    }

 
     return retString;
 }
 
     return retString;
 }


@@ -335,8 +361,8 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) 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)) {
+        if (retVariant == i18nc("@title:group Name", m_others)) {
+            // assure that the "Others" group is always the last categorization

             retVariant = QString(QChar(QChar::ReplacementCharacter));
         }
         break;
             retVariant = QString(QChar(QChar::ReplacementCharacter));
         }
         break;


@@ -363,19 +389,7 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
         const QDate currentDate = KDateTime::currentLocalDateTime().date();
         const QDate modifiedDate = modifiedTime.date();
 
         const QDate currentDate = KDateTime::currentLocalDateTime().date();
         const QDate modifiedDate = modifiedTime.date();
 

-        int weekOfMonth = 0;
-        int dayOfWeek = 0;
-        if ((currentDate.year() == modifiedDate.year()) && (currentDate.month() == modifiedDate.month())) {
-            weekOfMonth = 4 - currentDate.weekNumber() + modifiedDate.weekNumber();
-            Q_ASSERT(weekOfMonth >= 0);
-            Q_ASSERT(weekOfMonth <= 4);
-            if (weekOfMonth == 0) {
-                dayOfWeek = modifiedDate.dayOfWeek();
-            }
-        }
-
-        retVariant = modifiedDate.year() * 10000 + modifiedDate.month() * 100 +
-                     weekOfMonth * 10 + dayOfWeek;
+        retVariant = -modifiedDate.daysTo(currentDate);

         break;
     }
 
         break;
     }
 


@@ -395,24 +409,14 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
         break;
 
     case KDirModel::Type:
         break;
 
     case KDirModel::Type:

-        if (item.isDir())
-            retVariant = QString(); // when sorting we want folders to be placed first
-        else
+        if (item.isDir()) {
+            // when sorting we want folders to be placed first
+            retVariant = QString(); // krazy:exclude=nullstrassign
+        } else {

             retVariant = item.mimeComment();
             retVariant = item.mimeComment();

+        }

         break;
 
         break;
 

-#ifdef HAVE_NEPOMUK
-    case DolphinModel::Rating: {
-        retVariant = ratingForIndex(index);
-        break;
-    }
-
-    case DolphinModel::Tags: {
-        retVariant = tagsForIndex(index).count();
-        break;
-    }
-#endif
-

     default:
         break;
     }
     default:
         break;
     }