1 files changed, 62 insertions, 44 deletions

diff --git a/gpgwin.cpp b/gpgwin.cpp
index 351697b..aca6e4a 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -56,6 +56,8 @@ GpgWin::GpgWin()
     setIconSize(QSize(32, 32));
     setCurrentFile("");
 
+    m_keyList->addMenuAction(deleteSelectedKeysAct);
+
 }
 
 void GpgWin::createActions()
@@ -158,6 +160,13 @@ void GpgWin::createActions()
     aboutAct->setIcon(QIcon(iconPath + "help.png"));
     aboutAct->setStatusTip(tr("Show the application's About box"));
     connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    /** Popup-Menu-Action for KeyList
+     */
+    deleteSelectedKeysAct = new QAction(tr("Delete Key"), this);
+    deleteSelectedKeysAct->setStatusTip(tr("Delete the selected keys"));
+    connect(deleteSelectedKeysAct, SIGNAL(triggered()), this, SLOT(deleteSelectedKeys()));
+
 }
 
 void GpgWin::createMenus()
@@ -176,16 +185,16 @@ void GpgWin::createMenus()
     editMenu->addAction(pasteAct);
     editMenu->addAction(selectallAct);
 
-	cryptMenu = menuBar()->addMenu(tr("&Crypt"));
+    cryptMenu = menuBar()->addMenu(tr("&Crypt"));
     cryptMenu->addAction(encryptAct);
     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);
-	
+    importKeyMenu->addAction(importKeyFromClipboardAct);
+
     helpMenu = menuBar()->addMenu(tr("&Help"));
     helpMenu->addAction(aboutAct);
 }
@@ -196,7 +205,7 @@ void GpgWin::createToolBars()
     cryptToolBar->addAction(encryptAct);
     cryptToolBar->addAction(decryptAct);
     cryptToolBar->addAction(importKeyDialogAct);
-        
+
 
 
     editToolBar = addToolBar(tr("Edit"));
@@ -385,7 +394,7 @@ void GpgWin::decrypt()
     QByteArray *tmp = new QByteArray();
     QByteArray text = edit->toPlainText().toAscii();
     preventNoDataErr(&text);
-    myCtx->decrypt(text, tmp);	
+    myCtx->decrypt(text, tmp);
     if (!tmp->isEmpty()) {
         QString *tmp2 = new QString(*tmp);
         edit->setPlainText(*tmp2);
@@ -403,7 +412,7 @@ void GpgWin::preventNoDataErr(QByteArray *in)
     if(block_start > 0 && in->at(block_start - 1) != '\n') {
         in->insert(block_start, '\n');
     }
-} 	  				 	 	 	   	 	  	   		  	 
+}
 
 void GpgWin::importKeyFromEdit()
 {
@@ -415,7 +424,7 @@ void GpgWin::importKeyFromClipboard()
 {
     QClipboard *cb = QApplication::clipboard();
     myCtx->importKey(cb->text(QClipboard::Clipboard).toAscii());
-   	m_keyList->refresh();
+    m_keyList->refresh();
 }
 
 void GpgWin::importKeyFromFile()
@@ -435,40 +444,49 @@ void GpgWin::importKeyFromFile()
 }
 
 void GpgWin::importKeyDialog() {
-	
-		QDialog *dialog = new QDialog();
-	
-		dialog->setWindowTitle(tr("Import Key"));
-		dialog->setModal(true);
-		
-		QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-		
-		connect(buttonBox,SIGNAL(accepted()),dialog, SLOT(accept()));
-		connect(buttonBox,SIGNAL(rejected()), dialog, SLOT(reject()));
-		
-		QGroupBox *groupBox = new QGroupBox(tr("Import Key From..."));
-     	QRadioButton *radio1 = new QRadioButton(tr("&File"));
-    	QRadioButton *radio2 = new QRadioButton(tr("&Editor"));
-     	QRadioButton *radio3 = new QRadioButton(tr("&Clipboard"));
-     	radio1->setChecked(true);
-
-    	QVBoxLayout *vbox1 = new QVBoxLayout();
-     	vbox1->addWidget(radio1);
-     	vbox1->addWidget(radio2);
-     	vbox1->addWidget(radio3);
-     	
-     	groupBox->setLayout(vbox1);
-     	
-     	QVBoxLayout *vbox2 = new QVBoxLayout();
-     	vbox2->addWidget(groupBox);
-     	vbox2->addWidget(buttonBox);
-     	
-     	dialog->setLayout(vbox2);
-     	
-     	if(dialog->exec() == QDialog::Accepted ) {
-			if (radio1->isChecked()) importKeyFromFile();
-			if (radio2->isChecked()) importKeyFromEdit();
-			if (radio3->isChecked()) importKeyFromClipboard();
-     	}		
-		
+
+        QDialog *dialog = new QDialog();
+
+        dialog->setWindowTitle(tr("Import Key"));
+        dialog->setModal(true);
+
+        QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+
+        connect(buttonBox,SIGNAL(accepted()),dialog, SLOT(accept()));
+        connect(buttonBox,SIGNAL(rejected()), dialog, SLOT(reject()));
+
+        QGroupBox *groupBox = new QGroupBox(tr("Import Key From..."));
+        QRadioButton *radio1 = new QRadioButton(tr("&File"));
+        QRadioButton *radio2 = new QRadioButton(tr("&Editor"));
+        QRadioButton *radio3 = new QRadioButton(tr("&Clipboard"));
+        radio1->setChecked(true);
+
+        QVBoxLayout *vbox1 = new QVBoxLayout();
+        vbox1->addWidget(radio1);
+        vbox1->addWidget(radio2);
+        vbox1->addWidget(radio3);
+
+        groupBox->setLayout(vbox1);
+
+        QVBoxLayout *vbox2 = new QVBoxLayout();
+        vbox2->addWidget(groupBox);
+        vbox2->addWidget(buttonBox);
+
+        dialog->setLayout(vbox2);
+
+        if(dialog->exec() == QDialog::Accepted ) {
+            if (radio1->isChecked()) importKeyFromFile();
+            if (radio2->isChecked()) importKeyFromEdit();
+            if (radio3->isChecked()) importKeyFromClipboard();
+        }
+
+}
+
+/**
+ * Delete a selected (not checked!) Key(s) from keylist
+ */
+void GpgWin::deleteSelectedKeys()
+{
+    myCtx->deleteKeys(m_keyList->getSelected());
+    m_keyList->refresh();
 }