Handle case when not connected in KIO plugin

2017-03-11 19:57:49 +01:00 · 2017-03-11 19:57:49 +01:00 · 2635cde225
parent 6c51a470b7
commit 2635cde225
4 changed files with 189 additions and 96 deletions
--- a/fileitemactionplugin/syncthingfileitemaction.cpp
+++ b/fileitemactionplugin/syncthingfileitemaction.cpp
@ -9,7 +9,6 @@
 #include <qtutilities/resources/resources.h>
 #include <qtutilities/aboutdialog/aboutdialog.h>

-#include <KFileItemListProperties>
 #include <KFileItem>
 #include <KPluginFactory>
 #include <KPluginLoader>
@ -51,6 +50,44 @@ SyncthingItem::SyncthingItem(const SyncthingDir *dir, const QString &path) :
    }
 }

+SyncthingMenuAction::SyncthingMenuAction(const KFileItemListProperties &properties, const QList<QAction *> &actions, QWidget *parentWidget) :
+    QAction(parentWidget),
+    m_properties(properties)
+{
+    if(!actions.isEmpty()) {
+        auto *menu = new QMenu(parentWidget);
+        menu->addActions(actions);
+        setMenu(menu);
+    }
+    updateStatus(SyncthingFileItemAction::connection().status());
+}
+
+void SyncthingMenuAction::updateStatus(SyncthingStatus status)
+{
+    if(status != SyncthingStatus::Disconnected && status != SyncthingStatus::Reconnecting && status != SyncthingStatus::BeingDestroyed) {
+        setText(tr("Syncthing"));
+        setIcon(statusIcons().scanninig);
+        if(!menu()) {
+            const QList<QAction *> actions = SyncthingFileItemAction::createActions(m_properties, parentWidget());
+            if(!actions.isEmpty()) {
+                auto *menu = new QMenu(parentWidget());
+                menu->addActions(actions);
+                setMenu(menu);
+            }
+        }
+    } else {
+        if(status != SyncthingStatus::Reconnecting) {
+            SyncthingFileItemAction::connection().connect();
+        }
+        setText(tr("Syncthing - connecting"));
+        setIcon(statusIcons().disconnected);
+        if(QMenu *menu = this->menu()) {
+            setMenu(nullptr);
+            delete menu;
+        }
+    }
+}
+
 SyncthingConnection SyncthingFileItemAction::s_connection;

 SyncthingFileItemAction::SyncthingFileItemAction(QObject *parent, const QVariantList &) :
