added import from keyserver to keymgmt

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@507 34ebc366-c3a9-4b3c-9f84-69acf7962910

2 files changed, 15 insertions, 0 deletions

diff --git a/keymgmt.cpp b/keymgmt.cpp
index ff7d4fc..73f2282 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -85,6 +85,10 @@ void KeyMgmt::createActions()
     importKeyFromClipboardAct->setToolTip(tr("Import New Key From Clipboard"));
     connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
 
+    importKeyFromKeyServerAct = new QAction(tr("&Keyserver"), this);
+    importKeyFromKeyServerAct->setToolTip(tr("Import New Key From Keyserver"));
+    connect(importKeyFromKeyServerAct, SIGNAL(triggered()), this, SLOT(importKeyFromKeyServer()));
+
     exportKeyToClipboardAct = new QAction(tr("Export To &Clipboard"), this);
     exportKeyToClipboardAct->setIcon(QIcon(mIconPath + "export_key_to_clipbaord.png"));
     exportKeyToClipboardAct->setToolTip(tr("Export Selected Key(s) To Clipboard"));
@@ -122,6 +126,7 @@ void KeyMgmt::createMenus()
     keyMenu = menuBar()->addMenu(tr("&Key"));
     keyMenu->addAction(importKeyFromFileAct);
     keyMenu->addAction(importKeyFromClipboardAct);
+    keyMenu->addAction(importKeyFromKeyServerAct);
     keyMenu->addSeparator();
     keyMenu->addAction(exportKeyToFileAct);
     keyMenu->addAction(exportKeyToClipboardAct);
@@ -157,6 +162,12 @@ void KeyMgmt::importKeyFromFile()
     }
 }
 
+void KeyMgmt::importKeyFromKeyServer()
+{
+    importDialog = new KeyServerImportDialog(mCtx, this);
+    importDialog->show();
+}
+
 void KeyMgmt::importKeyFromClipboard()
 {
     QClipboard *cb = QApplication::clipboard();
diff --git a/keymgmt.h b/keymgmt.h
index 22c5058..2d08edc 100755
--- a/keymgmt.h
+++ b/keymgmt.h
@@ -40,6 +40,7 @@ class QSlider;
 #include "keylist.h"
 #include "keygenthread.h"
 #include "keydetailsdialog.h"
+#include "keyserverimportdialog.h"
 
 class KeyMgmt : public QMainWindow
 {
@@ -51,6 +52,7 @@ public:
 public slots:
     void importKeyFromFile();
     void importKeyFromClipboard();
+    void importKeyFromKeyServer();
     void exportKeyToFile();
     void exportKeyToClipboard();
     void deleteSelectedKeys();
@@ -80,6 +82,7 @@ private:
     QAction *importKeyFromFileAct;
     QAction *importKeyFromEditAct;
     QAction *importKeyFromClipboardAct;
+    QAction *importKeyFromKeyServerAct;
     QAction *exportKeyToFileAct;
     QAction *exportKeyToClipboardAct;
     QAction *deleteCheckedKeysAct;
@@ -111,6 +114,7 @@ private:
     QDateTimeEdit *dateEdit;
     QCheckBox *expireCheckBox;
     QSlider *pwStrengthSlider;
+    KeyServerImportDialog *importDialog;
 
 protected:
     void closeEvent(QCloseEvent *event);