diff options
| -rwxr-xr-x | fileencryptiondialog.cpp | 20 | ||||
| -rw-r--r-- | release/ts/gpg4usb_de.qm | bin | 11891 -> 11979 bytes | |||
| -rw-r--r-- | release/ts/gpg4usb_de.ts | 37 | ||||
| -rw-r--r-- | release/ts/gpg4usb_en.ts | 37 |
4 files changed, 58 insertions, 36 deletions
diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp index b020592..2951947 100755 --- a/fileencryptiondialog.cpp +++ b/fileencryptiondialog.cpp @@ -102,8 +102,15 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath void FileEncryptionDialog::selectInputFile() { - QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", tr("Files") + "All Files (*)"); - inputFileEdit->insert(infileName); + QString path=""; + if(inputFileEdit->text().size() > 0) { + path=QFileInfo(inputFileEdit->text()).absolutePath(); + } + + QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + "All Files (*)"); + inputFileEdit->setText(infileName); + + // try to find a matching output-filename, if not yet done if(infileName > 0 && outputFileEdit->text().size()==0) { if(radioEnc->isChecked()) { outputFileEdit->setText(infileName+".asc"); @@ -121,8 +128,13 @@ void FileEncryptionDialog::selectInputFile() void FileEncryptionDialog::selectOutputFile() { - QString outfileName = QFileDialog::getSaveFileName(this); - outputFileEdit->insert(outfileName); + QString path=""; + if(outputFileEdit->text().size() > 0) { + path=QFileInfo(outputFileEdit->text()).absolutePath(); + } + + QString outfileName = QFileDialog::getSaveFileName(this, tr("Save File"), path); + outputFileEdit->setText(outfileName); } void FileEncryptionDialog::executeAction() diff --git a/release/ts/gpg4usb_de.qm b/release/ts/gpg4usb_de.qm Binary files differindex fc55089..3a4c159 100644 --- a/release/ts/gpg4usb_de.qm +++ b/release/ts/gpg4usb_de.qm diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts index d6ac2fa..4b675dd 100644 --- a/release/ts/gpg4usb_de.ts +++ b/release/ts/gpg4usb_de.ts @@ -44,64 +44,69 @@ <context> <name>FileEncryptionDialog</name> <message> - <location filename="../../fileencryptiondialog.cpp" line="21"/> + <location filename="../../fileencryptiondialog.cpp" line="41"/> <source>Encrypt / Decrypt File</source> <translation>Datei Ver/Entschlüsseln</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="29"/> - <location filename="../../fileencryptiondialog.cpp" line="118"/> + <location filename="../../fileencryptiondialog.cpp" line="49"/> + <location filename="../../fileencryptiondialog.cpp" line="163"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="30"/> + <location filename="../../fileencryptiondialog.cpp" line="50"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="34"/> - <location filename="../../fileencryptiondialog.cpp" line="40"/> + <location filename="../../fileencryptiondialog.cpp" line="54"/> + <location filename="../../fileencryptiondialog.cpp" line="60"/> <source>...</source> <translation></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="36"/> + <location filename="../../fileencryptiondialog.cpp" line="56"/> <source>Input</source> <translation>Eingabedatei</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="42"/> + <location filename="../../fileencryptiondialog.cpp" line="62"/> <source>Output</source> <translation>Ausgabedatei</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="60"/> + <location filename="../../fileencryptiondialog.cpp" line="80"/> <source>&Encrypt</source> <translation>&Verschlüsseln</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="62"/> + <location filename="../../fileencryptiondialog.cpp" line="82"/> <source>&Decrypt</source> <translation>&Entschlüsseln</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="85"/> + <location filename="../../fileencryptiondialog.cpp" line="110"/> <source>Open File</source> <translation>Datei Öffnen</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="85"/> + <location filename="../../fileencryptiondialog.cpp" line="110"/> <source>Files</source> <translation>Dateien</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="101"/> + <location filename="../../fileencryptiondialog.cpp" line="136"/> + <source>Save File</source> + <translation>Datei Speichern</translation> + </message> + <message> + <location filename="../../fileencryptiondialog.cpp" line="146"/> <source>couldn't open file: </source> <translation>Konnte Datei nicht öffnen:</translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="119"/> + <location filename="../../fileencryptiondialog.cpp" line="164"/> <source>Cannot write file %1: %2.</source> <translation>Kann Datei nicht lesen %1: %2.</translation> @@ -742,12 +747,12 @@ Schwach -> Stark</translation> <translation>Passwort und Wiederholung stimmen nicht überein.</translation> </message> <message> - <location filename="../../keymgmt.cpp" line="320"/> + <location filename="../../keymgmt.cpp" line="322"/> <source>Generating Key...</source> <translation>Erzeuge Schlüssel</translation> </message> <message> - <location filename="../../keymgmt.cpp" line="322"/> + <location filename="../../keymgmt.cpp" line="324"/> <source>Collecting random data for key generation. This may take a while. To speed up the process use your computer diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts index 2c3cdd3..3800d9e 100644 --- a/release/ts/gpg4usb_en.ts +++ b/release/ts/gpg4usb_en.ts @@ -4,64 +4,69 @@ <context> <name>FileEncryptionDialog</name> <message> - <location filename="../../fileencryptiondialog.cpp" line="21"/> + <location filename="../../fileencryptiondialog.cpp" line="41"/> <source>Encrypt / Decrypt File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="29"/> - <location filename="../../fileencryptiondialog.cpp" line="118"/> + <location filename="../../fileencryptiondialog.cpp" line="49"/> + <location filename="../../fileencryptiondialog.cpp" line="163"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="30"/> + <location filename="../../fileencryptiondialog.cpp" line="50"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="34"/> - <location filename="../../fileencryptiondialog.cpp" line="40"/> + <location filename="../../fileencryptiondialog.cpp" line="54"/> + <location filename="../../fileencryptiondialog.cpp" line="60"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="36"/> + <location filename="../../fileencryptiondialog.cpp" line="56"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="42"/> + <location filename="../../fileencryptiondialog.cpp" line="62"/> <source>Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="60"/> + <location filename="../../fileencryptiondialog.cpp" line="80"/> <source>&Encrypt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="62"/> + <location filename="../../fileencryptiondialog.cpp" line="82"/> <source>&Decrypt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="85"/> + <location filename="../../fileencryptiondialog.cpp" line="110"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="85"/> + <location filename="../../fileencryptiondialog.cpp" line="110"/> <source>Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="101"/> + <location filename="../../fileencryptiondialog.cpp" line="136"/> + <source>Save File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileencryptiondialog.cpp" line="146"/> <source>couldn't open file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../fileencryptiondialog.cpp" line="119"/> + <location filename="../../fileencryptiondialog.cpp" line="164"/> <source>Cannot write file %1: %2.</source> <translation type="unfinished"></translation> @@ -637,12 +642,12 @@ Weak -> Strong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../keymgmt.cpp" line="320"/> + <location filename="../../keymgmt.cpp" line="322"/> <source>Generating Key...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../keymgmt.cpp" line="322"/> + <location filename="../../keymgmt.cpp" line="324"/> <source>Collecting random data for key generation. This may take a while. To speed up the process use your computer |