aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mainwindow.cpp24
-rw-r--r--mainwindow.h6
2 files changed, 25 insertions, 5 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 64814c4..a4a509a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -312,11 +312,22 @@ void MainWindow::createActions()
importKeyFromEditAct->setToolTip(tr("Import New Key From Editor"));
connect(importKeyFromEditAct, SIGNAL(triggered()), this, SLOT(importKeyFromEdit()));
+ deleteCheckedKeysAct = new QAction(tr("Delete Checked Key(s)"), this);
+ deleteCheckedKeysAct->setToolTip(tr("Delete the Checked keys"));
+ deleteCheckedKeysAct->setIcon(QIcon(":button_cancel.png"));
+ connect(deleteCheckedKeysAct, SIGNAL(triggered()), this, SLOT(deleteCheckedKeys()));
+
openKeyManagementAct = new QAction(tr("Manage &keys"), this);
openKeyManagementAct->setIcon(QIcon(":keymgmt.png"));
openKeyManagementAct->setToolTip(tr("Open Keymanagement"));
connect(openKeyManagementAct, SIGNAL(triggered()), this, SLOT(openKeyManagement()));
+ generateKeyDialogAct = new QAction(tr("Generate Key"), this);
+ generateKeyDialogAct->setToolTip(tr("Generate New Key"));
+ generateKeyDialogAct->setIcon(QIcon(":key_generate.png"));
+ connect(generateKeyDialogAct, SIGNAL(triggered()), this, SLOT(generateKeyDialog()));
+
+
/* About Menu
*/
aboutAct = new QAction(tr("&About"), this);
@@ -359,11 +370,6 @@ void MainWindow::createActions()
deleteSelectedKeysAct->setToolTip(tr("Delete the Selected keys"));
connect(deleteSelectedKeysAct, SIGNAL(triggered()), this, SLOT(deleteSelectedKeys()));
- deleteCheckedKeysAct = new QAction(tr("Delete Checked Key(s)"), this);
- deleteCheckedKeysAct->setToolTip(tr("Delete the Checked keys"));
- deleteCheckedKeysAct->setIcon(QIcon(":button_cancel.png"));
- connect(deleteCheckedKeysAct, SIGNAL(triggered()), this, SLOT(deleteCheckedKeys()));
-
refreshKeysFromKeyserverAct = new QAction(tr("Refresh key from keyserver"), this);
refreshKeysFromKeyserverAct->setToolTip(tr("Refresh key from default keyserver"));
connect(refreshKeysFromKeyserverAct, SIGNAL(triggered()), this, SLOT(refreshKeysFromKeyserver()));
@@ -487,6 +493,8 @@ void MainWindow::createMenus()
keyMenu->addSeparator();
keyMenu->addAction(deleteCheckedKeysAct);
+ keyMenu->addSeparator();
+ keyMenu->addAction(generateKeyDialogAct);
keyMenu->addAction(openKeyManagementAct);
steganoMenu = menuBar()->addMenu(tr("&Steganography"));
@@ -1132,6 +1140,12 @@ void MainWindow::copyMailAddressToClipboard()
cb->setText(mail);
}
+void MainWindow::generateKeyDialog()
+{
+ KeyGenDialog *keyGenDialog = new KeyGenDialog(mCtx,this);
+ keyGenDialog->show();
+}
+
void MainWindow::showKeyDetails()
{
if (mKeyList->getSelected()->isEmpty()) {
diff --git a/mainwindow.h b/mainwindow.h
index 45b2ecf..fe251e1 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -157,6 +157,11 @@ private slots:
void slotKeyDeleted(int retcode);
/**
+ * @details Slot to show generate key dialog
+ */
+ void generateKeyDialog();
+
+ /**
* @details Delete keys, but show a warn dialog before
*/
void deleteKeysWithWarning(QStringList *uidList);
@@ -366,6 +371,7 @@ private:
QAction *cleanDoubleLinebreaksAct; /** Action to remove double line breaks */
QAction *appendSelectedKeysAct; /** Action to append selected keys to edit */
+ QAction *generateKeyDialogAct; /** Action to open key generation dialog */
QAction *copyMailAddressToClipboardAct; /** Action to copy mail to clipboard */
QAction *openKeyManagementAct; /** Action to open key management */
QAction *copyAct; /** Action to copy text */