Merge branch 'develop'

1 files changed, 12 insertions, 14 deletions

diff --git a/include/ui/keygen/KeygenThread.h b/include/ui/widgets/SignersPicker.h
index 30478050..afa95a05 100644
--- a/include/ui/keygen/KeygenThread.h
+++ b/include/ui/widgets/SignersPicker.h
@@ -22,29 +22,27 @@
  *
  */
 
-#ifndef __KEYGENTHREAD_H__
-#define __KEYGENTHREAD_H__
+#ifndef GPGFRONTEND_ZH_CN_TS_SIGNERSPIRCKER_H
+#define GPGFRONTEND_ZH_CN_TS_SIGNERSPIRCKER_H
 
+#include "GpgFrontend.h"
 #include "gpg/GpgContext.h"
 
-class KeyGenThread : public QThread {
+#include "ui/widgets/KeyList.h"
+
+class SignersPicker : public QDialog {
 Q_OBJECT
 
 public:
-    KeyGenThread(GenKeyInfo *keyGenParams, GpgME::GpgContext *ctx);
 
-signals:
-    void signalKeyGenerated(bool success);
+    explicit SignersPicker(GpgME::GpgContext *ctx, QWidget *parent = nullptr);
+
+    void getCheckedSigners(QVector<GpgKey> &keys);
 
 private:
-    GenKeyInfo *keyGenParams;
     GpgME::GpgContext *mCtx;
-    QMutex mutex;
-
-protected:
-
-    void run() override;
-
+    KeyList *mKeyList;
 };
 
-#endif // __KEYGENTHREAD_H__
+
+#endif //GPGFRONTEND_ZH_CN_TS_SIGNERSPIRCKER_H