in keylist added append selected keys to text

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

3 files changed, 24 insertions, 9 deletions

diff --git a/gpgwin.cpp b/gpgwin.cpp
index c8c6c27..5b8a103 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -54,7 +54,7 @@ GpgWin::GpgWin()
     setCurrentFile("");
 
     mKeyList->addMenuAction(deleteSelectedKeysAct);
-
+    mKeyList->addMenuAction(appendSelectedKeysAct);
 }
 
 void GpgWin::createActions()
@@ -165,9 +165,13 @@ void GpgWin::createActions()
 
     /** Popup-Menu-Action for KeyList
      */
-    deleteSelectedKeysAct = new QAction(tr("Delete Key"), this);
-    deleteSelectedKeysAct->setStatusTip(tr("Delete the selected keys"));
+    deleteSelectedKeysAct = new QAction(tr("Delete Selected Key(s)"), this);
+    deleteSelectedKeysAct->setStatusTip(tr("Delete The Selected Keys"));
     connect(deleteSelectedKeysAct, SIGNAL(triggered()), this, SLOT(deleteSelectedKeys()));
+
+    appendSelectedKeysAct = new QAction(tr("Append Selected Key(s) To Text"), this);
+    appendSelectedKeysAct->setStatusTip(tr("Append The Selected Keys To Text in Editor"));
+    connect(appendSelectedKeysAct, SIGNAL(triggered()), this, SLOT(appendSelectedKeys()));
 }
 
 void GpgWin::createMenus()
@@ -191,7 +195,7 @@ void GpgWin::createMenus()
     cryptMenu->addAction(decryptAct);
     cryptMenu->addSeparator();
 
-    importKeyMenu = cryptMenu->addMenu(tr("&Import key from..."));
+    importKeyMenu = cryptMenu->addMenu(tr("&Import Key From..."));
     importKeyMenu->addAction(importKeyFromFileAct);
     importKeyMenu->addAction(importKeyFromEditAct);
     importKeyMenu->addAction(importKeyFromClipboardAct);
@@ -498,3 +502,13 @@ void GpgWin::deleteSelectedKeys()
     mKeyList->refresh();
 }
 
+/**
+ * Append the selected (not checked!) Key(s) To Textedit
+ */
+void GpgWin::appendSelectedKeys()
+{
+    QByteArray *keyArray = new QByteArray();
+
+    myCtx->exportKeys(mKeyList->getSelected(), keyArray);
+    edit->appendPlainText(*keyArray);
+}
diff --git a/gpgwin.h b/gpgwin.h
index 317050d..3d216ad 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -63,6 +63,7 @@ public slots:
     void importKeyFromEdit();
     void importKeyFromClipboard();
     void importKeyDialog();
+	void appendSelectedKeys();
     void openKeyManagement();
     void print();
     void about();
@@ -106,6 +107,7 @@ private:
     QAction *importKeyFromFileAct;
     QAction *importKeyFromEditAct;
     QAction *importKeyFromClipboardAct;
+	QAction *appendSelectedKeysAct;
     QAction *openKeyManagementAct;
     QAction *copyAct;
     QAction *cutAct;
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 5701967..4aee4a1 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -147,10 +147,9 @@ void KeyMgmt::deleteCheckedKeys()
 
 void KeyMgmt::exportKeyToFile()
 {
-    QList<QString> *uidList = mKeyList->getChecked();
     QByteArray *keyArray = new QByteArray();
 	
-    mCtx->exportKeys(uidList, keyArray);
+    mCtx->exportKeys(mKeyList->getChecked(), keyArray);
     
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), "", tr("Key Files") + " (*.asc *.txt);;All Files (*.*)");
 	QFile file(fileName);
@@ -164,12 +163,12 @@ void KeyMgmt::exportKeyToFile()
 
 void KeyMgmt::exportKeyToClipboard()
 {
-    QList<QString> *uidList = mKeyList->getChecked();
     QByteArray *keyArray = new QByteArray();
-	
-    mCtx->exportKeys(uidList, keyArray);
     QClipboard *cb = QApplication::clipboard();
+	
+    mCtx->exportKeys(mKeyList->getChecked(), keyArray);
     cb->setText(*keyArray);
+	delete keyArray;
 }