From eb485c26d4f74441adda6222304f85b40a5131b4 Mon Sep 17 00:00:00 2001 From: nils Date: Mon, 5 Mar 2012 21:42:14 +0000 Subject: fix sign and verify bug with utf8, which was already fixed in 0.3.1.1 git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@833 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mainwindow.cpp') diff --git a/mainwindow.cpp b/mainwindow.cpp index 84da541..72a559e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -789,8 +789,8 @@ void MainWindow::sign() QStringList *uidList = mKeyList->getPrivateChecked(); QByteArray *tmp = new QByteArray(); - // TODO: toUtf8() here? - if (mCtx->sign(uidList, edit->curTextPage()->toPlainText().toAscii(), tmp)) { + + if (mCtx->sign(uidList, edit->curTextPage()->toPlainText().toUtf8(), tmp)) { QString *tmp2 = new QString(*tmp); edit->fillTextEditWithText(*tmp2); } -- cgit v1.2.3 From 025ceb7511e0bca1816530beb5c93a79ce011530 Mon Sep 17 00:00:00 2001 From: nils Date: Mon, 5 Mar 2012 21:42:44 +0000 Subject: refixed signing with utf8 git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@841 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- mainwindow.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mainwindow.cpp') diff --git a/mainwindow.cpp b/mainwindow.cpp index 72a559e..2e067dc 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -791,8 +791,7 @@ void MainWindow::sign() QByteArray *tmp = new QByteArray(); if (mCtx->sign(uidList, edit->curTextPage()->toPlainText().toUtf8(), tmp)) { - QString *tmp2 = new QString(*tmp); - edit->fillTextEditWithText(*tmp2); + edit->fillTextEditWithText(QString::fromUtf8(*tmp)); } } -- cgit v1.2.3 From 7dbb83ac7c91682613897c92b608d5be8fd61757 Mon Sep 17 00:00:00 2001 From: nils Date: Fri, 3 Jan 2014 20:37:28 +0000 Subject: changed codec for tr to utf-8 and modified translation files a little git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2-1@1078 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mainwindow.cpp') diff --git a/mainwindow.cpp b/mainwindow.cpp index 2e067dc..3041150 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -617,7 +617,7 @@ void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::about() { QPixmap *pixmap = new QPixmap(":gpg4usb-logo.png"); - QString *title = new QString(tr("About ") + qApp->applicationName()); + QString *title = new QString(tr("About") +" "+ qApp->applicationName()); QString *text = new QString("

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

" + tr("
This application allows simple encryption
" @@ -626,7 +626,7 @@ void MainWindow::about() "Developer:
" "Bene, Heimer, Juergen, Nils, Ubbo

" "Translation:
" - "Viriato/Phol (es),
Serse (it), Russell (my),
Alessandro (pt_br), Kirill (ru), Tom (vi)" + "Ahmad (ar), Alessandro (pt_br), Åke (sv),
Elad (he), George (el), Jedi Lin (zh_tw),
Kirill (ru), Marek Bogacz (pl), Phol (es),
Russell (my), Serse (it), Tom (vi),
Toughworm(zh), Viriato (es)" "

" "If you have any questions or suggestions have a look
" "at our " -- cgit v1.2.3