@ -100,10 +137,60 @@ SyncthingFileItemAction::SyncthingFileItemAction(QObject *parent, const QVariant

 QList<QAction *> SyncthingFileItemAction::actions(const KFileItemListProperties &fileItemInfo, QWidget *parentWidget)
 {
+    // handle case when not connected yet
+    if(!s_connection.isConnected()) {
+        s_connection.connect();
+        auto *menuAction = new SyncthingMenuAction(fileItemInfo, QList<QAction *>(), parentWidget);
+        connect(&s_connection, &SyncthingConnection::statusChanged, menuAction, &SyncthingMenuAction::updateStatus);
+        return QList<QAction *>() << menuAction;
+    }
+
+    QList<QAction *> actions = createActions(fileItemInfo, parentWidget);
+    // don't show anything if relevant actions could be determined
+    if(actions.isEmpty()) {
+        return actions;
+    }
+
+    return QList<QAction*>() << new SyncthingMenuAction(fileItemInfo, actions, parentWidget);
+}
+
+SyncthingConnection &SyncthingFileItemAction::connection()
+{
+    return s_connection;
+}
+
+void SyncthingFileItemAction::logConnectionStatus()
+{
+    cerr << "Syncthing connection status changed to: " << s_connection.statusText().toLocal8Bit().data() << endl;
+}
+
+void SyncthingFileItemAction::logConnectionError(const QString &errorMessage)
+{
+    cerr << "Syncthing connection error: " << errorMessage.toLocal8Bit().data() << endl;
+}
+
+void SyncthingFileItemAction::rescanDir(const QString &dirId, const QString &relpath)
+{
+    s_connection.rescan(dirId, relpath);
+}
+
+void SyncthingFileItemAction::showAboutDialog()
+{
+    auto *aboutDialog = new AboutDialog(nullptr, QStringLiteral(APP_NAME), QStringLiteral(APP_AUTHOR "\nSyncthing icons from Syncthing project"), QStringLiteral(APP_VERSION), QStringLiteral(APP_URL), QStringLiteral(APP_DESCRIPTION), QImage(statusIcons().scanninig.pixmap(128).toImage()));
+    aboutDialog->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME));
+    aboutDialog->setWindowIcon(QIcon::fromTheme(QStringLiteral("syncthingtray")));
+    aboutDialog->setWindowFlags(static_cast<Qt::WindowFlags>(aboutDialog->windowFlags() | Qt::WA_DeleteOnClose));
+    aboutDialog->show();
+}
+
+QList<QAction *> SyncthingFileItemAction::createActions(const KFileItemListProperties &fileItemInfo, QWidget *parentWidget)
+{
+    QList<QAction*> actions;
+
    // check whether any directories are known
    const auto &dirs = s_connection.dirInfo();
    if(dirs.empty()) {
-        return QList<QAction*>();
+        return actions;
    }

    // get all paths
@ -148,7 +235,6 @@ QList<QAction *> SyncthingFileItemAction::actions(const KFileItemListProperties
    }

    // add actions for the selected items itself
-    QList<QAction*> actions;
    if(!detectedItems.isEmpty()) {
        actions << new QAction(
                       QIcon::fromTheme(QStringLiteral("view-refresh")),
@ -266,24 +352,17 @@ QList<QAction *> SyncthingFileItemAction::actions(const KFileItemListProperties
        }
    }

-    // don't show anything if relevant actions could be determined
+    // don't add any further actions if no relevant actions could be determined so far
    if(actions.isEmpty()) {
        return actions;
    }

-    // create the menu
-    QAction *menuAction = new QAction(statusIcons().scanninig, tr("Syncthing"), this);
-    QMenu *menu = new QMenu(parentWidget);
-    menuAction->setMenu(menu);
-    menu->addActions(actions);
-
    // add action to show further information about directory if the selection is only about
    // one particular Syncthing dir
    if(detectedDirs.size() + containingDirs.size() == 1) {
-        QAction *infoAction = menu->addSeparator();
-        infoAction->setIcon(QIcon::fromTheme(QStringLiteral("dialog-information")));
-        infoAction->setText(tr("Directory info"));
-        QAction *statusAction = menu->addAction(tr("Status: ") + lastDir->statusString());
+        QAction *infoAction = new QAction(QIcon::fromTheme(QStringLiteral("dialog-information")), tr("Directory info"), parentWidget);
+        infoAction->setSeparator(true);
+        QAction *statusAction = new QAction(tr("Status: ") + lastDir->statusString());
        if(lastDir->paused && lastDir->status != SyncthingDirStatus::OutOfSync) {
            statusAction->setIcon(statusIcons().pause);
        } else {
@ -306,41 +385,21 @@ QList<QAction *> SyncthingFileItemAction::actions(const KFileItemListProperties
                break;
            }
        }
-        menu->addAction(QIcon::fromTheme(QStringLiteral("accept_time_event")),
-                        tr("Last scan time: ") + agoString(lastDir->lastScanTime));
-        menu->addAction(tr("Rescan interval: %1 seconds").arg(lastDir->rescanInterval));
+        actions << infoAction << statusAction;
+
+        actions << new QAction(QIcon::fromTheme(QStringLiteral("accept_time_event")),
+                               tr("Last scan time: ") + agoString(lastDir->lastScanTime), parentWidget);
+        actions << new QAction(tr("Rescan interval: %1 seconds").arg(lastDir->rescanInterval), parentWidget);
    }

    // about about action
-    menu->addSeparator();
-    menu->addAction(QIcon::fromTheme(QStringLiteral("help-about")), tr("About"), &SyncthingFileItemAction::showAboutDialog);
+    QAction *separator = new QAction(parentWidget);
+    separator->setSeparator(true);
+    QAction *aboutAction = new QAction(QIcon::fromTheme(QStringLiteral("help-about")), tr("About"));
+    connect(aboutAction, &QAction::triggered, &SyncthingFileItemAction::showAboutDialog);
+    actions << separator << aboutAction;

-    return QList<QAction*>() << menuAction;
+    return actions;
 }

-void SyncthingFileItemAction::logConnectionStatus()
-{
-    cerr << "Syncthing connection status changed to: " << s_connection.statusText().toLocal8Bit().data() << endl;
-}
-
-void SyncthingFileItemAction::logConnectionError(const QString &errorMessage)
-{
-    cerr << "Syncthing connection error: " << errorMessage.toLocal8Bit().data() << endl;
-}
-
-void SyncthingFileItemAction::rescanDir(const QString &dirId, const QString &relpath)
-{
-    s_connection.rescan(dirId, relpath);
-}
-
-void SyncthingFileItemAction::showAboutDialog()
-{
-    auto *aboutDialog = new AboutDialog(nullptr, QStringLiteral(APP_NAME), QStringLiteral(APP_AUTHOR "\nSyncthing icons from Syncthing project"), QStringLiteral(APP_VERSION), QStringLiteral(APP_URL), QStringLiteral(APP_DESCRIPTION), QImage(statusIcons().scanninig.pixmap(128).toImage()));
-    aboutDialog->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME));
-    aboutDialog->setWindowIcon(QIcon::fromTheme(QStringLiteral("syncthingtray")));
-    aboutDialog->setWindowFlags(static_cast<Qt::WindowFlags>(aboutDialog->windowFlags() | Qt::WA_DeleteOnClose));
-    aboutDialog->show();
-}
-
-
 #include <syncthingfileitemaction.moc>
