From 0f0d03f2c357ac2f9eedd53d959a19b5de9805cb Mon Sep 17 00:00:00 2001 From: nils Date: Wed, 14 Apr 2010 16:39:42 +0000 Subject: focus is kept on main window when closing settingsdialog, filecrypt. Added some ifndefs git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@302 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- fileencryptiondialog.cpp | 7 +- fileencryptiondialog.h | 6 +- gpgwin.cpp | 6 +- gpgwin.h | 5 ++ keygenthread.h | 4 + release/ts/gpg4usb_de.qm | Bin 17470 -> 17538 bytes release/ts/gpg4usb_de.ts | 71 +++++++++--------- release/ts/gpg4usb_en.ts | 73 +++++++++---------- release/ts/gpg4usb_fr.ts | 69 +++++++++--------- release/ts/gpg4usb_pt.qm | Bin 15538 -> 17108 bytes release/ts/gpg4usb_pt.ts | 186 ++++++++++++++++++++++++----------------------- release/ts/gpg4usb_ru.ts | 69 +++++++++--------- settingsdialog.cpp | 3 +- settingsdialog.h | 6 +- 14 files changed, 268 insertions(+), 237 deletions(-) diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp index aee52bb..b7b009d 100755 --- a/fileencryptiondialog.cpp +++ b/fileencryptiondialog.cpp @@ -34,7 +34,9 @@ #include "fileencryptiondialog.h" -FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath) +FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath, QWidget *parent) + : QDialog(parent) + { mCtx = ctx; @@ -107,7 +109,8 @@ void FileEncryptionDialog::selectInputFile() path=QFileInfo(inputFileEdit->text()).absolutePath(); } - QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + tr("All Files (*)")); +// QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + tr("All Files (*)")); + QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path); inputFileEdit->setText(infileName); // try to find a matching output-filename, if not yet done diff --git a/fileencryptiondialog.h b/fileencryptiondialog.h index 2e9234a..44ad9de 100755 --- a/fileencryptiondialog.h +++ b/fileencryptiondialog.h @@ -19,6 +19,9 @@ * MA 02110-1301, USA. */ +#ifndef __FILEENCRYPTIONDIALOG_H__ +#define __FILEENCRYPTIONDIALOG_H__ + #include #include #include @@ -31,7 +34,7 @@ class FileEncryptionDialog : public QDialog Q_OBJECT public: - FileEncryptionDialog(GpgME::Context *ctx, QString iconPath); + FileEncryptionDialog(GpgME::Context *ctx, QString iconPath, QWidget *parent = 0); public slots: void selectInputFile(); @@ -51,3 +54,4 @@ protected: KeyList *mKeyList; }; +#endif // __FILEENCRYPTIONDIALOG_H__ diff --git a/gpgwin.cpp b/gpgwin.cpp index 8f43d0b..db1448d 100644 --- a/gpgwin.cpp +++ b/gpgwin.cpp @@ -494,7 +494,7 @@ void GpgWin::importKeyFromFile() QFile file; QByteArray inBuffer; - QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;All Files (*)"); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;"+tr("All Files")+" (*)"); if (! fileName.isNull()) { file.setFileName(fileName); if (!file.open(QIODevice::ReadOnly)) { @@ -570,13 +570,13 @@ void GpgWin::appendSelectedKeys() void GpgWin::fileEncryption() { - new FileEncryptionDialog(mCtx, iconPath); + new FileEncryptionDialog(mCtx, iconPath, this); } void GpgWin::openSettingsDialog() { QSettings settings; - new SettingsDialog(); + new SettingsDialog(this); // restoreSettings(); // Iconsize QSize iconSize = settings.value("toolbar/iconsize", QSize(32, 32)).toSize(); diff --git a/gpgwin.h b/gpgwin.h index 180a87b..d776907 100644 --- a/gpgwin.h +++ b/gpgwin.h @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ + +#ifndef __GPGWIN_H__ +#define __GPGWIN_H__ + #include "context.h" #include "keylist.h" #include "attachments.h" @@ -146,3 +150,4 @@ private: KeyMgmt *keyMgmt; }; +#endif // __GPGWIN_H__ diff --git a/keygenthread.h b/keygenthread.h index ed69785..e811301 100644 --- a/keygenthread.h +++ b/keygenthread.h @@ -19,6 +19,9 @@ * MA 02110-1301, USA. */ +#ifndef __KEYGENTHREAD_H__ +#define __KEYGENTHREAD_H__ + #include #include #include @@ -49,3 +52,4 @@ protected: void run(); }; +#endif // __KEYGENTHREAD_H__ diff --git a/release/ts/gpg4usb_de.qm b/release/ts/gpg4usb_de.qm index f64b602..a5c8c7a 100644 Binary files a/release/ts/gpg4usb_de.qm and b/release/ts/gpg4usb_de.qm differ diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts index 9eda968..777ce37 100644 --- a/release/ts/gpg4usb_de.ts +++ b/release/ts/gpg4usb_de.ts @@ -4,73 +4,71 @@ FileEncryptionDialog - + Encrypt / Decrypt File Datei Ver/Entschlüsseln - - + + File Datei - + Action Aktion - + ... - + Input Eingabedatei - + Output Ausgabedatei - + &Encrypt &Verschlüsseln - + &Decrypt &Entschlüsseln - + Open File Datei Öffnen - Files - Dateien + Dateien - All Files (*) - Alle Dateien (*) + Alle Dateien (*) - + Save File Datei Speichern - + couldn't open file: Konnte Datei nicht öffnen: - + Cannot write file %1: %2. Kann Datei nicht schreiben %1: %2. @@ -409,7 +407,7 @@ Do you want to save your changes? <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Kirill (ru)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> - <center>Diese Anwendung erlaubt das einfache<br> Ver-und Entschlüsseln von Texten und Dateien.<br>Die Anwendung ist lizensiert unter der GPL v2.0<br><br><b>Entwickler:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Übersetzung:</b><br>Kirill (ru), Alessandro (pt)<br><br>Falls sie Fragen oder Anregungen haben,<br> kontaktieren sie uns unter gpg4usb at cpunk.de</a><br><br>oder treffen sie uns in unserem XMPP-Channel:<br>gpg4usb at conference.jabber.ccc.de</center> + <center>Diese Anwendung erlaubt das einfache<br> Ver-und Entschlüsseln von Texten und Dateien.<br>Die Anwendung ist lizensiert unter der GPL v2.0<br><br><b>Entwickler:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Übersetzung:</b><br>Kirill (ru), Alessandro (pt)<br><br>Falls sie Fragen oder Anregungen haben,<br> kontaktieren sie uns unter gpg4usb at cpunk.de</a><br><br>oder treffen sie uns in unserem XMPP-Channel:<br>gpg4usb at conference.jabber.ccc.de</center> @@ -459,6 +457,11 @@ Do you want to save your changes? Key Files Schlüssel Dateien + + + All Files + Alle Dateien + Import Key From... @@ -814,83 +817,83 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...) SettingsDialog - + Settings Einstellungen - + Iconsize Optionen - + small klein - + medium mittel - + large gross - + Iconstyle Iconstil - + just text Nur Text - + just icons Nur Icons - + text and icons Text und Icons - + Windowstate Fenstereinstellungen - + save window size and position on exit Speichere Fenstergröße und -position beim Beenden - + Language Sprache - + Language change is applied after restarting program. DIe Änderung der Sprache wird beim nächsten Progrmmstart übernommen. - + English Insert local name of language here. This is used for the language menu of the settingsdialog Deutsch - + English Deutsch - + System Default Systemstandard diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts index 841658c..4d74201 100644 --- a/release/ts/gpg4usb_en.ts +++ b/release/ts/gpg4usb_en.ts @@ -4,73 +4,63 @@ FileEncryptionDialog - + Encrypt / Decrypt File - - + + File - + Action - + ... - + Input - + Output - + &Encrypt - + &Decrypt - + Open File - - Files - - - - - All Files (*) - - - - + Save File - + couldn't open file: - + Cannot write file %1: %2. @@ -405,6 +395,11 @@ Do you want to save your changes? Key Files + + + All Files + + couldn't open file: @@ -806,83 +801,83 @@ Weak -> Strong SettingsDialog - + Settings - + Iconsize - + small - + medium - + large - + Iconstyle - + just text - + just icons - + text and icons - + Windowstate - + save window size and position on exit - + Language - + Language change is applied after restarting program. - + English Insert local name of language here. This is used for the language menu of the settingsdialog English - + English English - + System Default diff --git a/release/ts/gpg4usb_fr.ts b/release/ts/gpg4usb_fr.ts index 16a54f2..87b99b5 100644 --- a/release/ts/gpg4usb_fr.ts +++ b/release/ts/gpg4usb_fr.ts @@ -4,73 +4,71 @@ FileEncryptionDialog - + Encrypt / Decrypt File Crypter / Decrypter fichier - - + + File Fichier - + Action - + ... - + Input Données à traiter - + Output - + &Encrypt &Crypter - + &Decrypt &Decrypter - + Open File Ouvrir Fichier - Files - Fichiers + Fichiers - All Files (*) - Tous les fichiers + Tous les fichiers - + Save File Enregistrer fichier - + couldn't open file: Fichier non-ouvrable: - + Cannot write file %1: %2. Fichier non-enregistrable %1: %2. @@ -453,6 +451,11 @@ Do you want to save your changes? Key Files + Fichiers des cles + + + + All Files @@ -808,83 +811,83 @@ Weak -> Strong SettingsDialog - + Settings - + Iconsize - + small - + medium - + large - + Iconstyle - + just text - + just icons - + text and icons - + Windowstate - + save window size and position on exit - + Language - + Language change is applied after restarting program. - + English Insert local name of language here. This is used for the language menu of the settingsdialog Français - + English Français - + System Default diff --git a/release/ts/gpg4usb_pt.qm b/release/ts/gpg4usb_pt.qm index 969be29..a827491 100644 Binary files a/release/ts/gpg4usb_pt.qm and b/release/ts/gpg4usb_pt.qm differ diff --git a/release/ts/gpg4usb_pt.ts b/release/ts/gpg4usb_pt.ts index 864e661..451575e 100644 --- a/release/ts/gpg4usb_pt.ts +++ b/release/ts/gpg4usb_pt.ts @@ -4,73 +4,71 @@ FileEncryptionDialog - + Encrypt / Decrypt File Encriptar / Decriptar Arquivo - - + + File Arquivo - + Action Ação - + ... ... - + Input Entrada - + Output Saída - + &Encrypt &Encriptar - + &Decrypt &Decriptar - + Open File Abrir Arquivo - Files - Arquivos + Arquivos - All Files (*) - + Todos os Arquivos (*) - + Save File Salvar Arquivo - + couldn't open file: não pode abrir o arquivo: - + Cannot write file %1: %2. Não pode escrever o arquivo %1: @@ -87,7 +85,7 @@ Ctrl+O - Ctrl+O + Ctrl+A @@ -102,7 +100,7 @@ Ctrl+S - Ctr+S + Ctrl+S @@ -117,7 +115,7 @@ Ctrl+A - Ctrl+A + Ctrl+C @@ -132,7 +130,7 @@ Ctrl+P - Ctrl+P + Ctrl+I @@ -142,12 +140,12 @@ &Quit - &Sair + Sai&r Ctrl+Q - Ctrl+Q + Ctrl+R @@ -157,7 +155,8 @@ &Paste - &Colar + i used this without accelerator & to avoid confusion with windows native paste (ctrl+v) + Colar @@ -172,7 +171,8 @@ Cu&t - &Recortar + i used this without accelerator & to avoid confusion with native windows cut ctrl+x + Recortar @@ -182,7 +182,7 @@ Cut the current selection's contents to the clipboard - Recortar o conteúdo da seleção atual para a Área de Transferência + Recortar a seleção atual para a Área de Transferência @@ -212,12 +212,12 @@ Se&ttings - + Con&figurações Open settings dialog - + Abre janela de configurações @@ -232,7 +232,7 @@ Encrypt Message - Encriptar a Mensagem + Encriptar Mensagem @@ -247,7 +247,7 @@ Decrypt Message - Decriptar a Mensagem + Decriptar Mensagem @@ -272,7 +272,7 @@ Key Management - Gerenciamento de Chaves + Gerenciar Chaves @@ -292,7 +292,7 @@ Show the application's About box - Exibir a caixa 'sobre' + Exibe a caixa 'sobre' @@ -304,12 +304,12 @@ &Edit - &Editar + E&ditar &Help - &Ajuda + A&juda @@ -324,12 +324,12 @@ Append Selected Key(s) To Text - Anexar as Chaves Marcadas para o Texto + Anexar Chaves Marcadas no Texto Append The Selected Keys To Text in Editor - Anexar as Chaves Marcadas ao Texto no Editor + Anexar Chaves Marcadas no Texto do Editor @@ -344,7 +344,7 @@ &View - + E&xibir @@ -372,7 +372,7 @@ Cannot read file %1: %2. - Não pode ler o arquivo %1: %2. + Não leu o arquivo %1: %2. @@ -395,17 +395,18 @@ Deseja salvar as alterações? Cannot write file %1: %2. - Não pode escrever o arquivo %1: %2. + Não escreveu o arquivo %1: %2. Saved '%1' - Salvo '%1' + i used inverse order because its more natural speak in this way + '%1' salvo. <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Kirill (ru)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> - <center> Esse aplicativo permite a encriptação/decriptação simplificada<br>das suas mensagens de texto ou arquivos.<br>E possui licença GPL-V2.0<br><br>Desenvolvedor:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tradução:</b><br>Krill(ru)<br>Alessandro Benevenuto (pt-br)<br><br>Caso tenha dúvidas e/ou sugestões, entre em contato<br>através de gpg4usb at cpunk.de</a><br><br>ou nos encontre no canal xmpp<br>gpg4usb at conference.jabber.ccc.de</center> + <center> Este aplicativo permite a encriptação/decriptação<br>simplificada das suas mensagens de texto ou arquivos.<br>E é liberado sob licença GPL-V2.0<br><br>Desenvolvedores:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tradução:</b><br>Krill(ru)<br>Alessandro Benevenuto (pt-br)<br><br>Caso tenha dúvidas e/ou sugestões, entre em<br>contatoatravés de gpg4usb at cpunk.de</a><br><br>ou no canal xmpp<br>gpg4usb at conference.jabber.ccc.de</center> @@ -417,6 +418,11 @@ Deseja salvar as alterações? Key Files Arquivos de Chaves + + + All Files + + couldn't open file: @@ -481,7 +487,7 @@ Deseja salvar as alterações? Fingerprint - Impressão digital + Assinatura digital @@ -506,7 +512,7 @@ Deseja salvar as alterações? Created on: - Criado em: + Criada em: @@ -516,7 +522,7 @@ Deseja salvar as alterações? Key Files - + Arquivos de Chaves @@ -586,22 +592,22 @@ Guarde-a em segurança. Keymanagement - Gerenciamento de Chaves + Gerenciador de Chaves &Close Key Management - &Fechar Gerenciamento de Chaves + &Fechar Gerenciador de Chaves Ctrl+Q - Ctrl+Q + Ctrl+F Close Key Management - Fechar Gerenciamento de Chaves + Fechar Gerenciador de Chaves @@ -626,12 +632,12 @@ Guarde-a em segurança. Export To &Clipboard - Exportar para a Área de &Transferência + Exportar para Área de &Transferência Export Selected Key(s) To Clipboard - Exportar as chaves selecionadas para a Área de Transferência + Exportar chaves marcadas para Área de Transferência @@ -641,27 +647,27 @@ Guarde-a em segurança. Export Selected Key(s) To File - Exportar as Chaves Selecionadas para Arquivo + Exportar as Chaves Marcadas para Arquivo Delete Selected Key(s) - Excluir as Chaves Selecionadas + Excluir Chaves Selecionadas Delete the Selected keys - Excluir as Chaves Selecionadas + Excluir Chaves Selecionadas Delete Checked Key(s) - Excluir as Chaves Marcadas + Excluir Chaves Marcadas Delete the Checked keys - Excluir as Chaves Marcadas + Excluir Chaves Marcadas @@ -730,7 +736,7 @@ A ação não poderá ser desfeita. Export Key To File - Exportar a Chave para Arquivo + Exportar Chave para Arquivo @@ -776,7 +782,7 @@ A ação não poderá ser desfeita. Password: Strength Weak -> Strong - Senha: Força Fraca -> Forte + Força da Senha: Fraca -> Forte @@ -805,7 +811,7 @@ Weak -> Strong This may take a while. To speed up the process use your computer (e.g. browse the net, listen to music,...) - Coletando dados randômicos para a geração da chave. + Coletando dados aleatórios para a geração da chave. Isso pode demorar um pouco. Para agilizar o processo use seu computador (ex: navegue na internet, ouça música,...) @@ -814,85 +820,85 @@ Para agilizar o processo use seu computador SettingsDialog - + Settings - + Configurações - + Iconsize - + Tamanho do ícone - + small - + pequeno - + medium - + médio - + large - + grande - + Iconstyle - + Estilo do ícone - + just text - + somente texto - + just icons - + somente ícones - + text and icons - + texto e ícones - + Windowstate - + Status da Janela - + save window size and position on exit - + Salvar posição e tamanho da janela ao sair - + Language - + Idioma - + Language change is applied after restarting program. - + Alteração de idioma disponível após reiniciar o programa. - + English Insert local name of language here. This is used for the language menu of the settingsdialog - Português + Português do Brasil - + English - Português + Inglês - + System Default - + Padrão do Sistema diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts index 268a670..2985d62 100644 --- a/release/ts/gpg4usb_ru.ts +++ b/release/ts/gpg4usb_ru.ts @@ -4,73 +4,71 @@ FileEncryptionDialog - + Encrypt / Decrypt File За-/Расшифровать файл - - + + File Файл - + Action Действие - + ... ... - + Input Файл ввода - + Output Файл вывода - + &Encrypt З&ашифровать - + &Decrypt Расшифро&вать - + Open File Открыть файл - Files - Файлы + Файлы - All Files (*) - Все файлы + Все файлы - + Save File Сохранить файл - + couldn't open file: Не удалось открыть файл: - + Cannot write file %1: %2. Не удалось записать файл %1: @@ -462,6 +460,11 @@ Do you want to save your changes? Key Files Файлы ключей + + + All Files + + Import Key From... @@ -818,85 +821,85 @@ Weak -> Strong SettingsDialog - + Settings Настройки - + Iconsize Размер иконок - + small Маленький - + medium Средний - + large Большой - + Iconstyle Стиль иконок - + just text Только текст - + just icons Только значки - + text and icons Значки и текст - + Windowstate Системные настройки - + save window size and position on exit Сохранять размер окна при выходе - + Language Язык - + Language change is applied after restarting program. Изменение языка вступит в силу после перезапуска программы. - + English Insert local name of language here. This is used for the language menu of the settingsdialog Local language here is russian Русский - + English Also local language here? Русский - + System Default Стандартнай язык системы diff --git a/settingsdialog.cpp b/settingsdialog.cpp index 412fa58..d96b96a 100755 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -35,7 +35,8 @@ class QLabel; class QButtonGroup; class QGroupBox; -SettingsDialog::SettingsDialog() +SettingsDialog::SettingsDialog(QWidget *parent) + : QDialog(parent) { setWindowTitle(tr("Settings")); resize(500, 200); diff --git a/settingsdialog.h b/settingsdialog.h index 173b284..88dd424 100755 --- a/settingsdialog.h +++ b/settingsdialog.h @@ -19,6 +19,9 @@ * MA 02110-1301, USA. */ +#ifndef __SETTINGSDIALOG_H__ +#define __SETTINGSDIALOG_H__ + #include #include #include @@ -36,7 +39,7 @@ class SettingsDialog : public QDialog Q_OBJECT public: - SettingsDialog(); + SettingsDialog(QWidget *parent = 0); private: QGroupBox *iconSizeBox; @@ -69,3 +72,4 @@ private slots: QHash listLanguages(); }; +#endif // __SETTINGSDIALOG_H__ -- cgit v1.2.3