show importdetaildialog in all places

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

8 files changed, 34 insertions, 19 deletions

diff --git a/keymgmt.cpp b/keymgmt.cpp
index 3f1f8e9..f59ee27 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -178,7 +178,7 @@ void KeyMgmt::importKeyFromFile()
 
 void KeyMgmt::importKeyFromKeyServer()
 {
-    importDialog = new KeyServerImportDialog(mCtx, this);
+    importDialog = new KeyServerImportDialog(mCtx, mKeyList, this);
     importDialog->show();
 }
 
diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index 8a5ceeb..4803b39 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -22,11 +22,11 @@
 
 #include "keyserverimportdialog.h"
 
-KeyServerImportDialog::KeyServerImportDialog(GpgME::GpgContext *ctx, QWidget *parent)
+KeyServerImportDialog::KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *keyList, QWidget *parent)
     : QDialog(parent)
 {
     mCtx = ctx;
-
+    mKeyList = keyList;
     // Buttons
     closeButton = createButton(tr("&Close"), SLOT(close()));
     importButton = createButton(tr("&Import"), SLOT(import()));
@@ -288,7 +288,7 @@ void KeyServerImportDialog::importFinished()
         setMessage(tr("Error while contacting keyserver!"),true);
         return;
     }
-    mCtx->importKey(key.constData());
+    this->importKeys(key.constData());
     setMessage(tr("Key imported"),false);
 
     // Add keyserver to list in config-file, if it isn't contained
@@ -302,3 +302,9 @@ void KeyServerImportDialog::importFinished()
     reply->deleteLater();
     reply = 0;
 }
+
+void KeyServerImportDialog::importKeys(QByteArray inBuffer)
+{
+    GpgImportInformation result = mCtx->importKey(inBuffer);
+    new KeyImportDetailDialog(mCtx, mKeyList, result, this);
+}
diff --git a/keyserverimportdialog.h b/keyserverimportdialog.h
index b42953a..f9ab905 100644
--- a/keyserverimportdialog.h
+++ b/keyserverimportdialog.h
@@ -24,6 +24,8 @@
 #define __KEYSERVERIMPORTDIALOG_H__
 
 #include "gpgcontext.h"
+#include "keyimportdetaildialog.h"
+#include "keylist.h"
 #include <QNetworkAccessManager>
 #include <QtNetwork>
 
@@ -50,7 +52,7 @@ class KeyServerImportDialog : public QDialog
     Q_OBJECT
 
 public:
-    KeyServerImportDialog(GpgME::GpgContext *ctx, QWidget *parent = 0);
+    KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *keyList, QWidget *parent = 0);
     void import(QStringList keyIds);
     void import(QStringList keyIds, QUrl keyserverUrl);
 
@@ -65,10 +67,12 @@ private:
     void createKeysTable();
     void setMessage(const QString &text, bool error);
     void close();
+    void importKeys(QByteArray inBuffer);
 
     QPushButton *createButton(const QString &text, const char *member);
     QComboBox *createComboBox();
     GpgME::GpgContext *mCtx;
+    KeyList *mKeyList;
     QLineEdit *searchLineEdit;
     QComboBox *keyServerComboBox;
     QLabel *searchLabel;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7dbfbc5..d8f78c4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -632,7 +632,7 @@ void MainWindow::openHelp() {
 
 void MainWindow::startWizard()
 {
-    Wizard *wizard = new Wizard(mCtx,this);
+    Wizard *wizard = new Wizard(mCtx,keyMgmt,this);
     wizard->show();
     wizard->setModal(true);
 }
@@ -704,7 +704,7 @@ void MainWindow::importKeyFromEdit()
         return;
     }
 
-    mCtx->importKey(edit->curTextPage()->toPlainText().toAscii());
+    keyMgmt->importKeys(edit->curTextPage()->toPlainText().toAscii());
 }
 
 void MainWindow::openKeyManagement()
diff --git a/verifykeydetailbox.cpp b/verifykeydetailbox.cpp
index 3d8d538..44265cc 100644
--- a/verifykeydetailbox.cpp
+++ b/verifykeydetailbox.cpp
@@ -85,7 +85,7 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx,
 
 void VerifyKeyDetailBox::importFormKeyserver()
 {
-    KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,this);
+    KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,mKeyList,this);
     importDialog->import(QStringList(fpr));
 }
 
