aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xfileencryptiondialog.cpp2
-rw-r--r--gpg4usb.qrc3
-rw-r--r--main.cpp2
-rw-r--r--mainwindow.cpp10
-rw-r--r--release/icons/gpg4usb-logo_flipped.pngbin8570 -> 0 bytes
-rw-r--r--wizard.cpp1
6 files changed, 8 insertions, 10 deletions
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 @@
<file alias="keymgmt.png">release/icons/keymgmt.png</file>
<file alias="help.png">release/icons/help.png</file>
<file alias="button_copy.png">release/icons/button_copy.png</file>
- <file alias="logo.png">release/icons/gpg4usb-logo.png</file>
- <file alias="logo-flipped.png">release/icons/gpg4usb-logo_flipped.png</file>
+ <file alias="gpg4usb-logo.png">release/icons/gpg4usb-logo.png</file>
<file alias="banner.png">release/icons/wizard_banner.png</file>
<file alias="logo_small.png">release/icons/gpg4usb-logo_small.png</file>
<file alias="keys2.jpg">release/icons/keys12.jpg</file>
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("<center><h2>" + qApp->applicationName() + " "
+ qApp->applicationVersion() + "</h2></center>"
- + tr("<center>This application allows simple encryption <br/>"
+ + tr("<center>This application allows simple encryption <br>"
"and decryption of text messages or files.<br>"
"It's licensed under the GPL v3<br><br>"
"<b>Developer:</b><br>"
"Bene, Heimer, Juergen, Nils, Ubbo<br><br>"
"<b>Translation:</b><br>"
- "Alessandro (pt_br), Kirill (ru), Viriato (es), Serse (it) <br><br>"
+ "Viriato/Phol (es), <br>Serse (it), Russell (my),<br>Alessandro (pt_br), Kirill (ru), Tom (vi)"
+ "<br><br>"
"If you have any questions or suggestions have a look<br/>"
"at our <a href=\"http://gpg4usb.cpunk.de/contact.php\">"
"contact page</a> or send a mail to our<br/> mailing list at"
" <a href=\"mailto:[email protected]\">[email protected]</a>.")
- + tr("<br/><br/> Built with Qt ") + qVersion()
- + tr(" and GPGME ") + GpgME::GpgContext::getGpgmeVersion());
+ + tr("<br><br> Built with Qt ") + qVersion()
+ + tr(" and GPGME ") + GpgME::GpgContext::getGpgmeVersion() +"</center>");
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
--- a/release/icons/gpg4usb-logo_flipped.png
+++ /dev/null
Binary files 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"));