Repair and improve the functions and UI related to the upload and update of the key server.

Improve part of the UI description.
Repair the problems in the project configuration file.

1 files changed, 10 insertions, 3 deletions

diff --git a/include/ui/KeyServerImportDialog.h b/include/ui/KeyServerImportDialog.h
index 74ae864e..0a77aece 100644
--- a/include/ui/KeyServerImportDialog.h
+++ b/include/ui/KeyServerImportDialog.h
@@ -34,11 +34,12 @@ class KeyServerImportDialog : public QDialog {
 Q_OBJECT
 
 public:
-    KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *keyList, QWidget *parent = nullptr);
+    KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *keyList, bool automatic,
+                          QWidget *parent);
 
-    void slotImport(QStringList keyIds);
+    void slotImport(const QStringList& keyIds);
 
-    void slotImport(QStringList keyIds, const QUrl& keyserverUrl);
+    void slotImport(const QStringList& keyIds, const QUrl& keyserverUrl);
 
 private slots:
 
@@ -57,16 +58,22 @@ private:
 
     void importKeys(QByteArray inBuffer);
 
+    void setLoading(bool status);
+
     QPushButton *createButton(const QString &text, const char *member);
 
     QComboBox *createComboBox();
 
+    bool mAutomatic;
+
     QString appPath;
     QSettings settings;
+
     GpgME::GpgContext *mCtx;
     KeyList *mKeyList;
     QLineEdit *searchLineEdit;
     QComboBox *keyServerComboBox;
+    QProgressBar *waitingBar;
     QLabel *searchLabel;
     QLabel *keyServerLabel;
     QLabel *message;