3 files changed, 8 insertions, 15 deletions

diff --git a/TODO b/TODO
index 1fde3c3..ac65207 100644
--- a/TODO
+++ b/TODO
@@ -28,8 +28,9 @@ Release 0.3.2
 	- import conf from old gpg4usb
 	- only show one import detail dialog, when importing public/private keys 
 	- always activate next button
-	- nextid is not called when clicking finish button
+	- nextid is not called when clicking finish button [DONE]
 	- add page for succesful import of settings from old gpg4usb (?)
+	- app is not in the foreground after importing config from older gpg4usb
 - BUG: cancel decryption on windows hangs programm -> possibly bug in gpgme [DONE]
 - option in settingsdialog for enabling steganographic operations [DONE]
 	- minimal steganography option: remove or add pgp-headers on demand [DONE]
@@ -51,6 +52,7 @@ Release 0.3.2
                      - remove menu and logo from subpages
                      - docs for sign&verify
 - add file.close, when files are opened
+- remove iconpath and use ressource file instaed
 
 BUGS:
 - import key toolbar dropdown shows text, even if only icon should be shown
diff --git a/wizard.cpp b/wizard.cpp
index c2c2d9a..d5fe1f2 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -33,7 +33,6 @@ Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
     setPage(Page_ImportFromGnupg,new ImportFromGnupgPage(mCtx, mKeyMgmt, this));
     setPage(Page_GenKey,new KeyGenPage(mCtx, this));
     setPage(Page_Conclusion,new ConclusionPage(this));
-    qDebug() << Page_Intro;
 #ifndef Q_WS_MAC
     setWizardStyle(ModernStyle);
 #endif
@@ -136,11 +135,8 @@ ImportFromGpg4usbPage::ImportFromGpg4usbPage(GpgME::GpgContext *ctx, KeyMgmt *ke
     gpg4usbConfigCheckBox->setChecked(true);
     QLabel *configLabel = new QLabel(tr("Configuration"));
 
-    QWidget *importFromGpg4usbButtonBox = new QWidget(this);
-    QHBoxLayout  *importFromGpg4usbButtonBoxLayout = new QHBoxLayout(importFromGpg4usbButtonBox);
     importFromGpg4usbButton = new QPushButton(tr("Import from older gpg4usb"));
     connect(importFromGpg4usbButton, SIGNAL(clicked()), this, SLOT(importKeysFromGpg4usb()));
-    importFromGpg4usbButtonBox->setLayout(importFromGpg4usbButtonBoxLayout);
 
     QGridLayout *gpg4usbLayout = new QGridLayout();
     gpg4usbLayout->addWidget(topLabel,1,1,1,2);
@@ -207,18 +203,16 @@ ImportFromGnupgPage::ImportFromGnupgPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgm
     setTitle(tr("Key import from Gnupg"));
     setSubTitle("bla");
 
-    QGridLayout *layout = new QGridLayout();
-    gnupgLabel = new QLabel(tr("Should I try to import keys from a locally installed GnuPG?<br/> The location is read "
+    QLabel *gnupgLabel = new QLabel(tr("Should I try to import keys from a locally installed GnuPG?<br/> The location is read "
                                "from registry in Windows and assumed to be the .gnupg folder in the your home directory in Linux"));
     gnupgLabel->setWordWrap(true);
-    layout->addWidget(gnupgLabel,1,1);
 
-    QWidget *importFromGnupgButtonBox = new QWidget(this);
-    QHBoxLayout  *importFromGnupgButtonBoxLayout = new QHBoxLayout(importFromGnupgButtonBox);
     importFromGnupgButton = new QPushButton(tr("Import keys from GnuPG"));
     connect(importFromGnupgButton, SIGNAL(clicked()), this, SLOT(importKeysFromGnupg()));
-    importFromGnupgButtonBox->setLayout(importFromGnupgButtonBoxLayout);
-    layout->addWidget(importFromGnupgButton,2,1);
+
+    QGridLayout *layout = new QGridLayout();
+    layout->addWidget(gnupgLabel);
+    layout->addWidget(importFromGnupgButton);
 
     this->setLayout(layout);
 }
diff --git a/wizard.h b/wizard.h
index e1bee05..99e7e70 100644
--- a/wizard.h
+++ b/wizard.h
@@ -89,7 +89,6 @@ private:
     int nextId() const;
 
     KeyMgmt *mKeyMgmt;
-    QVBoxLayout *layout;
     GpgME::GpgContext *mCtx;
     QCheckBox *gpg4usbKeyCheckBox;
     QCheckBox *gpg4usbConfigCheckBox;
@@ -120,8 +119,6 @@ private:
       */
     QString getGnuPGHome();
 
-    QLabel *gnupgLabel;
-    QVBoxLayout *layout;
     GpgME::GpgContext *mCtx;
     QPushButton *importFromGnupgButton;
 };