X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d3496b12310d9fec0e52e537c341e87fcaa2f8b5..f0debd937766045c77dea5f2f5255de89f7b2697:/src/views/versioncontrol/versioncontrolobserver.cpp diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 62f50f30b..14f5e0bc9 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -25,53 +25,35 @@ #include #include #include +#include #include #include "pendingthreadsmaintainer.h" #include "updateitemstatesthread.h" -#include -#include #include #include -#include - -VersionControlObserver::VersionControlObserver(QAbstractItemView* view) : - QObject(view), +VersionControlObserver::VersionControlObserver(QObject* parent) : + QObject(parent), m_pendingItemStatesUpdate(false), m_versionedDirectory(false), m_silentUpdate(false), - m_view(view), - m_dirLister(0), - m_dolphinModel(0), + m_model(0), m_dirVerificationTimer(0), m_plugin(0), m_updateItemStatesThread(0) { - Q_ASSERT(view); - - QAbstractProxyModel* proxyModel = qobject_cast(view->model()); - m_dolphinModel = proxyModel ? - qobject_cast(proxyModel->sourceModel()) : - qobject_cast(view->model()); - - if (m_dolphinModel) { - m_dirLister = m_dolphinModel->dirLister(); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(delayedDirectoryVerification())); - - // The verification timer specifies the timeout until the shown directory - // is checked whether it is versioned. Per default it is assumed that users - // don't iterate through versioned directories and a high timeout is used - // The timeout will be decreased as soon as a versioned directory has been - // found (see verifyDirectory()). - m_dirVerificationTimer = new QTimer(this); - m_dirVerificationTimer->setSingleShot(true); - m_dirVerificationTimer->setInterval(500); - connect(m_dirVerificationTimer, SIGNAL(timeout()), - this, SLOT(verifyDirectory())); - } + // The verification timer specifies the timeout until the shown directory + // is checked whether it is versioned. Per default it is assumed that users + // don't iterate through versioned directories and a high timeout is used + // The timeout will be decreased as soon as a versioned directory has been + // found (see verifyDirectory()). + m_dirVerificationTimer = new QTimer(this); + m_dirVerificationTimer->setSingleShot(true); + m_dirVerificationTimer->setInterval(500); + connect(m_dirVerificationTimer, SIGNAL(timeout()), + this, SLOT(verifyDirectory())); } VersionControlObserver::~VersionControlObserver() @@ -98,6 +80,26 @@ VersionControlObserver::~VersionControlObserver() } } +void VersionControlObserver::setModel(KFileItemModel* model) +{ + if (m_model) { + disconnect(m_model, SIGNAL(itemsInserted(KItemRangeList)), + this, SLOT(delayedDirectoryVerification())); + } + + m_model = model; + + if (model) { + connect(m_model, SIGNAL(itemsInserted(KItemRangeList)), + this, SLOT(delayedDirectoryVerification())); + } +} + +KFileItemModel* VersionControlObserver::model() const +{ + return m_model; +} + QList VersionControlObserver::contextMenuActions(const KFileItemList& items) const { QList actions; @@ -133,7 +135,11 @@ void VersionControlObserver::silentDirectoryVerification() void VersionControlObserver::verifyDirectory() { - const KUrl versionControlUrl = m_dirLister->url(); + if (!m_model) { + return; + } + + const KUrl versionControlUrl = m_model->rootDirectory(); if (!versionControlUrl.isLocalFile()) { return; } @@ -159,10 +165,6 @@ void VersionControlObserver::verifyDirectory() // The directory is versioned. Assume that the user will further browse through // versioned directories and decrease the verification timer. m_dirVerificationTimer->setInterval(100); - connect(m_dirLister, SIGNAL(refreshItems(const QList>&)), - this, SLOT(delayedDirectoryVerification())); - connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), - this, SLOT(delayedDirectoryVerification())); } updateItemStates(); } else if (m_versionedDirectory) { @@ -172,10 +174,6 @@ void VersionControlObserver::verifyDirectory() // value, so that browsing through non-versioned directories is not slown down // by an immediate verification. m_dirVerificationTimer->setInterval(500); - disconnect(m_dirLister, SIGNAL(refreshItems(const QList>&)), - this, SLOT(delayedDirectoryVerification())); - disconnect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), - this, SLOT(delayedDirectoryVerification())); } } @@ -186,28 +184,18 @@ void VersionControlObserver::slotThreadFinished() } if (!m_updateItemStatesThread->retrievedItems()) { - // ignore m_silentUpdate for an error message + // Ignore m_silentUpdate for an error message emit errorMessage(i18nc("@info:status", "Update of version information failed.")); return; } - // QAbstractItemModel::setData() triggers a bottleneck in combination with QListView - // (a detailed description of the root cause is given in the class KFilePreviewGenerator - // from kdelibs). To bypass this bottleneck, the signals of the model are temporary blocked. - // This works as the update of the data does not require a relayout of the views used in Dolphin. - const bool signalsBlocked = m_dolphinModel->signalsBlocked(); - m_dolphinModel->blockSignals(true); - const QList itemStates = m_updateItemStatesThread->itemStates(); foreach (const ItemState& itemState, itemStates) { - m_dolphinModel->setData(itemState.index, - QVariant(static_cast(itemState.version)), - Qt::DecorationRole); + QHash values; + values.insert("version", QVariant(itemState.version)); + m_model->setData(itemState.index, values); } - m_dolphinModel->blockSignals(signalsBlocked); - m_view->viewport()->repaint(); - if (!m_silentUpdate) { // Using an empty message results in clearing the previously shown information message and showing // the default status bar information. This is useful as the user already gets feedback that the @@ -237,7 +225,18 @@ void VersionControlObserver::updateItemStates() } QList itemStates; - addDirectory(QModelIndex(), itemStates); + const int itemCount = m_model->count(); + itemStates.reserve(itemCount); + + for (int i = 0; i < itemCount; ++i) { + ItemState itemState; + itemState.index = i; + itemState.item = m_model->fileItem(i); + itemState.version = KVersionControlPlugin::UnversionedVersion; + + itemStates.append(itemState); + } + if (!itemStates.isEmpty()) { if (!m_silentUpdate) { emit infoMessage(i18nc("@info:status", "Updating version information...")); @@ -247,22 +246,6 @@ void VersionControlObserver::updateItemStates() } } -void VersionControlObserver::addDirectory(const QModelIndex& parentIndex, QList& itemStates) -{ - const int rowCount = m_dolphinModel->rowCount(parentIndex); - for (int row = 0; row < rowCount; ++row) { - const QModelIndex index = m_dolphinModel->index(row, DolphinModel::Version, parentIndex); - addDirectory(index, itemStates); - - ItemState itemState; - itemState.index = index; - itemState.item = m_dolphinModel->itemForIndex(index); - itemState.version = KVersionControlPlugin::UnversionedVersion; - - itemStates.append(itemState); - } -} - KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& directory) const { static bool pluginsAvailable = true; @@ -296,13 +279,11 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director // Verify whether the current directory contains revision information // like .svn, .git, ... + Q_UNUSED(directory); foreach (KVersionControlPlugin* plugin, plugins) { // Use the KDirLister cache to check for .svn, .git, ... files - KUrl dirUrl(directory); - KUrl fileUrl = dirUrl; - fileUrl.addPath(plugin->fileName()); - const KFileItem item = m_dirLister->findByUrl(fileUrl); - if (!item.isNull()) { + const QString fileName = directory.path(KUrl::AddTrailingSlash) + plugin->fileName(); + if (QFile::exists(fileName)) { return plugin; } @@ -313,11 +294,11 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director // m_versionedDirectory. Drawback: Until e. g. Git is recognized, the root directory // must be shown at least once. if (m_versionedDirectory) { + KUrl dirUrl(directory); KUrl upUrl = dirUrl.upUrl(); while (upUrl != dirUrl) { - const QString filePath = dirUrl.pathOrUrl(KUrl::AddTrailingSlash) + plugin->fileName(); - QFileInfo file(filePath); - if (file.exists()) { + const QString fileName = dirUrl.path(KUrl::AddTrailingSlash) + plugin->fileName(); + if (QFile::exists(fileName)) { return plugin; } dirUrl = upUrl; @@ -331,7 +312,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director bool VersionControlObserver::isVersioned() const { - return m_dolphinModel->hasVersionData() && m_plugin; + return false; //m_dolphinModel->hasVersionData() && m_plugin; } #include "versioncontrolobserver.moc"