recommit of a772d1426463d5f4913b5252530b81d1d2cca7dd (remove obsolete EncryptAndDecrypt logic from filemenu)

3 files changed, 12 insertions, 35 deletions

diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp
index b5f5899..787217d 100755
--- a/fileencryptiondialog.cpp
+++ b/fileencryptiondialog.cpp
@@ -21,8 +21,8 @@
 
 #include "fileencryptiondialog.h"
 
-FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList keyList, QWidget *parent, DialogAction action)
-        : QDialog(parent)
+FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList keyList, DialogAction action, QWidget *parent)
+    : QDialog(parent)
 
 {
     mAction = action;
@@ -37,9 +37,6 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
         resize(500, 300);
     } else if (mAction == Verify) {
         setWindowTitle(tr("Verify File"));
-    } else {
-        setWindowTitle(tr("Encrypt / Decrypt File"));
-        resize(500, 200);
     }
 
     setModal(true);
@@ -49,7 +46,6 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
     QGroupBox *groupBox1 = new QGroupBox(tr("File"));
-    QGroupBox *actionGroupBox = new QGroupBox(tr("Action"));
 
     /* Setup input & Outputfileselection*/
     inputFileEdit = new QLineEdit();
@@ -71,6 +67,7 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
     gLayout->addWidget(fl2, 1, 0);
     gLayout->addWidget(outputFileEdit, 1, 1);
     gLayout->addWidget(fb2, 1, 2);
+    groupBox1->setLayout(gLayout);
 
     /*Setup KeyList*/
     mKeyList = new KeyList(mCtx);
@@ -79,24 +76,7 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
     mKeyList->setColumnWidth(3, 150);
     mKeyList->setChecked(&keyList);
 
-    /* Setup Action */
-    radioEnc = new QRadioButton(tr("&Encrypt"));
-    connect(radioEnc, SIGNAL(clicked()), this, SLOT(slotShowKeyList()));
-    radioDec = new QRadioButton(tr("&Decrypt"));
-    connect(radioDec, SIGNAL(clicked()), this, SLOT(slotHideKeyList()));
-    radioDec->setChecked(true);
-
-    QHBoxLayout *hbox1 = new QHBoxLayout();
-    hbox1->addWidget(radioDec);
-    hbox1->addWidget(radioEnc);
-
-    groupBox1->setLayout(gLayout);
-    actionGroupBox->setLayout(hbox1);
-
     QVBoxLayout *vbox2 = new QVBoxLayout();
-    if(action == EncryptAndDecrypt) {
-        vbox2->addWidget(actionGroupBox);
-    }
     vbox2->addWidget(groupBox1);
     vbox2->addWidget(mKeyList);
     vbox2->addWidget(buttonBox);
@@ -123,7 +103,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 == EncryptAndDecrypt && radioEnc->isChecked())) {
+        if (mAction == Encrypt) {
             outputFileEdit->setText(infileName + ".asc");
         } else {
             if (infileName.endsWith(".asc", Qt::CaseInsensitive)) {
@@ -161,11 +141,11 @@ void FileEncryptionDialog::slotExecuteAction()
     QByteArray inBuffer = infile.readAll();
     QByteArray *outBuffer = new QByteArray();
     infile.close();
-    if ( mAction == Encrypt || (mAction == EncryptAndDecrypt && radioEnc->isChecked())) {
+    if ( mAction == Encrypt ) {
         if (! mCtx->encrypt(mKeyList->getChecked(), inBuffer, outBuffer)) return;
     }
 
-    if (mAction == Decrypt || (mAction == EncryptAndDecrypt && radioDec->isChecked()))  {
+    if ( mAction == Decrypt )  {
         if (! mCtx->decrypt(inBuffer, outBuffer)) return;
     }
 
diff --git a/fileencryptiondialog.h b/fileencryptiondialog.h
index a7f9ed0..f634743 100755
--- a/fileencryptiondialog.h
+++ b/fileencryptiondialog.h
@@ -36,7 +36,6 @@ class QHBoxLayout;
 class QVBoxLayout;
 class QDebug;
 class QFileDialog;
-class QRadioButton;
 QT_END_NAMESPACE
 
 /**
@@ -53,7 +52,6 @@ public:
     enum DialogAction {
         Encrypt,
         Decrypt,
-        EncryptAndDecrypt,
         Sign,
         Verify
     };
@@ -66,7 +64,7 @@ public:
      * @param keyList
      * @param parent
      */
-    FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList keyList, QWidget *parent = 0, DialogAction action = EncryptAndDecrypt);
+    FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList keyList,  DialogAction action, QWidget *parent = 0);
 public slots:
     /**
      * @details
@@ -102,8 +100,6 @@ public slots:
 private:
     QLineEdit *outputFileEdit; /**< TODO */
     QLineEdit *inputFileEdit; /**< TODO */
-    QRadioButton *radioEnc; /**< TODO */
-    QRadioButton *radioDec; /**< TODO */
     DialogAction mAction; /**< TODO */
 protected:
     GpgME::GpgContext *mCtx; /**< TODO */
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 119aee1..1a698ea 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -916,29 +916,30 @@ void MainWindow::slotFileEncrypt()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Encrypt);
+        new FileEncryptionDialog(mCtx, *keyList, FileEncryptionDialog::Encrypt, this);
 }
 
 void MainWindow::slotFileDecrypt()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Decrypt);
+        new FileEncryptionDialog(mCtx, *keyList, FileEncryptionDialog::Decrypt, this);
 }
 
 void MainWindow::slotFileSign()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Sign);
+        new FileEncryptionDialog(mCtx, *keyList, FileEncryptionDialog::Sign, this);
 }
 
 void MainWindow::slotFileVerify()
 {
         QStringList *keyList;
         keyList = mKeyList->getChecked();
-        new FileEncryptionDialog(mCtx, *keyList, this, FileEncryptionDialog::Verify);
+        new FileEncryptionDialog(mCtx, *keyList, FileEncryptionDialog::Verify, this);
 }
+
 void MainWindow::slotOpenSettingsDialog()
 {