From f273a466b308b86aa78498fbb1a2349e1eff7362 Mon Sep 17 00:00:00 2001 From: nils Date: Sat, 4 Feb 2012 20:39:17 +0000 Subject: changed about dialog git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@793 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- fileencryptiondialog.cpp | 2 +- gpg4usb.qrc | 3 +-- main.cpp | 2 +- mainwindow.cpp | 10 +++++----- release/icons/gpg4usb-logo_flipped.png | Bin 8570 -> 0 bytes wizard.cpp | 1 - 6 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 release/icons/gpg4usb-logo_flipped.png diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp index 0e1ec8b..ded8335 100755 --- a/fileencryptiondialog.cpp +++ b/fileencryptiondialog.cpp @@ -150,7 +150,7 @@ void FileEncryptionDialog::executeAction() QFile infile; infile.setFileName(inputFileEdit->text()); if (!infile.open(QIODevice::ReadOnly)) { - qDebug() << tr("couldn't open file: ") + inputFileEdit->text(); + qDebug() << tr("Couldn't Open file: ") + inputFileEdit->text(); } QByteArray inBuffer = infile.readAll(); diff --git a/gpg4usb.qrc b/gpg4usb.qrc index 5065139..0271b67 100644 --- a/gpg4usb.qrc +++ b/gpg4usb.qrc @@ -3,8 +3,7 @@ release/icons/keymgmt.png release/icons/help.png release/icons/button_copy.png - release/icons/gpg4usb-logo.png - release/icons/gpg4usb-logo_flipped.png + release/icons/gpg4usb-logo.png release/icons/wizard_banner.png release/icons/gpg4usb-logo_small.png release/icons/keys12.jpg diff --git a/main.cpp b/main.cpp index 232d434..f9510c1 100644 --- a/main.cpp +++ b/main.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) // get application path QString appPath = qApp->applicationDirPath(); - app.setApplicationVersion("0.3.1"); + app.setApplicationVersion("0.3.2"); app.setApplicationName("gpg4usb"); // dont show icons in menus diff --git a/mainwindow.cpp b/mainwindow.cpp index da185c3..36e4e5e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -583,19 +583,20 @@ void MainWindow::about() QString *title = new QString(tr("About ") + qApp->applicationName()); QString *text = new QString("

" + qApp->applicationName() + " " + qApp->applicationVersion() + "

" - + tr("
This application allows simple encryption
" + + tr("
This application allows simple encryption
" "and decryption of text messages or files.
" "It's licensed under the GPL v3

" "Developer:
" "Bene, Heimer, Juergen, Nils, Ubbo

" "Translation:
" - "Alessandro (pt_br), Kirill (ru), Viriato (es), Serse (it)

" + "Viriato/Phol (es),
Serse (it), Russell (my),
Alessandro (pt_br), Kirill (ru), Tom (vi)" + "

" "If you have any questions or suggestions have a look
" "at our " "contact page or send a mail to our
mailing list at" " gpg4usb@gzehn.de.") - + tr("

Built with Qt ") + qVersion() - + tr(" and GPGME ") + GpgME::GpgContext::getGpgmeVersion()); + + tr("

Built with Qt ") + qVersion() + + tr(" and GPGME ") + GpgME::GpgContext::getGpgmeVersion() +"
"); QDialog *dialog = new QDialog(this); dialog->setWindowTitle(*title); @@ -905,7 +906,6 @@ void MainWindow::openSettingsDialog() qApp->exit(RESTART_CODE); } } - } void MainWindow::cleanDoubleLinebreaks() diff --git a/release/icons/gpg4usb-logo_flipped.png b/release/icons/gpg4usb-logo_flipped.png deleted file mode 100644 index 0e044da..0000000 Binary files a/release/icons/gpg4usb-logo_flipped.png and /dev/null differ diff --git a/wizard.cpp b/wizard.cpp index a53d1ce..2fc5978 100644 --- a/wizard.cpp +++ b/wizard.cpp @@ -344,7 +344,6 @@ int ImportFromGnupgPage::nextId() const KeyGenPage::KeyGenPage(GpgME::GpgContext *ctx, QWidget *parent) : QWizardPage(parent) { - //setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); mCtx=ctx; setTitle(tr("Create a keypair...")); setSubTitle(tr("...for decrypting and signing messages")); -- cgit v1.2.3