diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2010-01-03 13:02:30 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2010-01-03 13:02:30 +0000 |
| commit | e4f2ebb5688bdab5d844e7907a94ad2c9c994aa0 (patch) | |
| tree | abbaf25d7439ce02a8389b389c7968b03726ad9a | |
| parent | updated TODO (diff) | |
| download | gpg4usb-e4f2ebb5688bdab5d844e7907a94ad2c9c994aa0.tar.gz gpg4usb-e4f2ebb5688bdab5d844e7907a94ad2c9c994aa0.zip | |
halfway fix utf8-encoding (quoted printable still doesn't show correct), add utf8-testdata
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@236 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | gpgwin.cpp | 5 | ||||
| -rw-r--r-- | testdata/greek-quoted-printable-utf8.txt.asc | 15 | ||||
| -rw-r--r-- | testdata/greek-utf8.txt.asc | 13 |
3 files changed, 30 insertions, 3 deletions
@@ -402,7 +402,7 @@ void GpgWin::encrypt() QList<QString> *uidList = mKeyList->getChecked(); QByteArray *tmp = new QByteArray(); - if (mCtx->encrypt(uidList, edit->toPlainText().toAscii(), tmp)) { + if (mCtx->encrypt(uidList, edit->toPlainText().toUtf8(), tmp)) { QString *tmp2 = new QString(*tmp); edit->setPlainText(*tmp2); } @@ -416,8 +416,7 @@ void GpgWin::decrypt() preventNoDataErr(&text); mCtx->decrypt(text, tmp); if (!tmp->isEmpty()) { - QString *tmp2 = new QString(*tmp); - edit->setPlainText(*tmp2); + edit->setPlainText(QString::fromUtf8(*tmp)); } } diff --git a/testdata/greek-quoted-printable-utf8.txt.asc b/testdata/greek-quoted-printable-utf8.txt.asc new file mode 100644 index 0000000..d0db14c --- /dev/null +++ b/testdata/greek-quoted-printable-utf8.txt.asc @@ -0,0 +1,15 @@ +-----BEGIN PGP MESSAGE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +hQEOAwh91+A4FwHEEAP/bC5okiQWZHUYmWfiQYupEoSUMnY6gwbsBacSt9pfkbKI +erdVO1qil+N1jX4f1tg2UrhtPWjHP+yCF0RzBYFOhjf0yGQf80pElvBrE8auFBpv +YI+5DP/VMDsv5ZxPHELM33QPYjyONEcE+5cSR6fA7NGh0U6EDqi5wGWzPGH0Nh8D +/Ax3MgENDfKfByWAS86F1fZ5ko+3KzR6ijgeymIxCQyYlH2rFXozs/l6lwRd83tw +YNeuSD3KK4Ut+Tm1NdNm69GAIIGJdzmDp9lR+z/3+cpepCMRvFBxF0pTx2jKJEe8 +QbSpCM7qXqJtzIYH7EU3i5EElOH05igFBH2VGzegvwUI0r8Bpec/Zorp7xfRVrX9 ++EHZKcgK1xbgzqgXGgVo7rmY8uycB7wN0W0gXQbcX0NE5C+HnRDsQmAKO6Qfaob1 +LrTAkDYtPVBkOyx5MEcpTUjoGPW9MhuSzl2PtO8mdpZTeXFcqGr1H6xA/f8UKBiQ +6ai6kXHfRfNwfP0PHuyaxDonrVZkWQygTbXl4Fe4M6bk+5C2m8+Uf57rHQpnmmLI +thiIlgj4b9NlmL5B9Rz0Irlr5o8eX5EsvI9blm+lKGaByQ== +=t+6g +-----END PGP MESSAGE----- diff --git a/testdata/greek-utf8.txt.asc b/testdata/greek-utf8.txt.asc new file mode 100644 index 0000000..8435bdc --- /dev/null +++ b/testdata/greek-utf8.txt.asc @@ -0,0 +1,13 @@ +-----BEGIN PGP MESSAGE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +hQEOAwh91+A4FwHEEAP/VB3b/Yus0tdTQ/kSK59bBEkiDGEA5SU6Aj2yfb3Yctv6 +2urIdBue3E1+vGU1bTpMzP0bP0bSXkeXTdeUKI9K2UENZheJ6RYvhTLeHLFTu435 +75A09QR6fKwkSzzhqNe6JkUEfkiYpL1lZ//mk6gnBWXo9eXICBsonjFH+2c7CM4E +AJ1gwwdlDYsv2QN9nsbNswmQZ5GfgFWGuo8LFZ5ppA7VOeF5heY6h3VzlytAKOGM +t4QS3XPFRAbC4sWr+zZqYqAYtonKUTvf8rrZ1KxDUoWPm1C1Xz+B7mJyn9eKC5XI +4QpKxM52bZsoGdweFAOG9GEZAP6bmgvM/eDt37wdXcA90lMBs0Z1P7OJ8sD5ZiJa +h8O+jL/NJKESdUIG7Ktp6eVagx7FeQ43I3S7hF98cbCcnFsFuy6C4zbyBKio0o6c +AnBPmWWLo1z40p6SODkTXKvf/aYTxw== +=T74p +-----END PGP MESSAGE----- |