reviewed strings in settingsdialog

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

3 files changed, 17 insertions, 12 deletions

diff --git a/TODO b/TODO
index 62d8e1c..6e07d99 100644
--- a/TODO
+++ b/TODO
@@ -25,7 +25,10 @@ attachments:
 		- decrypting
 		- encrypting
 	- status-tip "saved file" when saving file for "open with"
-- reorganise settings-dialog, have different tabs for simple, advanced and experimantal options
+- Settings-Dialog:
+	- reorganise, have different tabs for simple, advanced and experimantal options
+	- questionary mark icon behind some options showing tooltip with further help when
+	  clicked (e.g. for "open attachments")
 - update gpgme-library
 - clean header if quoted printable decoded
 
@@ -46,11 +49,9 @@ Later:
 
 - more internationalisation:
   - menu entry for changing character encoding
-  - configuration framework, for saving language & charencoding preferences
   - hints (on webpage?) which webmailer sends which encoding-header
 
 - Drag and drop capabilities. Especially to encrypt / decrypt text, but would also be nice for files as well as import public and private keys.
-- Password caching options (always, for X minutes, never)
 
 - add a message-box with warning if someone's adding a secret-key to usb-keyring
 - sorting keys would be nice (e.g. a-z or complete manual)
@@ -68,6 +69,5 @@ usability:
 BUGS
 ----
 - key generation on windows 7 64-bit may fail
-- 0.2.3 hangs on windows xp sp3 32bit sometimes
 - on windows an empty directory gnupg in application-data is created, find out how to disable
-
+- cancel decryption on windows hangs programm -> possibly bug in gpgme
diff --git a/attachments.cpp b/attachments.cpp
index 6018608..83238d4 100644
--- a/attachments.cpp
+++ b/attachments.cpp
@@ -146,16 +146,16 @@ void Attachments::openFile() {
     QModelIndexList indexes = tableView->selectionModel()->selection().indexes();
     MimePart mp = table->getMimePart(indexes.at(0).row());
 
-    qDebug() << "mime: " << mp.header.getValue("Content-Type");
+//    qDebug() << "mime: " << mp.header.getValue("Content-Type");
 
     QString filename = mp.header.getParam("Content-Type", "name");
     // TODO: find out why filename is quoted
-    qDebug() << "file: " << filename;
+//    qDebug() << "file: " << filename;
     filename.chop(1);
     filename.remove(0, 1);
     filename.prepend(attachmentDir);
 
-    qDebug() << "file: " << filename;
+  //  qDebug() << "file: " << filename;
     QByteArray outBuffer = QByteArray::fromBase64(mp.body);
 
 
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
index 794a96b..6cd357b 100755
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@@ -127,9 +127,14 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     mimeParseBoxLayout->addWidget(mimeParseCheckBox);
     mimeQPCheckBox = new QCheckBox(tr("Try to recognize quoted printable."), this);
     mimeParseBoxLayout->addWidget(mimeQPCheckBox);
-    mimeOpenAttachmentCheckBox = new QCheckBox(tr("Enable open with external app, saves file in tmp folder."), this);
-    //mimeOpenAttachmentCheckBox->setWhatsThis("Open attachments <b>with</b>... neeeds temp foder..");
-    mimeOpenAttachmentCheckBox->setToolTip("Open attachments with Application for the filetype. <b>Needs saving the file to temporarly folder.</b> For now its your job to clean this folder up if you want. The Benefit of this option is more comfortable filehandling, but you should be aware that this files lay around unencrypted in folder 'attachments'.");
+    mimeOpenAttachmentCheckBox = new QCheckBox(tr("Enable opening with external applications."
+                                                  "\nRead statustip carefully for further information."), this);
+    mimeOpenAttachmentCheckBox->setToolTip(tr("Open attachments with default application for the filetype. "
+                                            "There are at least two possible problems with this behaviour:<br> "
+                                           "1) <b>File needs to be saved unencrypted to attachments folder.</b> "
+                                           "Its your job to clean this folder.<br> "
+                                           "2) The external application may have its own temp files."));
+                                           
     /*
      * Here could be something like Qstring("?"), or an icon with an ?, with the action "show tooltip"
      */
@@ -141,7 +146,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
      *****************************************/
     rememberPasswordBox = new QGroupBox(tr("Remember Password"));
     rememberPasswordBoxLayout = new QHBoxLayout();
-    rememberPasswordCheckBox = new QCheckBox(tr("Remember password till closing gpg4usb"), this);
+    rememberPasswordCheckBox = new QCheckBox(tr("Remember password until closing gpg4usb"), this);
     rememberPasswordBoxLayout->addWidget(rememberPasswordCheckBox);
     rememberPasswordBox->setLayout(rememberPasswordBoxLayout);