Merge pull request #5 from giucam/context

[vault-declarative] Pass some context information with the done signal
sailfishos · Jun 18, 2014 · bc0dd75 · bc0dd75
2 parents a97bb7b + 5efbe3c
commit bc0dd75
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/qml/Vault/vault.cpp b/qml/Vault/vault.cpp
@@ -58,7 +58,7 @@ class Worker : public QObject
         m_vault->restore(snapshot, home, units, [this](const QString unit, const QString &status) {
             emit progress(Vault::Restore, {{"unit", unit}, {"status", status}});
         });
-        emit done(Vault::Restore);
+        emit done(Vault::Restore, QVariantMap());
     }
 
     Q_INVOKABLE void backup(const QString &home, const QStringList &units, const QString &message)
@@ -67,7 +67,7 @@ class Worker : public QObject
         m_vault->backup(home, units, message, [this](const QString unit, const QString &status) {
             emit progress(Vault::Backup, {{"unit", unit}, {"status", status}});
         });
-        emit done(Vault::Backup);
+        emit done(Vault::Backup, QVariantMap());
     }
 
     QStringList snapshots() const
@@ -94,7 +94,10 @@ class Worker : public QObject
         try {
             CardTransfer::Action ac = action == Vault::Import ? CardTransfer::Import : CardTransfer::Export;
             m_transfer->init(m_vault, ac, path);
-            emit done(Vault::ExportImportPrepare);
+            QVariantMap data;
+            data["action"] = action ==Vault:: Import ? "import" : "export";
+            data["src"] = m_transfer->getSrc();
+            emit done(Vault::ExportImportPrepare, data);
         } catch (error::Error e) {
             emit error(Vault::ExportImportPrepare, e.what());
         }
@@ -110,7 +113,7 @@ class Worker : public QObject
             m_transfer->execute([this](QVariantMap &&map) {
                 emit progress(Vault::ExportImportExecute, map);
             });
-            emit done(Vault::ExportImportExecute);
+            emit done(Vault::ExportImportExecute, QVariantMap());
         } catch (error::Error e) {
             emit error(Vault::ExportImportExecute, e.what());
         }
@@ -141,13 +144,13 @@ class Worker : public QObject
         } else {
             debug::debug("There are some snapshots, continue");
         }
-        emit done(Vault::RemoveSnapshot);
+        emit done(Vault::RemoveSnapshot, QVariantMap());
     }
 
 signals:
     void progress(Vault::Operation op, const QVariantMap &map);
     void error(Vault::Operation op, const QString &error);
-    void done(Vault::Operation op);
+    void done(Vault::Operation op, const QVariantMap &);
 
 public:
     vault::Vault *m_vault;
@@ -212,7 +215,7 @@ void Vault::initWorker(bool reload)
     }
     try {
         m_worker->init(m_root);
-        emit done(Vault::Connect);
+        emit done(Vault::Connect, QVariantMap());
     } catch (error::Error e) {
         emit error(Vault::Connect, e.what());
     }
@@ -221,7 +224,7 @@ void Vault::initWorker(bool reload)
 void Vault::connectVault(bool reconnect)
 {
     if (m_worker && !reconnect) {
-        emit done(Vault::Connect);
+        emit done(Vault::Connect, QVariantMap());
         return;
     }
 
@@ -232,7 +235,7 @@ void Vault::startRestore(const QString &snapshot, const QStringList &units)
 {
     if (units.isEmpty()) {
         debug::info("Nothing to restore");
-        emit done(Vault::Restore);
+        emit done(Vault::Restore, QVariantMap());
         return;
     }
 
@@ -243,7 +246,7 @@ void Vault::startBackup(const QString &message, const QStringList &units)
 {
     if (units.isEmpty()) {
         debug::info("Nothing to backup");
-        emit done(Vault::Backup);
+        emit done(Vault::Backup, QVariantMap());
         return;
     }
 

diff --git a/qml/Vault/vault.hpp b/qml/Vault/vault.hpp
@@ -57,7 +57,7 @@ class Vault : public QObject
     void rootChanged();
     void backupHomeChanged();
 
-    void done(Operation operation);
+    void done(Operation operation, const QVariantMap &data);
     void progress(Operation operation, const QVariantMap &data);
     void error(Operation operation, const QString &error);