recommit of a3cba1ba9996400acc43d133f8941fef84dd323f (add gui elements for sign&verify of files, remove not used fileEncryptAndDecrypt actions from mainwindow)

4 files changed, 56 insertions, 33 deletions

diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp
index 2e3a844..b5f5899 100755
--- a/fileencryptiondialog.cpp
+++ b/fileencryptiondialog.cpp
@@ -27,11 +27,16 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
 {
     mAction = action;
     mCtx = ctx;
-    if(mAction == Decrypt) {
+    if (mAction == Decrypt) {
         setWindowTitle(tr("Decrypt File"));
     } else if (mAction == Encrypt) {
         setWindowTitle(tr("Encrypt File"));
         resize(500, 300);
+    } else if (mAction == Sign) {
+        setWindowTitle(tr("Sign File"));
+        resize(500, 300);
+    } else if (mAction == Verify) {
+        setWindowTitle(tr("Verify File"));
     } else {
         setWindowTitle(tr("Encrypt / Decrypt File"));
         resize(500, 200);
@@ -89,7 +94,7 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
     actionGroupBox->setLayout(hbox1);
 
     QVBoxLayout *vbox2 = new QVBoxLayout();
-    if(action == Both) {
+    if(action == EncryptAndDecrypt) {
         vbox2->addWidget(actionGroupBox);
     }
     vbox2->addWidget(groupBox1);
@@ -98,7 +103,7 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
     vbox2->addStretch(0);
     setLayout(vbox2);
 
-    if(action == Encrypt) {
+    if(action == Encrypt || action == Sign) {
         slotShowKeyList();
     }
 
@@ -118,7 +123,7 @@ void FileEncryptionDialog::slotSelectInputFile()
 
     // try to find a matching output-filename, if not yet done
     if (infileName > 0 && outputFileEdit->text().size() == 0) {
-        if (mAction == Encrypt || (mAction == Both && radioEnc->isChecked())) {
+        if (mAction == Encrypt || (mAction == EncryptAndDecrypt && radioEnc->isChecked())) {
             outputFileEdit->setText(infileName + ".asc");
         } else {
             if (infileName.endsWith(".asc", Qt::CaseInsensitive)) {
@@ -156,11 +161,11 @@ void FileEncryptionDialog::slotExecuteAction()
     QByteArray inBuffer = infile.readAll();
     QByteArray *outBuffer = new QByteArray();
     infile.close();
-    if ( mAction == Encrypt || (mAction == Both && radioEnc->isChecked())) {
+    if ( mAction == Encrypt || (mAction == EncryptAndDecrypt && radioEnc->isChecked())) {
         if (! mCtx->encrypt(mKeyList->getChecked(), inBuffer, outBuffer)) return;
     }
 
-    if (mAction == Decrypt || (mAction == Both && radioDec->isChecked()))  {
+    if (mAction == Decrypt || (mAction == EncryptAndDecrypt && radioDec->isChecked()))  {
         if (! mCtx->decrypt(inBuffer, outBuffer)) return;
     }
 
diff --git a/fileencryptiondialog.h b/fileencryptiondialog.h
index dfe97ee..a7f9ed0 100755
--- a/fileencryptiondialog.h
+++ b/fileencryptiondialog.h
@@ -53,7 +53,9 @@ public:
     enum DialogAction {
         Encrypt,
         Decrypt,
-        Both
+        EncryptAndDecrypt,
+        Sign,
+        Verify
     };
 
     /**
@@ -64,8 +66,7 @@ public:
      * @param keyList
      * @param parent
      */
-    FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList keyList, QWidget *parent = 0, DialogAction action = Both);
-
+    FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList keyList, QWidget *parent = 0, DialogAction action = EncryptAndDecrypt);
 public slots:
     /**
      * @details
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e7c2cb7..119aee1 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -281,24 +281,26 @@ void MainWindow::createActions()
     decryptAct->setToolTip(tr("Decrypt Message"));
     connect(decryptAct, SIGNAL(triggered()), this, SLOT(slotDecrypt()));
 
-    fileEncryptionAct = new QAction(tr("&File Encryption"), this);
-    fileEncryptionAct->setIcon(QIcon(":fileencrytion.png"));
-    fileEncryptionAct->setToolTip(tr("Encrypt/Decrypt File"));
-    connect(fileEncryptionAct, SIGNAL(triggered()), this, SLOT(slotFileEncryption()));
-
     /*
      * File encryption submenu
      */
     fileEncryptAct = new QAction(tr("&Encrypt File"), this);
-    //fileEncryptAct->setIcon(QIcon(":fileencrytion.png"));
     fileEncryptAct->setToolTip(tr("Encrypt File"));
     connect(fileEncryptAct, SIGNAL(triggered()), this, SLOT(slotFileEncrypt()));
 
     fileDecryptAct = new QAction(tr("&Decrypt File"), this);
-    //fileDecryptAct->setIcon(QIcon(":fileencrytion.png"));
     fileDecryptAct->setToolTip(tr("Decrypt File"));
     connect(fileDecryptAct, SIGNAL(triggered()), this, SLOT(slotFileDecrypt()));
 
+    fileSignAct = new QAction(tr("&Sign File"), this);
+    fileSignAct->setToolTip(tr("Sign File"));
+    connect(fileSignAct, SIGNAL(triggered()), this, SLOT(slotFileSign()));
+
+    fileVerifyAct = new QAction(tr("&Verify File"), this);
+    fileVerifyAct->setToolTip(tr("Verify File"));
+    connect(fileVerifyAct, SIGNAL(triggered()), this, SLOT(slotFileVerify()));
+
+
     signAct = new QAction(tr("&Sign"), this);
     signAct->setIcon(QIcon(":signature.png"));
     signAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
@@ -457,6 +459,12 @@ void MainWindow::createMenus()
     editMenu->addSeparator();
     editMenu->addAction(openSettingsAct);
 
+    fileEncMenu = new QMenu(tr("&File..."));
+    fileEncMenu->addAction(fileEncryptAct);
+    fileEncMenu->addAction(fileDecryptAct);
+    fileEncMenu->addAction(fileSignAct);
+    fileEncMenu->addAction(fileVerifyAct);
+
     cryptMenu = menuBar()->addMenu(tr("&Crypt"));
     cryptMenu->addAction(encryptAct);
     cryptMenu->addAction(decryptAct);
@@ -464,8 +472,7 @@ void MainWindow::createMenus()
     cryptMenu->addAction(signAct);
     cryptMenu->addAction(verifyAct);
     cryptMenu->addSeparator();
-    cryptMenu->addAction(fileEncryptAct);
-    cryptMenu->addAction(fileDecryptAct);
+    cryptMenu->addMenu(fileEncMenu);
 
     keyMenu = menuBar()->addMenu(tr("&Keys"));
     importKeyMenu = keyMenu->addMenu(tr("&Import Key From..."));
@@ -547,9 +554,6 @@ void MainWindow::createToolBars()
 
     // Add dropdown menu for file encryption/decryption to crypttoolbar
     fileEncButton = new QToolButton();
-    QMenu* fileEncMenu = new QMenu();
-    fileEncMenu->addAction(fileEncryptAct);
-    fileEncMenu->addAction(fileDecryptAct);
     fileEncButton->setMenu(fileEncMenu);
     fileEncButton->setPopupMode(QToolButton::InstantPopup);
     fileEncButton->setIcon(QIcon(":fileencryption.png"));
@@ -908,27 +912,33 @@ void MainWindow::uploadKeyToServer()
     mKeyList->uploadKeyToServer(keyArray);
 }
 
-void MainWindow::slotFileEncryption()
+void MainWindow::slotFileEncrypt()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this);
+        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Encrypt);
 }
 
-void MainWindow::slotFileEncrypt()
+void MainWindow::slotFileDecrypt()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Encrypt);
+        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Decrypt);
 }
 
-void MainWindow::slotFileDecrypt()
+void MainWindow::slotFileSign()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Decrypt);
+        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Sign);
 }
 