diff --git a/verifynotification.cpp b/verifynotification.cpp
index a3897b2..59600a5 100644
--- a/verifynotification.cpp
+++ b/verifynotification.cpp
@@ -55,7 +55,7 @@ VerifyNotification::VerifyNotification(QWidget *parent, GpgME::GpgContext *ctx,
 
 void VerifyNotification::importFromKeyserver()
 {
-    KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,this);
+    KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,mKeyList, this);
     importDialog->import(*keysNotInList);
 }
 
diff --git a/wizard.cpp b/wizard.cpp
index 5473dc3..b9fd914 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -23,13 +23,14 @@
 
  #include "wizard.h"
 
-Wizard::Wizard(GpgME::GpgContext *ctx, QWidget *parent)
+Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
     : QWizard(parent)
 {
     mCtx=ctx;
+    mKeyMgmt=keyMgmt;
     IntroPage *introPage = new IntroPage();
     KeyGenPage *keyGenPage = new KeyGenPage(mCtx);
-    ImportPage *importPage = new ImportPage(mCtx);
+    ImportPage *importPage = new ImportPage(mCtx,mKeyMgmt);
     ConclusionPage *conclusionPage = new ConclusionPage();
     addPage(introPage);
     addPage(keyGenPage);
@@ -106,10 +107,11 @@ void KeyGenPage::showKeyGeneratedMessage()
     layout->addWidget(new QLabel(tr("key generated. Now you can crypt and sign texts.")));
 }
 
-ImportPage::ImportPage(GpgME::GpgContext *ctx, QWidget *parent)
+ImportPage::ImportPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
      : QWizardPage(parent)
 {
     mCtx=ctx;
+    mKeyMgmt=keyMgmt;
     setTitle(tr("Keyring Import"));
     QGroupBox *gnupgBox = new QGroupBox(tr("Import from GnuPG"), this);
 
@@ -198,7 +200,7 @@ bool ImportPage::importKeysFromGpg4usb()
             return false;
         }
         QByteArray inBuffer = pubRing.readAll();
-        mCtx->importKey(inBuffer);
+        mKeyMgmt->importKeys(inBuffer);
     }
 
     if (secRing.exists() and gnupgPrivKeyCheckBox->isChecked()) {
@@ -207,7 +209,7 @@ bool ImportPage::importKeysFromGpg4usb()
             return false;
         }
         QByteArray inBuffer = secRing.readAll();
-        mCtx->importKey(inBuffer);
+        mKeyMgmt->importKeys(inBuffer);
     }
     return true;
 }
@@ -232,7 +234,7 @@ bool ImportPage::importKeysFromGnupg()
         }
         QByteArray inBuffer = file.readAll();
 
-        mCtx->importKey(inBuffer);
+        mKeyMgmt->importKeys(inBuffer);
     }
 
     // try to import public keys, if public checkbox is checked
@@ -246,7 +248,7 @@ bool ImportPage::importKeysFromGnupg()
         }
         QByteArray inBuffer = file.readAll();
 
-        mCtx->importKey(inBuffer);
+        mKeyMgmt->importKeys(inBuffer);
     }
 
     return true;
diff --git a/wizard.h b/wizard.h
index c91bfd0..702e3c8 100644
--- a/wizard.h
+++ b/wizard.h
@@ -19,12 +19,13 @@
  *      along with gpg4usb.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include "keygendialog.h"
 
 #ifndef WIZARD_H
 #define WIZARD_H
 
 #include <QWizard>
+#include "keygendialog.h"
+#include "keymgmt.h"
 
 class QCheckBox;
 class QLabel;
@@ -36,10 +37,11 @@ class Wizard : public QWizard
     Q_OBJECT
 
 public:
-    Wizard(GpgME::GpgContext *ctx, QWidget *parent = 0);
+    Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent = 0);
 
 private:
     GpgME::GpgContext *mCtx;
+    KeyMgmt *mKeyMgmt;
 };
 
 class IntroPage : public QWizardPage
@@ -77,7 +79,7 @@ class ImportPage : public QWizardPage
     Q_OBJECT
 
 public:
-    ImportPage(GpgME::GpgContext *ctx, QWidget *parent = 0);
+    ImportPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent = 0);
 
 private slots:
     /**
@@ -87,6 +89,7 @@ private slots:
     bool importKeysFromGpg4usb();
 
 private:
+    KeyMgmt *mKeyMgmt;
     int nextId() const;
 
     /**