X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b8c718a6fd9810f9e91303ed50402de4ab417a49..5070666ad2cd5fe3e559adca00a52aed5d137153:/src/views/versioncontrol/versioncontrolobserver.cpp diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index c4824ac59..20b059035 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -26,9 +26,8 @@ #include #include #include -#include +#include -#include "pendingthreadsmaintainer.h" #include "updateitemstatesthread.h" #include @@ -58,24 +57,8 @@ VersionControlObserver::VersionControlObserver(QObject* parent) : VersionControlObserver::~VersionControlObserver() { - if (m_updateItemStatesThread) { - if (m_updateItemStatesThread->isFinished()) { - delete m_updateItemStatesThread; - m_updateItemStatesThread = 0; - } else { - // The version controller gets deleted, while a thread still - // is working to get the version information. To avoid a blocking - // user interface, the thread will be forwarded to the - // PendingThreadsMaintainer, which will delete the thread later. - disconnect(m_updateItemStatesThread, SIGNAL(finished()), - this, SLOT(slotThreadFinished())); - PendingThreadsMaintainer::instance().append(m_updateItemStatesThread); - m_updateItemStatesThread = 0; - } - } - if (m_plugin) { - m_plugin->disconnect(); + m_plugin->disconnect(this); m_plugin = 0; } } @@ -85,6 +68,8 @@ void VersionControlObserver::setModel(KFileItemModel* model) if (m_model) { disconnect(m_model, SIGNAL(itemsInserted(KItemRangeList)), this, SLOT(delayedDirectoryVerification())); + disconnect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet)), + this, SLOT(delayedDirectoryVerification())); } m_model = model; @@ -92,6 +77,8 @@ void VersionControlObserver::setModel(KFileItemModel* model) if (model) { connect(m_model, SIGNAL(itemsInserted(KItemRangeList)), this, SLOT(delayedDirectoryVerification())); + connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet)), + this, SLOT(delayedDirectoryVerification())); } } @@ -100,22 +87,42 @@ KFileItemModel* VersionControlObserver::model() const return m_model; } -QList VersionControlObserver::contextMenuActions(const KFileItemList& items) const +QList VersionControlObserver::actions(const KFileItemList& items) const { QList actions; - if (isVersioned() && m_updateItemStatesThread->lockPlugin()) { - actions = m_plugin->contextMenuActions(items); - m_updateItemStatesThread->unlockPlugin(); + if (!m_model) { + return actions; } - return actions; -} -QList VersionControlObserver::contextMenuActions(const QString& directory) const -{ - QList actions; - if (isVersioned() && m_updateItemStatesThread->lockPlugin()) { - actions = m_plugin->contextMenuActions(directory); - m_updateItemStatesThread->unlockPlugin(); + KVersionControlPlugin2* pluginV2 = qobject_cast(m_plugin); + if (pluginV2) { + // Use version 2 of the KVersionControlPlugin which allows providing actions + // also for non-versioned directories. + if (m_updateItemStatesThread && m_updateItemStatesThread->lockPlugin()) { + actions = pluginV2->actions(items); + m_updateItemStatesThread->unlockPlugin(); + } else { + actions = pluginV2->actions(items); + } + } else if (isVersioned()) { + // Support deprecated interfaces from KVersionControlPlugin version 1. + // Context menu actions where only available for versioned directories. + QString directory; + if (items.count() == 1) { + const KFileItem rootItem = m_model->rootItem(); + if (!rootItem.isNull() && items.first().url() == rootItem.url()) { + directory = rootItem.url().path(KUrl::AddTrailingSlash); + } + } + + if (m_updateItemStatesThread && m_updateItemStatesThread->lockPlugin()) { + actions = directory.isEmpty() ? m_plugin->contextMenuActions(items) + : m_plugin->contextMenuActions(directory); + m_updateItemStatesThread->unlockPlugin(); + } else { + actions = directory.isEmpty() ? m_plugin->contextMenuActions(items) + : m_plugin->contextMenuActions(directory); + } } return actions; @@ -139,19 +146,25 @@ void VersionControlObserver::verifyDirectory() return; } - const KUrl versionControlUrl = m_model->rootDirectory(); + const KUrl versionControlUrl = m_model->rootItem().url(); if (!versionControlUrl.isLocalFile()) { return; } if (m_plugin) { - m_plugin->disconnect(); + m_plugin->disconnect(this); } m_plugin = searchPlugin(versionControlUrl); if (m_plugin) { - connect(m_plugin, SIGNAL(versionStatesChanged()), - this, SLOT(silentDirectoryVerification())); + KVersionControlPlugin2* pluginV2 = qobject_cast(m_plugin); + if (pluginV2) { + connect(pluginV2, SIGNAL(itemVersionsChanged()), + this, SLOT(silentDirectoryVerification())); + } else { + connect(m_plugin, SIGNAL(versionStatesChanged()), + this, SLOT(silentDirectoryVerification())); + } connect(m_plugin, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString))); connect(m_plugin, SIGNAL(errorMessage(QString)), @@ -165,8 +178,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_model, SIGNAL(itemsInserted(KItemRangeList)), - this, SLOT(delayedDirectoryVerification())); } updateItemStates(); } else if (m_versionedDirectory) { @@ -176,27 +187,28 @@ 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_model, SIGNAL(itemsInserted(KItemRangeList)), - this, SLOT(delayedDirectoryVerification())); } } void VersionControlObserver::slotThreadFinished() { + UpdateItemStatesThread* thread = m_updateItemStatesThread; + m_updateItemStatesThread = 0; // The thread deletes itself automatically (see updateItemStates()) + if (!m_plugin) { return; } - if (!m_updateItemStatesThread->retrievedItems()) { + if (!thread->retrievedItems()) { // Ignore m_silentUpdate for an error message emit errorMessage(i18nc("@info:status", "Update of version information failed.")); return; } - const QList itemStates = m_updateItemStatesThread->itemStates(); + const QList itemStates = thread->itemStates(); foreach (const ItemState& itemState, itemStates) { QHash values; - values.insert("version", QVariant(static_cast(itemState.version))); + values.insert("version", QVariant(itemState.version)); m_model->setData(itemState.index, values); } @@ -220,6 +232,8 @@ void VersionControlObserver::updateItemStates() m_updateItemStatesThread = new UpdateItemStatesThread(); connect(m_updateItemStatesThread, SIGNAL(finished()), this, SLOT(slotThreadFinished())); + connect(m_updateItemStatesThread, SIGNAL(finished()), + m_updateItemStatesThread, SLOT(deleteLater())); } if (m_updateItemStatesThread->isRunning()) { // An update is currently ongoing. Wait until the thread has finished @@ -229,7 +243,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 = KVersionControlPlugin2::UnversionedVersion; + + itemStates.append(itemState); + } + if (!itemStates.isEmpty()) { if (!m_silentUpdate) { emit infoMessage(i18nc("@info:status", "Updating version information...")); @@ -239,24 +264,6 @@ void VersionControlObserver::updateItemStates() } } -/*void VersionControlObserver::addDirectory(const QModelIndex& parentIndex, QList& itemStates) -{ - Q_UNUSED(parentIndex); - Q_UNUSED(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; @@ -290,14 +297,10 @@ 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; } @@ -308,11 +311,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; @@ -326,7 +329,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director bool VersionControlObserver::isVersioned() const { - return false; //m_dolphinModel->hasVersionData() && m_plugin; + return m_versionedDirectory && m_plugin; } #include "versioncontrolobserver.moc"