--- a/fileitemactionplugin/syncthingfileitemaction.h
+++ b/fileitemactionplugin/syncthingfileitemaction.h
@ -4,12 +4,28 @@
 #include "../connector/syncthingconnection.h"

 #include <KAbstractFileItemActionPlugin>
+#include <KFileItemListProperties>
+
+#include <QAction>

-QT_FORWARD_DECLARE_CLASS(QAction)
 QT_FORWARD_DECLARE_CLASS(QWidget)

 class KFileItemListProperties;

+class SyncthingMenuAction : public QAction
+{
+    Q_OBJECT
+
+public:
+    SyncthingMenuAction(const KFileItemListProperties &properties = KFileItemListProperties(), const QList<QAction *> &actions = QList<QAction *>(), QWidget *parentWidget = nullptr);
+
+public Q_SLOTS:
+    void updateStatus(Data::SyncthingStatus status);
+
+private:
+    KFileItemListProperties m_properties;
+};
+
 class SyncthingFileItemAction : public KAbstractFileItemActionPlugin
 {
    Q_OBJECT
@ -17,6 +33,8 @@ class SyncthingFileItemAction : public KAbstractFileItemActionPlugin
 public:
    SyncthingFileItemAction(QObject* parent, const QVariantList &args);
    QList<QAction *> actions(const KFileItemListProperties &fileItemInfo, QWidget *parentWidget) override;
+    static Data::SyncthingConnection &connection();
+    static QList<QAction *> createActions(const KFileItemListProperties &fileItemInfo, QWidget *parentWidget);

 private Q_SLOTS:
    static void logConnectionStatus();
--- a/fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts
+++ b/fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts
@ -4,93 +4,101 @@
 <context>
    <name>SyncthingFileItemAction</name>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="156"/>
+        <location filename="../syncthingfileitemaction.cpp" line="242"/>
        <source>Rescan %1 (in %2)</source>
        <translation>&quot;%1&quot; neu scannen (in &quot;%2&quot;)</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="157"/>
+        <location filename="../syncthingfileitemaction.cpp" line="243"/>
        <source>Rescan selected items</source>
        <translation>Auswahl neu scannen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="175"/>
+        <location filename="../syncthingfileitemaction.cpp" line="261"/>
        <source>Rescan selected directories</source>
        <translation>Ausgewählte Verzeichnisse neu scannen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="202"/>
+        <location filename="../syncthingfileitemaction.cpp" line="288"/>
        <source>Resume selected directories</source>
        <translation>Ausgewählte verzeichnisse fortsetzen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="174"/>
-        <location filename="../syncthingfileitemaction.cpp" line="225"/>
+        <location filename="../syncthingfileitemaction.cpp" line="260"/>
+        <location filename="../syncthingfileitemaction.cpp" line="311"/>
        <source>Rescan %1</source>
        <translation>&quot;%1&quot; neu scannen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="201"/>
-        <location filename="../syncthingfileitemaction.cpp" line="251"/>
+        <location filename="../syncthingfileitemaction.cpp" line="287"/>
+        <location filename="../syncthingfileitemaction.cpp" line="337"/>
        <source>Resume %1</source>
        <translation>&quot;%1&quot; fortsetzen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="208"/>
-        <location filename="../syncthingfileitemaction.cpp" line="258"/>
+        <location filename="../syncthingfileitemaction.cpp" line="294"/>
+        <location filename="../syncthingfileitemaction.cpp" line="344"/>
        <source>Pause %1</source>
        <translation>&quot;%1&quot; pausieren</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="209"/>
+        <location filename="../syncthingfileitemaction.cpp" line="295"/>
        <source>Pause selected directories</source>
        <translation>Ausgewählte Verzeichnisse pausieren</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="226"/>
+        <location filename="../syncthingfileitemaction.cpp" line="312"/>
        <source>Rescan containing directories</source>
        <translation>Beinhaltendes Verzeichnis neu scannen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="252"/>
+        <location filename="../syncthingfileitemaction.cpp" line="338"/>
        <source>Resume containing directories</source>
        <translation>Beinhaltendes Verzeichnis fortsetzen</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="259"/>
+        <location filename="../syncthingfileitemaction.cpp" line="345"/>
        <source>Pause containing directories</source>
        <translation>Beinhaltendes Verzeichnis pausieren</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="275"/>
-        <source>Syncthing</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="285"/>
+        <location filename="../syncthingfileitemaction.cpp" line="363"/>
        <source>Directory info</source>
        <translation>Verzeichnisinfo</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="286"/>
+        <location filename="../syncthingfileitemaction.cpp" line="365"/>
        <source>Status: </source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="310"/>
+        <location filename="../syncthingfileitemaction.cpp" line="391"/>
        <source>Last scan time: </source>
        <translation>Letzter Scan: </translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="311"/>
+        <location filename="../syncthingfileitemaction.cpp" line="392"/>
        <source>Rescan interval: %1 seconds</source>
        <translation>Scanintervall: %1 Sekunden</translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="316"/>
-        <location filename="../syncthingfileitemaction.cpp" line="339"/>
+        <location filename="../syncthingfileitemaction.cpp" line="180"/>
+        <location filename="../syncthingfileitemaction.cpp" line="398"/>
        <source>About</source>
        <translation>Über</translation>
    </message>
 </context>
+<context>
+    <name>SyncthingMenuAction</name>
+    <message>
+        <location filename="../syncthingfileitemaction.cpp" line="68"/>
+        <source>Syncthing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../syncthingfileitemaction.cpp" line="82"/>
+        <source>Syncthing - connecting</source>
+        <translation>Syncthing - verbinde</translation>
+    </message>
+</context>
 </TS>
--- a/fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts
+++ b/fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts
@ -4,93 +4,101 @@
 <context>
    <name>SyncthingFileItemAction</name>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="156"/>
+        <location filename="../syncthingfileitemaction.cpp" line="242"/>
        <source>Rescan %1 (in %2)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="157"/>
+        <location filename="../syncthingfileitemaction.cpp" line="243"/>
        <source>Rescan selected items</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="175"/>
+        <location filename="../syncthingfileitemaction.cpp" line="261"/>
        <source>Rescan selected directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="202"/>
+        <location filename="../syncthingfileitemaction.cpp" line="288"/>
        <source>Resume selected directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="174"/>
-        <location filename="../syncthingfileitemaction.cpp" line="225"/>
+        <location filename="../syncthingfileitemaction.cpp" line="260"/>
+        <location filename="../syncthingfileitemaction.cpp" line="311"/>
        <source>Rescan %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="201"/>
-        <location filename="../syncthingfileitemaction.cpp" line="251"/>
+        <location filename="../syncthingfileitemaction.cpp" line="287"/>
+        <location filename="../syncthingfileitemaction.cpp" line="337"/>
        <source>Resume %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="208"/>
-        <location filename="../syncthingfileitemaction.cpp" line="258"/>
+        <location filename="../syncthingfileitemaction.cpp" line="294"/>
+        <location filename="../syncthingfileitemaction.cpp" line="344"/>
        <source>Pause %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="209"/>
+        <location filename="../syncthingfileitemaction.cpp" line="295"/>
        <source>Pause selected directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="226"/>
+        <location filename="../syncthingfileitemaction.cpp" line="312"/>
        <source>Rescan containing directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="252"/>
+        <location filename="../syncthingfileitemaction.cpp" line="338"/>
        <source>Resume containing directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="259"/>
+        <location filename="../syncthingfileitemaction.cpp" line="345"/>
        <source>Pause containing directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="275"/>
-        <source>Syncthing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="285"/>
+        <location filename="../syncthingfileitemaction.cpp" line="363"/>
        <source>Directory info</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="286"/>
+        <location filename="../syncthingfileitemaction.cpp" line="365"/>
        <source>Status: </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="310"/>
+        <location filename="../syncthingfileitemaction.cpp" line="391"/>
        <source>Last scan time: </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="311"/>
+        <location filename="../syncthingfileitemaction.cpp" line="392"/>
        <source>Rescan interval: %1 seconds</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../syncthingfileitemaction.cpp" line="316"/>
-        <location filename="../syncthingfileitemaction.cpp" line="339"/>
+        <location filename="../syncthingfileitemaction.cpp" line="180"/>
+        <location filename="../syncthingfileitemaction.cpp" line="398"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>SyncthingMenuAction</name>
+    <message>
+        <location filename="../syncthingfileitemaction.cpp" line="68"/>
+        <source>Syncthing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../syncthingfileitemaction.cpp" line="82"/>
+        <source>Syncthing - connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>