X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa4680cb38028aceb68d41e1937d27c71d1f121b..c92c5cada0bb687d29f4af1eb1230f28cc2bdf6c:/src/dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index f399c3304..542d550ae 100644
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -68,9 +68,14 @@ bool DolphinModel::setData(const QModelIndex& index, const QVariant& value, int
         // 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;
+        const RevisionControlPlugin::RevisionState state = static_cast<RevisionControlPlugin::RevisionState>(value.toInt());
+        if (m_revisionHash.value(key, RevisionControlPlugin::LocalRevision) != state) {
+            if (!m_hasRevisionData) {
+                connect(this, SIGNAL(rowsRemoved (const QModelIndex&, int, int)),
+                        this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
+                m_hasRevisionData = true;
+            }
+
             m_revisionHash.insert(key, state);
             emit dataChanged(index, index);
             return true;
@@ -91,17 +96,20 @@ QVariant DolphinModel::data(const QModelIndex& index, int role) const
 
     case Qt::DecorationRole:
         if (index.column() == DolphinModel::Revision) {
-            return m_revisionHash.value(index, LocalRevision);
+            return m_revisionHash.value(index, RevisionControlPlugin::LocalRevision);
         }
         break;
 
     case Qt::DisplayRole:
         if (index.column() == DolphinModel::Revision) {
-            switch (m_revisionHash.value(index, LocalRevision)) {
-            case LatestRevision:
+            switch (m_revisionHash.value(index, RevisionControlPlugin::LocalRevision)) {
+            case RevisionControlPlugin::LatestRevision:
                 return i18nc("@item::intable", "Latest");
-
-            case LocalRevision:
+            case RevisionControlPlugin::EditingRevision:
+                return i18nc("@item::intable", "Editing");
+            case RevisionControlPlugin::UpdateRequiredRevision:
+                return i18nc("@item::intable", "Update required");
+            case RevisionControlPlugin::LocalRevision:
             default:
                 return i18nc("@item::intable", "Local");
             }
@@ -138,6 +146,16 @@ bool DolphinModel::hasRevisionData() const
     return m_hasRevisionData;
 }
 
+void DolphinModel::slotRowsRemoved(const QModelIndex& parent, int start, int end)
+{
+    Q_ASSERT(hasRevisionData());
+
+    const int column = parent.column();
+    for (int row = start; row <= end; ++row) {
+        m_revisionHash.remove(parent.child(row, column));
+    }
+}
+
 QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
 {
     QString retString;