file encryption dialog configurable for encrypt / decrypt / both. popup menu for file encrypt or decrypt in toolbar now

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

1 files changed, 51 insertions, 9 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8e6a3a6..7ec6626 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -267,6 +267,19 @@ void MainWindow::createActions()
     fileEncryptionAct->setToolTip(tr("Encrypt/Decrypt File"));
     connect(fileEncryptionAct, SIGNAL(triggered()), this, SLOT(fileEncryption()));
 
+    /*
+     * File encryption submenu
+     */
+    fileEncryptAct = new QAction(tr("&Encrypt"), this);
+    //fileEncryptAct->setIcon(QIcon(iconPath + "fileencrytion.png"));
+    fileEncryptAct->setToolTip(tr("Encrypt File"));
+    connect(fileEncryptAct, SIGNAL(triggered()), this, SLOT(fileEncrypt()));
+
+    fileDecryptAct = new QAction(tr("&Decrypt"), this);
+    //fileDecryptAct->setIcon(QIcon(iconPath + "fileencrytion.png"));
+    fileDecryptAct->setToolTip(tr("Decrypt File"));
+    connect(fileDecryptAct, SIGNAL(triggered()), this, SLOT(fileDecrypt()));
+
     signAct = new QAction(tr("&Sign"), this);
     signAct->setIcon(QIcon(iconPath + "signature.png"));
     signAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
@@ -410,7 +423,7 @@ void MainWindow::createToolBars()
     cryptToolBar->addAction(decryptAct);
     cryptToolBar->addAction(signAct);
     cryptToolBar->addAction(verifyAct);
-    cryptToolBar->addAction(fileEncryptionAct);
+    //cryptToolBar->addAction(fileEncryptionAct);
     viewMenu->addAction(cryptToolBar->toggleViewAction());
 
     keyToolBar = addToolBar(tr("Key"));
@@ -432,14 +445,29 @@ void MainWindow::createToolBars()
     viewMenu->addAction(specialEditToolBar->toggleViewAction());
 
     // Add dropdown menu for key import to keytoolbar
-    QToolButton* toolButton = new QToolButton();
-    toolButton->setMenu(importKeyMenu);
-    toolButton->setPopupMode(QToolButton::InstantPopup);
-    toolButton->setIcon(QIcon(iconPath + "key_import.png"));
-    toolButton->setToolTip("Import key");
-    toolButton->setText("Import key from..");
-    toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    keyToolBar->addWidget(toolButton);
+    QToolButton* importButton = new QToolButton();
+    importButton->setMenu(importKeyMenu);
+    importButton->setPopupMode(QToolButton::InstantPopup);
+    importButton->setIcon(QIcon(iconPath + "key_import.png"));
+    importButton->setToolTip("Import key");
+    importButton->setText("Import key from..");
+    importButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    keyToolBar->addWidget(importButton);
+
+    // Add dropdown menu for file encryption/decryption to crypttoolbar
+    QToolButton* fileEncButton = new QToolButton();
+    QMenu* fileEncMenu = new QMenu();
+    fileEncMenu->addAction(fileEncryptAct);
+    fileEncMenu->addAction(fileDecryptAct);
+    fileEncButton->setMenu(fileEncMenu);
+    fileEncButton->setPopupMode(QToolButton::InstantPopup);
+    fileEncButton->setIcon(QIcon(iconPath + "fileencrytion.png"));
+    fileEncButton->setToolTip("Encrypt or decrypt File");
+    fileEncButton->setText("File...");
+    fileEncButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+
+    cryptToolBar->addWidget(fileEncButton);
+
 }
 
 void MainWindow::createStatusBar()
@@ -787,6 +815,20 @@ void MainWindow::fileEncryption()
         new FileEncryptionDialog(mCtx, iconPath, *keyList, this);
 }
 
+void MainWindow::fileEncrypt()
+{
+        QStringList *keyList;
+        keyList = mKeyList->getChecked();
+        new FileEncryptionDialog(mCtx, iconPath, *keyList, this, FileEncryptionDialog::Encrypt);
+}
+
+void MainWindow::fileDecrypt()
+{
+        QStringList *keyList;
+        keyList = mKeyList->getChecked();
+        new FileEncryptionDialog(mCtx, iconPath, *keyList, this, FileEncryptionDialog::Decrypt);
+}
+
 void MainWindow::openSettingsDialog()
 {
     new SettingsDialog(this);