Allow the revision control plugins to indicate information-, error- and operation...

svn path=/trunk/KDE/kdebase/apps/; revision=1004346

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index b8a39cffc6316f3b9f7f49ff5b928682d7fd0ecf..6452ba36a61e971d619ffefd1703f40a742f020e 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -92,7 +92,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     setXMLFile("dolphinpart.rc");
 
     connect(m_view, SIGNAL(infoMessage(QString)),
     setXMLFile("dolphinpart.rc");
 
     connect(m_view, SIGNAL(infoMessage(QString)),

-            this, SLOT(slotInfoMessage(QString)));
+            this, SLOT(slotMessage(QString)));
+    connect(m_view, SIGNAL(operationCompletedMessage(QString)),
+            this, SLOT(slotMessage(QString)));

     connect(m_view, SIGNAL(errorMessage(QString)),
             this, SLOT(slotErrorMessage(QString)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
     connect(m_view, SIGNAL(errorMessage(QString)),
             this, SLOT(slotErrorMessage(QString)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),


@@ -306,7 +308,7 @@ void DolphinPart::slotCanceled(const KUrl& url)
     slotCompleted(url);
 }
 
     slotCompleted(url);
 }
 

-void DolphinPart::slotInfoMessage(const QString& msg)
+void DolphinPart::slotMessage(const QString& msg)

 {
     emit setStatusBarText(msg);
 }
 {
     emit setStatusBarText(msg);
 }

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 4a030af89cc18fa96dcd7542104d11699b690603..66f397589a9d601343a200e2e869dcfc50e3556f 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -113,7 +113,7 @@ Q_SIGNALS:
 private Q_SLOTS:
     void slotCompleted(const KUrl& url);
     void slotCanceled(const KUrl& url);
 private Q_SLOTS:
     void slotCompleted(const KUrl& url);
     void slotCanceled(const KUrl& url);

-    void slotInfoMessage(const QString& msg);
+    void slotMessage(const QString& msg);

     void slotErrorMessage(const QString& msg);
     /**
      * Shows the information for the item \a item inside the statusbar. If the
     void slotErrorMessage(const QString& msg);
     /**
      * Shows the information for the item \a item inside the statusbar. If the

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 7a9b5dc8a834fc88005504e28790f9319bcbf494..591a45c036ed117dfc91a7ee7fcf9126da91e444 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -124,7 +124,14 @@ DolphinStatusBar::~DolphinStatusBar()
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
 {
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
 {

+    if (msg.isEmpty()) {
+        // show the default text as fallback
+        clear();
+        return;
+    }
+

     if ((msg == m_messageLabel->text()) && (type == m_messageLabel->type())) {
     if ((msg == m_messageLabel->text()) && (type == m_messageLabel->type())) {

+        // the message is already shown

         return;
     }
 
         return;
     }
 

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 2fc664f2140b815ffb8638f5e70e059cad87cb3f..5899404793361b156efcdd43e8175cfc81c451fb 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1474,6 +1474,12 @@ void DolphinView::createView()
     m_previewGenerator->setPreviewShown(m_showPreview);
 
     m_revisionControlObserver = new RevisionControlObserver(view);
     m_previewGenerator->setPreviewShown(m_showPreview);
 
     m_revisionControlObserver = new RevisionControlObserver(view);

+    connect(m_revisionControlObserver, SIGNAL(infoMessage(const QString&)),
+            this, SIGNAL(infoMessage(const QString&)));
+    connect(m_revisionControlObserver, SIGNAL(errorMessage(const QString&)),
+            this, SIGNAL(errorMessage(const QString&)));
+    connect(m_revisionControlObserver, SIGNAL(operationCompletedMessage(const QString&)),
+            this, SIGNAL(operationCompletedMessage(const QString&)));

 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         m_toolTipManager = new ToolTipManager(view, m_proxyModel);
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         m_toolTipManager = new ToolTipManager(view, m_proxyModel);

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3111925ff94fe43dac6244ddbbe06cf27ab76dee..475b002e2dc53d4123743213ef439c4e816dee4e 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -335,7 +335,13 @@ void DolphinViewContainer::slotDirListerCompleted()
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {

-        m_statusBar->clear();
+        // Only clear the status bar if unimportant messages are shown.
+        // This prevents that information- or error-messages get hidden
+        // by moving the mouse above the viewport or when closing the
+        // context menu.
+        if (m_statusBar->type() == DolphinStatusBar::Default) {
+            m_statusBar->clear();
+        }

     } else {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }
     } else {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }

diff --git a/src/revisioncontrolobserver.cpp b/src/revisioncontrolobserver.cpp
index 1e7347a9bf69e50523df898c4905cfb1dca4f7b7..7745dbe431a88ba41b51bc232ddaf4b5714bef60 100644 (file)
--- a/src/revisioncontrolobserver.cpp
+++ b/src/revisioncontrolobserver.cpp
@@ -23,6 +23,7 @@
 #include "revisioncontrolplugin.h"
 
 #include <kdirlister.h>
 #include "revisioncontrolplugin.h"
 
 #include <kdirlister.h>

+#include <klocale.h>

 
 #include <QAbstractProxyModel>
 #include <QAbstractItemView>
 
 #include <QAbstractProxyModel>
 #include <QAbstractItemView>


@@ -41,11 +42,13 @@ public:
     void setData(RevisionControlPlugin* plugin,
                  const QList<RevisionControlObserver::ItemState>& itemStates);
     QList<RevisionControlObserver::ItemState> itemStates() const;
     void setData(RevisionControlPlugin* plugin,
                  const QList<RevisionControlObserver::ItemState>& itemStates);
     QList<RevisionControlObserver::ItemState> itemStates() const;

-    
+    bool retrievedItems() const;
+

 protected:
     virtual void run();
     
 private:
 protected:
     virtual void run();
     
 private:

+    bool m_retrievedItems;

     RevisionControlPlugin* m_plugin;
     QMutex* m_pluginMutex;
     QList<RevisionControlObserver::ItemState> m_itemStates;
     RevisionControlPlugin* m_plugin;
     QMutex* m_pluginMutex;
     QList<RevisionControlObserver::ItemState> m_itemStates;


@@ -53,7 +56,9 @@ private:
 
 UpdateItemStatesThread::UpdateItemStatesThread(QObject* parent, QMutex* pluginMutex) :
     QThread(parent),
 
 UpdateItemStatesThread::UpdateItemStatesThread(QObject* parent, QMutex* pluginMutex) :
     QThread(parent),

-    m_pluginMutex(pluginMutex)
+    m_retrievedItems(false),
+    m_pluginMutex(pluginMutex),
+    m_itemStates()

 {
 }
 
 {
 }
 


@@ -73,12 +78,14 @@ void UpdateItemStatesThread::run()
     const QString directory = m_itemStates.first().item.url().directory(KUrl::AppendTrailingSlash);
 
     QMutexLocker locker(m_pluginMutex);
     const QString directory = m_itemStates.first().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();
     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;

     }
 }
 
     }
 }
 


@@ -87,6 +94,11 @@ QList<RevisionControlObserver::ItemState> UpdateItemStatesThread::itemStates() c
     return m_itemStates;
 }
 
     return m_itemStates;
 }
 

+bool UpdateItemStatesThread::retrievedItems() const
+{
+    return m_retrievedItems;
+}
+

 // ------------------------------------------------------------------------------------------------
 
 RevisionControlObserver::RevisionControlObserver(QAbstractItemView* view) :
 // ------------------------------------------------------------------------------------------------
 
 RevisionControlObserver::RevisionControlObserver(QAbstractItemView* view) :


@@ -165,6 +177,12 @@ void RevisionControlObserver::verifyDirectory()
     if (m_plugin == 0) {
         // TODO: just for testing purposes. A plugin approach will be used later.
         m_plugin = new SubversionPlugin();
     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());
     }
 
     revisionControlUrl.addPath(m_plugin->fileName());


@@ -212,6 +230,11 @@ void RevisionControlObserver::verifyDirectory()
 
 void RevisionControlObserver::applyUpdatedItemStates()
 {
 
 void RevisionControlObserver::applyUpdatedItemStates()
 {

+    if (!m_updateItemStatesThread->retrievedItems()) {
+        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.
     // 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.


@@ -228,6 +251,11 @@ void RevisionControlObserver::applyUpdatedItemStates()
 
     m_dolphinModel->blockSignals(signalsBlocked);
     m_view->viewport()->repaint();
 
     m_dolphinModel->blockSignals(signalsBlocked);
     m_view->viewport()->repaint();

+
+    // 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;
     
     if (m_pendingItemStatesUpdate) {
         m_pendingItemStatesUpdate = false;


@@ -266,6 +294,7 @@ void RevisionControlObserver::updateItemStates()
             itemStates.append(itemState);
         }
         
             itemStates.append(itemState);
         }
         

+        emit infoMessage(i18nc("@info:status", "Updating revision information..."));

         m_updateItemStatesThread->setData(m_plugin, itemStates);
         m_updateItemStatesThread->start(); // applyUpdatedItemStates() is called when finished
     }
         m_updateItemStatesThread->setData(m_plugin, itemStates);
         m_updateItemStatesThread->start(); // applyUpdatedItemStates() is called when finished
     }

diff --git a/src/revisioncontrolobserver.h b/src/revisioncontrolobserver.h
index ae19e219f67a513bb5e6b073cf6e32dfc5af85e7..4decbda7f192d5aa4ff4d4fc3d78e939244703c7 100644 (file)
--- a/src/revisioncontrolobserver.h
+++ b/src/revisioncontrolobserver.h
@@ -57,7 +57,26 @@ public:
 
     QList<QAction*> contextMenuActions(const KFileItemList& items) const;
     QList<QAction*> contextMenuActions(const QString& directory) const;
 
     QList<QAction*> contextMenuActions(const KFileItemList& items) const;
     QList<QAction*> contextMenuActions(const QString& directory) const;

+    
+signals:
+    /**
+     * Is emitted if an information message with the content \a msg
+     * should be shown.
+     */
+    void infoMessage(const QString& msg);
+
+    /**
+     * Is emitted if an error message with the content \a msg
+     * should be shown.
+     */
+    void errorMessage(const QString& msg);

 
 

+    /**
+     * Is emitted if an "operation completed" message with the content \a msg
+     * should be shown.
+     */
+    void operationCompletedMessage(const QString& msg);
+    

 private slots:
     void delayedDirectoryVerification();
     void verifyDirectory();
 private slots:
     void delayedDirectoryVerification();
     void verifyDirectory();

diff --git a/src/revisioncontrolplugin.cpp b/src/revisioncontrolplugin.cpp
index ff2425aab3847b15445bffa04b1e5e2200ff9ec0..bc50d28c74837539ca9ea136e7d9286eb59f2f08 100644 (file)
--- a/src/revisioncontrolplugin.cpp
+++ b/src/revisioncontrolplugin.cpp
@@ -55,6 +55,9 @@ SubversionPlugin::SubversionPlugin() :
     m_commitAction(0),
     m_addAction(0),
     m_removeAction(0),
     m_commitAction(0),
     m_addAction(0),
     m_removeAction(0),

+    m_command(),
+    m_errorMsg(),
+    m_operationCompletedMsg(),

     m_contextDir(),
     m_contextItems()
 {
     m_contextDir(),
     m_contextItems()
 {


@@ -173,8 +176,9 @@ RevisionControlPlugin::RevisionState SubversionPlugin::revisionState(const KFile
 QList<QAction*> SubversionPlugin::contextMenuActions(const KFileItemList& items)
 {
     Q_ASSERT(!items.isEmpty());
 QList<QAction*> SubversionPlugin::contextMenuActions(const KFileItemList& items)
 {
     Q_ASSERT(!items.isEmpty());

-
-    m_contextItems = items;
+    foreach (const KFileItem& item, items) {
+        m_contextItems.append(item);
+    }

     m_contextDir.clear();
 
     // iterate all items and check the revision state to know which
     m_contextDir.clear();
 
     // iterate all items and check the revision state to know which


@@ -211,8 +215,17 @@ QList<QAction*> SubversionPlugin::contextMenuActions(const KFileItemList& items)
 
 QList<QAction*> SubversionPlugin::contextMenuActions(const QString& directory)
 {
 
 QList<QAction*> SubversionPlugin::contextMenuActions(const QString& directory)
 {

-    m_contextDir = directory;
-    m_contextItems.clear();
+    const bool enabled = m_contextItems.isEmpty();
+    if (enabled) {
+        m_contextDir = directory;
+    }
+
+    // Only enable the SVN actions if no SVN commands are
+    // executed currently (see slotOperationCompleted() and
+    // startSvnCommandProcess()).
+    m_updateAction->setEnabled(enabled);
+    m_showLocalChangesAction->setEnabled(enabled);
+    m_commitAction->setEnabled(enabled);

 
     QList<QAction*> actions;
     actions.append(m_updateAction);
 
     QList<QAction*> actions;
     actions.append(m_updateAction);


@@ -223,7 +236,10 @@ QList<QAction*> SubversionPlugin::contextMenuActions(const QString& directory)
 
 void SubversionPlugin::updateFiles()
 {
 
 void SubversionPlugin::updateFiles()
 {

-    execSvnCommand("update");
+    execSvnCommand("update",
+                   i18nc("@info:status", "Updating SVN repository..."),
+                   i18nc("@info:status", "Update of SVN repository failed."),
+                   i18nc("@info:status", "Updated SVN repository."));

 }
 
 void SubversionPlugin::showLocalChanges()
 }
 
 void SubversionPlugin::showLocalChanges()


@@ -257,7 +273,10 @@ void SubversionPlugin::commitFiles()
 
     if (dialog.exec() == QDialog::Accepted) {
         const QString description = editor->toPlainText();
 
     if (dialog.exec() == QDialog::Accepted) {
         const QString description = editor->toPlainText();

-        execSvnCommand("commit -m " + KShell::quoteArg(description));
+        execSvnCommand("commit -m " + KShell::quoteArg(description),
+                       i18nc("@info:status", "Committing SVN changes..."),
+                       i18nc("@info:status", "Commit of SVN changes failed."),
+                       i18nc("@info:status", "Committed SVN changes."));

     }
 
     dialog.saveDialogSize(dialogConfig, KConfigBase::Persistent);
     }
 
     dialog.saveDialogSize(dialogConfig, KConfigBase::Persistent);


@@ -265,22 +284,68 @@ void SubversionPlugin::commitFiles()
 
 void SubversionPlugin::addFiles()
 {
 
 void SubversionPlugin::addFiles()
 {

-    execSvnCommand("add");
+    execSvnCommand("add",
+                   i18nc("@info:status", "Adding files to SVN repository..."),
+                   i18nc("@info:status", "Adding of files to SVN repository failed."),
+                   i18nc("@info:status", "Added files to SVN repository."));

 }
 
 void SubversionPlugin::removeFiles()
 {
 }
 
 void SubversionPlugin::removeFiles()
 {

-    execSvnCommand("remove");
+    execSvnCommand("remove",
+                   i18nc("@info:status", "Removing files from SVN repository..."),
+                   i18nc("@info:status", "Removing of files from SVN repository failed."),
+                   i18nc("@info:status", "Removed files from SVN repository."));
+}
+
+void SubversionPlugin::slotOperationCompleted()
+{
+    if (m_contextItems.isEmpty()) {
+        emit operationCompletedMessage(m_operationCompletedMsg);
+    } else {
+        startSvnCommandProcess();
+    }
+}
+
+void SubversionPlugin::slotOperationError()
+{
+    emit errorMessage(m_errorMsg);
+
+    // don't do any operation on other items anymore
+    m_contextItems.clear();
+}
+
+void SubversionPlugin::execSvnCommand(const QString& svnCommand,
+                                      const QString& infoMsg,
+                                      const QString& errorMsg,
+                                      const QString& operationCompletedMsg)
+{
+    emit infoMessage(infoMsg);
+
+    m_command = svnCommand;
+    m_errorMsg = errorMsg;
+    m_operationCompletedMsg = operationCompletedMsg;
+
+    startSvnCommandProcess();

 }
 
 }
 

-void SubversionPlugin::execSvnCommand(const QString& svnCommand)
+void SubversionPlugin::startSvnCommandProcess()

 {
 {

-    const QString command = "svn " + svnCommand + ' ';
+    QProcess* process = new QProcess(this);
+    connect(process, SIGNAL(finished(int)),
+            this, SLOT(slotOperationCompleted()));
+    connect(process, SIGNAL(error(QProcess::ProcessError)),
+            this, SLOT(slotOperationError()));
+
+    QStringList arguments;
+    arguments << m_command;

     if (!m_contextDir.isEmpty()) {
     if (!m_contextDir.isEmpty()) {

-        KRun::runCommand(command + KShell::quoteArg(m_contextDir), 0);
+        process->start("svn", arguments << KShell::quoteArg(m_contextDir));
+        m_contextDir.clear();

     } else {
     } else {

-        foreach (const KFileItem& item, m_contextItems) {
-            KRun::runCommand(command + KShell::quoteArg(item.localPath()), 0);
-        }
+        const KFileItem item = m_contextItems.takeLast();
+        process->start("svn", arguments << KShell::quoteArg(item.localPath()));
+        // the remaining items of m_contextItems will be executed
+        // after the process has finished (see slotOperationFinished())

     }
 }
     }
 }

diff --git a/src/revisioncontrolplugin.h b/src/revisioncontrolplugin.h
index 718e5c17d6500332fed41bc7aabdd2e881fb8eaf..939fa6f57e63dad5fd63f4eeaed09dc679be6e15 100644 (file)
--- a/src/revisioncontrolplugin.h
+++ b/src/revisioncontrolplugin.h
@@ -137,6 +137,24 @@ signals:
      * RevisionControlPlugin::endRetrieval().
      */
     void revisionStatesChanged(const QString& directory);
      * RevisionControlPlugin::endRetrieval().
      */
     void revisionStatesChanged(const QString& directory);

+
+    /**
+     * Is emitted if an information message with the content \a msg
+     * should be shown.
+     */
+    void infoMessage(const QString& msg);
+
+    /**
+     * Is emitted if an error message with the content \a msg
+     * should be shown.
+     */
+    void errorMessage(const QString& msg);
+
+    /**
+     * Is emitted if an "operation completed" message with the content \a msg
+     * should be shown.
+     */
+    void operationCompletedMessage(const QString& msg);

 };
 
 
 };
 
 


@@ -169,12 +187,26 @@ private slots:
     void addFiles();
     void removeFiles();
 
     void addFiles();
     void removeFiles();
 

+    void slotOperationCompleted();
+    void slotOperationError();
+

 private:
     /**
      * Executes the command "svn {svnCommand}" for the files that have been
      * set by getting the context menu actions (see contextMenuActions()).
 private:
     /**
      * Executes the command "svn {svnCommand}" for the files that have been
      * set by getting the context menu actions (see contextMenuActions()).

+     * @param infoMsg     Message that should be shown before the command is executed.
+     * @param errorMsg    Message that should be shown if the execution of the command
+     *                    has been failed.
+     * @param operationCompletedMsg
+     *                    Message that should be shown if the execution of the command
+     *                    has been completed successfully.

      */
      */

-    void execSvnCommand(const QString& svnCommand);
+    void execSvnCommand(const QString& svnCommand,
+                        const QString& infoMsg,
+                        const QString& errorMsg,
+                        const QString& operationCompletedMsg);
+
+    void startSvnCommandProcess();

 
 private:
     QHash<QString, RevisionState> m_revisionInfoHash;
 
 private:
     QHash<QString, RevisionState> m_revisionInfoHash;


@@ -185,8 +217,13 @@ private:
     QAction* m_commitAction;
     QAction* m_addAction;
     QAction* m_removeAction;
     QAction* m_commitAction;
     QAction* m_addAction;
     QAction* m_removeAction;

-    mutable QString m_contextDir;
-    mutable KFileItemList m_contextItems;
+
+    QString m_command;
+    QString m_errorMsg;
+    QString m_operationCompletedMsg;
+
+    QString m_contextDir;
+    KFileItemList m_contextItems;

 };
 #endif // REVISIONCONTROLPLUGIN_H
 
 };
 #endif // REVISIONCONTROLPLUGIN_H