+void MainWindow::slotFileVerify()
+{
+        QStringList *keyList;
+        keyList = mKeyList->getChecked();
+        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Verify);
+}
 void MainWindow::slotOpenSettingsDialog()
 {
 
diff --git a/mainwindow.h b/mainwindow.h
index 2d1c043..9ee1b63 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -158,11 +158,6 @@ private slots:
     void slotAbout();
 
     /**
-     * @details Open fileencrytion dialog.
-     */
-    void slotFileEncryption();
-
-    /**
      * @details Open dialog for encrypting file.
      */
     void slotFileEncrypt();
@@ -173,6 +168,16 @@ private slots:
     void slotFileDecrypt();
 
     /**
+     * @details Open dialog for signing file.
+     */
+    void slotFileSign();
+
+    /**
+     * @details Open dialog for verifying file.
+     */
+    void slotFileVerify();
+
+    /**
      * @details Open settings-dialog.
      */
     void slotOpenSettingsDialog();
@@ -293,6 +298,7 @@ private:
     QMenu *fileMenu; /** Submenu for file-operations*/
     QMenu *editMenu; /** Submenu for text-operations*/
     QMenu *cryptMenu; /** Submenu for crypt-operations */
+    QMenu *fileEncMenu; /** Submenu for file crypt operations */
     QMenu *helpMenu; /** Submenu for help-operations */
     QMenu *keyMenu; /** Submenu for key-operations */
     QMenu *viewMenu; /** Submenu for view operations */
@@ -339,9 +345,10 @@ private:
     QAction *zoomInAct; /** Action to zoom in */
     QAction *zoomOutAct; /** Action to zoom out */
     QAction *aboutAct; /** Action to open about dialog */
-    QAction *fileEncryptionAct; /** Action to open file-encryption dialog */
     QAction *fileEncryptAct; /** Action to open dialog for encrypting file */
     QAction *fileDecryptAct; /** Action to open dialog for decrypting file */
+    QAction *fileSignAct; /** Action to open dialog for signing file */
+    QAction *fileVerifyAct; /** Action to open dialog for verifying file */
     QAction *openSettingsAct; /** Action to open settings dialog */
     QAction *openTranslateAct; /** Action to open translate doc*/
     QAction *openTutorialAct; /** Action to open tutorial */