4 files changed, 18 insertions, 17 deletions

diff --git a/TODO b/TODO
index 1d0a058..da047ed 100644
--- a/TODO
+++ b/TODO
@@ -15,6 +15,7 @@ Release 0.3.2
 - strike out revoked keys in keylist and add warning to keydetails [DONE]
 - put quote and double line break removale to "special edit" operation toolbar (icons for double linebreaks missing) [DONE]
 - emit keydbchanged from GPGcontext::importKey (for the moment not possible, because importinformation is lost after this) [DONE]
+- fix translation file for "SettingsDialog" as it says two times English, and the comment is on the wrong one. [DONE]
 - Change "remove double line breaks" to "remove spacing" [DONE]
 	- icon from "line spacing icon" [DONE]
 - key import should be more verbose: [DONE]
@@ -24,29 +25,27 @@ Release 0.3.2
 	- BUG: Also show details, when key is really new [DONE]
 - Wizard on first start (Create Key, Import from keys older gpg4usb, import from gnupg) [DONE]
 	-  import conf from old gpg4usb
-	- remember GNUPGHOME in main.cpp
 - option in settingsdialog for enabling steganographic operations [DONE]
 	- minimal steganography option: remove or add pgp-headers on demand [DONE]
 	-  Add advanced tab to settings dialog [DONE]
-	- investigate in embedding a steganography tool 
-		http://steghide.sourceforge.net/
-		http://www.outguess.org/
-- update gpgme-library
 - investigate in adding a offline help system [DONE]
-	- have a look on the format
-- show message, when key export is successful (statusbar)
-- encrypt and sign, decrypt and verify (?)
+	- have a look at the format
 - Add buttonto copy fingerprint to clipboard in details dialog 
 	- or set margin to make it easier selectable (via css?) ?
 	- remove whitespaces on copy
-- fix translation file for "SettingsDialog" as it says two times English, and the comment is on the wrong one.
 - should images be included in paragraph (?)
-
+	
 BUGS:
 - import key toolbar dropdown shows text, even if only icon should be shown
 - investigate special characters in passphrase in windows
 
 Release 0.3.3
+- encrypt and sign, decrypt and verify (?)
+- discuss: show message, when key export is successful (statusbar)
+- update gpgme-library
+- investigate in embedding a steganography tool 
+	http://steghide.sourceforge.net/
+	http://www.outguess.org/
 - Add default key functionality 
 - create revocation file on key generation
 - optionally open new tab after encryption/decrytion 
diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp
index 82ce6a2..69ea7c9 100755
--- a/fileencryptiondialog.cpp
+++ b/fileencryptiondialog.cpp
@@ -25,10 +25,11 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QString iconP
         : QDialog(parent)
 
 {
+    mAction = action;
     mCtx = ctx;
-    if(action == Decrypt) {
+    if(mAction == Decrypt) {
         setWindowTitle(tr("Decrypt File"));
-    } else if (action == Encrypt) {
+    } else if (mAction == Encrypt) {
         setWindowTitle(tr("Encrypt File"));
         resize(500, 300);
     } else {
@@ -118,7 +119,7 @@ void FileEncryptionDialog::selectInputFile()
 
     // try to find a matching output-filename, if not yet done
     if (infileName > 0 && outputFileEdit->text().size() == 0) {
-        if (radioEnc->isChecked()) {
+        if (mAction == Encrypt || (mAction == Both && radioEnc->isChecked())) {
             outputFileEdit->setText(infileName + ".asc");
         } else {
             if (infileName.endsWith(".asc", Qt::CaseInsensitive)) {
@@ -156,11 +157,12 @@ void FileEncryptionDialog::executeAction()
     QByteArray inBuffer = infile.readAll();
     QByteArray *outBuffer = new QByteArray();
 
-    if (radioEnc->isChecked()) {
+
+    if ( mAction == Encrypt || (mAction == Both && radioEnc->isChecked())) {
         if (! mCtx->encrypt(mKeyList->getChecked(), inBuffer, outBuffer)) return;
     }
 
-    if (radioDec->isChecked()) {
+    if (mAction == Decrypt || (mAction == Both && radioDec->isChecked()))  {
         if (! mCtx->decrypt(inBuffer, outBuffer)) return;
     }
 
diff --git a/fileencryptiondialog.h b/fileencryptiondialog.h
index 75af285..9150401 100755
--- a/fileencryptiondialog.h
+++ b/fileencryptiondialog.h
@@ -104,7 +104,7 @@ private:
     QLineEdit *inputFileEdit; /**< TODO */
     QRadioButton *radioEnc; /**< TODO */
     QRadioButton *radioDec; /**< TODO */
-
+    DialogAction mAction; /**< TODO */
 protected:
     GpgME::GpgContext *mCtx; /**< TODO */
     KeyList *mKeyList; /**< TODO */
diff --git a/main.cpp b/main.cpp
index 1c9b4b7..cde3577 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
         unsetenv("GPG_AGENT_INFO");
     #endif
 
-        qDebug() << getenv("GNUPGHOME");
+//        qDebug() << getenv("GNUPGHOME");
 
 #ifndef GPG4USB_NON_PORTABLE
     // take care of gpg not creating directorys on harddisk