Merge branch 'develop'

1 files changed, 13 insertions, 5 deletions

diff --git a/include/ui/SettingsDialog.h b/include/ui/SettingsDialog.h
index 133a8ec7..72f80917 100755
--- a/include/ui/SettingsDialog.h
+++ b/include/ui/SettingsDialog.h
@@ -42,17 +42,19 @@ private:
     QString appPath;
     QSettings settings;
 
-    QCheckBox *rememberPasswordCheckBox;
+    QComboBox *serverSelectBox;
     QCheckBox *saveCheckedKeysCheckBox;
     QCheckBox *importConfirmationCheckBox;
     QComboBox *langSelectBox;
     QComboBox *ownKeySelectBox;
+    QPushButton *getServiceTokenButton;
+    QLabel *serviceTokenLabel;
     QHash<QString, QString> lang;
     QHash<QString, QString> keyIds;
     QVector<QString> keyIdsList;
-    QString ownKeyId;
+    QString serviceToken;
     KeyList *mKeyList;
-    GpgME::GpgContext *mCtx; /** The current gpg context */
+    GpgME::GpgContext *mCtx;
 
 private slots:
 
@@ -60,6 +62,8 @@ private slots:
 
     void slotLanguageChanged();
 
+    void slotGetServiceToken();
+
 signals:
 
     void signalRestartNeeded(bool needed);
@@ -151,14 +155,17 @@ private:
 
     QString appPath;
     QSettings settings;
-
     QComboBox *comboBox;
     QLineEdit *newKeyServerEdit;
+    QTableWidget *keyServerTable;
+    QStringList keyServerStrList;
 
 private slots:
 
     void addKeyServer();
 
+    void refreshTable();
+
 signals:
 
     void signalRestartNeeded(bool needed);
@@ -181,6 +188,7 @@ private:
     QSettings settings;
 
     QCheckBox *steganoCheckBox;
+    QCheckBox *autoPubkeyExchangeCheckBox;
 
 signals:
 
@@ -196,7 +204,7 @@ public:
     void applySettings();
 
 private:
-    static QString getRelativePath(const QString& dir1, const QString& dir2);
+    static QString getRelativePath(const QString &dir1, const QString &dir2);
 
     QString appPath;
     QSettings settings;