#include "revisioncontrolplugin.h"
#include <kdirlister.h>
+#include <klocale.h>
#include <QAbstractProxyModel>
#include <QAbstractItemView>
void setData(RevisionControlPlugin* plugin,
const QList<RevisionControlObserver::ItemState>& itemStates);
QList<RevisionControlObserver::ItemState> itemStates() const;
-
+ bool retrievedItems() const;
+
protected:
virtual void run();
private:
+ bool m_retrievedItems;
RevisionControlPlugin* m_plugin;
QMutex* m_pluginMutex;
QList<RevisionControlObserver::ItemState> m_itemStates;
UpdateItemStatesThread::UpdateItemStatesThread(QObject* parent, QMutex* pluginMutex) :
QThread(parent),
- m_pluginMutex(pluginMutex)
+ m_retrievedItems(false),
+ m_pluginMutex(pluginMutex),
+ m_itemStates()
{
}
{
Q_ASSERT(!m_itemStates.isEmpty());
Q_ASSERT(m_plugin != 0);
-
- // it is assumed that all items have the same parent directory
- const QString directory = m_itemStates.first().item.url().directory(KUrl::AppendTrailingSlash);
+
+ // The items from m_itemStates may be located in different directory levels. The revision
+ // plugin requires the root directory for RevisionControlPlugin::beginRetrieval(). Instead
+ // of doing an expensive search, we utilize the knowledge of the implementation of
+ // RevisionControlObserver::addDirectory() to be sure that the last item contains the root.
+ const QString directory = m_itemStates.last().item.url().directory(KUrl::AppendTrailingSlash);
QMutexLocker locker(m_pluginMutex);
+ m_retrievedItems = false;
if (m_plugin->beginRetrieval(directory)) {
const int count = m_itemStates.count();
for (int i = 0; i < count; ++i) {
m_itemStates[i].revision = m_plugin->revisionState(m_itemStates[i].item);
}
m_plugin->endRetrieval();
+ m_retrievedItems = true;
}
}
return m_itemStates;
}
+bool UpdateItemStatesThread::retrievedItems() const
+{
+ return m_retrievedItems;
+}
+
// ------------------------------------------------------------------------------------------------
RevisionControlObserver::RevisionControlObserver(QAbstractItemView* view) :
QObject(view),
m_pendingItemStatesUpdate(false),
m_revisionedDirectory(false),
+ m_silentUpdate(false),
m_view(view),
m_dirLister(0),
m_dolphinModel(0),
RevisionControlObserver::~RevisionControlObserver()
{
+ if (m_updateItemStatesThread != 0) {
+ m_updateItemStatesThread->terminate();
+ m_updateItemStatesThread->wait();
+ }
delete m_plugin;
m_plugin = 0;
}
void RevisionControlObserver::delayedDirectoryVerification()
{
+ m_silentUpdate = false;
+ m_dirVerificationTimer->start();
+}
+
+void RevisionControlObserver::silentDirectoryVerification()
+{
+ m_silentUpdate = true;
m_dirVerificationTimer->start();
}
if (m_plugin == 0) {
// TODO: just for testing purposes. A plugin approach will be used later.
m_plugin = new SubversionPlugin();
+ connect(m_plugin, SIGNAL(infoMessage(const QString&)),
+ this, SIGNAL(infoMessage(const QString&)));
+ connect(m_plugin, SIGNAL(errorMessage(const QString&)),
+ this, SIGNAL(errorMessage(const QString&)));
+ connect(m_plugin, SIGNAL(operationCompletedMessage(const QString&)),
+ this, SIGNAL(operationCompletedMessage(const QString&)));
}
revisionControlUrl.addPath(m_plugin->fileName());
this, SLOT(delayedDirectoryVerification()));
connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
this, SLOT(delayedDirectoryVerification()));
- connect(m_plugin, SIGNAL(revisionStatesChanged(const QString&)),
- this, SLOT(delayedDirectoryVerification()));
+ connect(m_plugin, SIGNAL(revisionStatesChanged()),
+ this, SLOT(silentDirectoryVerification()));
}
updateItemStates();
} else if (m_revisionedDirectory) {
this, SLOT(delayedDirectoryVerification()));
disconnect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
this, SLOT(delayedDirectoryVerification()));
- disconnect(m_plugin, SIGNAL(revisionStatesChanged(const QString&)),
- this, SLOT(delayedDirectoryVerification()));
+ disconnect(m_plugin, SIGNAL(revisionStatesChanged()),
+ this, SLOT(silentDirectoryVerification()));
}
}
void RevisionControlObserver::applyUpdatedItemStates()
{
+ if (!m_updateItemStatesThread->retrievedItems()) {
+ // ignore m_silentUpdate for an error message
+ emit errorMessage(i18nc("@info:status", "Update of revision 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.
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
+ // operation has been completed because of the icon emblems.
+ emit operationCompletedMessage(QString());
+ }
if (m_pendingItemStatesUpdate) {
m_pendingItemStatesUpdate = false;
return;
}
- const int rowCount = m_dolphinModel->rowCount();
- if (rowCount > 0) {
- // Build a list of all items in the current directory and delegate
- // this list to the thread, which adjusts the revision states.
- QList<ItemState> itemStates;
- for (int row = 0; row < rowCount; ++row) {
- const QModelIndex index = m_dolphinModel->index(row, DolphinModel::Revision);
-
- ItemState itemState;
- itemState.index = index;
- itemState.item = m_dolphinModel->itemForIndex(index);
- itemState.revision = RevisionControlPlugin::UnversionedRevision;
-
- itemStates.append(itemState);
+ QList<ItemState> itemStates;
+ addDirectory(QModelIndex(), itemStates);
+ if (!itemStates.isEmpty()) {
+ if (!m_silentUpdate) {
+ emit infoMessage(i18nc("@info:status", "Updating revision information..."));
}
-
m_updateItemStatesThread->setData(m_plugin, itemStates);
m_updateItemStatesThread->start(); // applyUpdatedItemStates() is called when finished
}
}
+void RevisionControlObserver::addDirectory(const QModelIndex& parentIndex, QList<ItemState>& itemStates)
+{
+ const int rowCount = m_dolphinModel->rowCount(parentIndex);
+ for (int row = 0; row < rowCount; ++row) {
+ const QModelIndex index = m_dolphinModel->index(row, DolphinModel::Revision, parentIndex);
+ addDirectory(index, itemStates);
+
+ ItemState itemState;
+ itemState.index = index;
+ itemState.item = m_dolphinModel->itemForIndex(index);
+ itemState.revision = RevisionControlPlugin::UnversionedRevision;
+
+ itemStates.append(itemState);
+ }
+}
+
#include "revisioncontrolobserver.moc"
projects / dolphin.git / blobdiff