Merge branch 'master' of https://github.com/gpg4usb/gpg4usb

1 files changed, 22 insertions, 1 deletions

diff --git a/settingsdialog.h b/settingsdialog.h
index 20bb4d2..b709b71 100755
--- a/settingsdialog.h
+++ b/settingsdialog.h
@@ -158,7 +158,27 @@ signals:
 
  };
 
-class SettingsDialog : public QDialog
+ class GpgPathsTab : public QWidget
+ {
+     Q_OBJECT
+ public:
+     GpgPathsTab(QWidget *parent = 0);
+     void applySettings();
+
+private:
+    QString getRelativePath(const QString dir1,const QString dir2);
+    QString defKeydbPath; /** The default keydb path used by gpg4usb */
+    QString accKeydbPath; /** The currently used keydb path */
+    QLabel *keydbLabel;
+    void setSettings();
+
+ private slots:
+     QString chooseKeydbDir();
+     void setKeydbPathToDefault();
+
+ };
+
+ class SettingsDialog : public QDialog
 {
     Q_OBJECT
 
@@ -169,6 +189,7 @@ class SettingsDialog : public QDialog
     AppearanceTab *appearanceTab;
     KeyserverTab *keyserverTab;
     AdvancedTab *advancedTab;
+    GpgPathsTab *gpgPathsTab;
     static QHash<QString, QString> listLanguages();
 
  public slots: