aboutsummaryrefslogtreecommitdiffstats
path: root/wizard.h
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-24 20:39:33 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-24 20:39:33 +0000
commit994caf61c3e58c011ac1f41839ff37e801e11be5 (patch)
tree7c8f202ef9d5e092b2ef752f98b1631032ea94fb /wizard.h
parentupdated TODO (diff)
downloadgpg4usb-994caf61c3e58c011ac1f41839ff37e801e11be5.tar.gz
gpg4usb-994caf61c3e58c011ac1f41839ff37e801e11be5.zip
added static method importsecandpubkeysfromdir to wizard
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@769 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'wizard.h')
-rw-r--r--wizard.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/wizard.h b/wizard.h
index 99e7e70..23cfb46 100644
--- a/wizard.h
+++ b/wizard.h
@@ -43,6 +43,7 @@ public:
Page_Conclusion };
Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent = 0);
+ static bool importPubAndSecKeysFromDir(const QString dir, KeyMgmt *keyMgmt);
private:
GpgME::GpgContext *mCtx;
@@ -82,7 +83,7 @@ private slots:
/**
* @details Import keys from gnupg-homedir, private or/and public depend on the checked boxes
*/
- bool importKeysFromGpg4usb();
+ bool importFormOlderGpg4usb();
bool importConfFromGpg4usb(QString dir);
private: