Merge branch 'develop'

1 files changed, 21 insertions, 11 deletions

diff --git a/src/ui/keygen/SubkeyGenerateThread.cpp b/include/ui/ShowCopyDialog.h
index 125f35f8..45b06e2d 100644
--- a/src/ui/keygen/SubkeyGenerateThread.cpp
+++ b/include/ui/ShowCopyDialog.h
@@ -18,19 +18,29 @@
  * Their source code version also complies with GNU General Public License.
  *
  * The source code version of this software was modified and released
- * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021.
+ * by Saturneric<[email protected]> starting on May 12, 2021.
  *
  */
 
-#include "ui/keygen/SubkeyGenerateThread.h"
+#ifndef GPGFRONTEND_ZH_CN_TS_SHOWCOPYDIALOG_H
+#define GPGFRONTEND_ZH_CN_TS_SHOWCOPYDIALOG_H
 
-SubkeyGenerateThread::SubkeyGenerateThread(GpgKey key, GenKeyInfo *keyGenParams, GpgME::GpgContext *ctx)
-        : mKey(std::move(key)), keyGenParams(keyGenParams) , mCtx(ctx) {
-    connect(this, &SubkeyGenerateThread::finished, this, &SubkeyGenerateThread::deleteLater);
-}
+#include "GpgFrontend.h"
 
-void SubkeyGenerateThread::run() {
-    bool success = mCtx->generateSubkey(mKey, keyGenParams);
-    emit signalKeyGenerated(success);
-    emit finished({});
-}
+class ShowCopyDialog : public QDialog {
+Q_OBJECT
+public:
+    explicit ShowCopyDialog(const QString &text, const QString &info = "", QWidget *parent = nullptr);
+
+private slots:
+
+    void slotCopyText();
+
+private:
+    QLabel *infoLabel;
+    QTextEdit *textEdit;
+    QPushButton *copyButton;
+};
+
+
+#endif //GPGFRONTEND_ZH_CN_TS_SHOWCOPYDIALOG_H