author | zautrix <zautrix> | 2004-10-14 06:42:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-14 06:42:01 (UTC) |
commit | a6dff815a9c6d3a91094573d23c28a8553fc7cc2 (patch) (unidiff) | |
tree | a8830e9adcd72faa8178d4ee2517bfc31cda8653 /microkde/kapplication.cpp | |
parent | 909d25797c50fc38c435834a68aaf60bf87e32f9 (diff) | |
download | kdepimpi-a6dff815a9c6d3a91094573d23c28a8553fc7cc2.zip kdepimpi-a6dff815a9c6d3a91094573d23c28a8553fc7cc2.tar.gz kdepimpi-a6dff815a9c6d3a91094573d23c28a8553fc7cc2.tar.bz2 |
fixes umlaute in beaming
-rw-r--r-- | microkde/kapplication.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 98ef2f2..56c01af 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp | |||
@@ -43,42 +43,64 @@ void KApplication::showLicence() | |||
43 | KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" ); | 43 | KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" ); |
44 | } | 44 | } |
45 | 45 | ||
46 | void KApplication::showFile(QString caption, QString fn) | 46 | void KApplication::showFile(QString caption, QString fn) |
47 | { | 47 | { |
48 | QString text; | 48 | QString text; |
49 | QString fileName; | 49 | QString fileName; |
50 | #ifndef DESKTOP_VERSION | 50 | #ifndef DESKTOP_VERSION |
51 | fileName = getenv("QPEDIR"); | 51 | fileName = getenv("QPEDIR"); |
52 | fileName += "/pics/" + fn ; | 52 | fileName += "/pics/" + fn ; |
53 | #else | 53 | #else |
54 | fileName = qApp->applicationDirPath () + "/" + fn; | 54 | fileName = qApp->applicationDirPath () + "/" + fn; |
55 | #endif | 55 | #endif |
56 | QFile file( fileName ); | 56 | QFile file( fileName ); |
57 | if (!file.open( IO_ReadOnly ) ) { | 57 | if (!file.open( IO_ReadOnly ) ) { |
58 | return ; | 58 | return ; |
59 | } | 59 | } |
60 | QTextStream ts( &file ); | 60 | QTextStream ts( &file ); |
61 | text = ts.read(); | 61 | text = ts.read(); |
62 | file.close(); | 62 | file.close(); |
63 | KApplication::showText( caption, text ); | 63 | KApplication::showText( caption, text ); |
64 | 64 | ||
65 | } | 65 | } |
66 | 66 | ||
67 | bool KApplication::convert2latin1(QString fileName) | ||
68 | { | ||
69 | QString text; | ||
70 | QFile file( fileName ); | ||
71 | if (!file.open( IO_ReadOnly ) ) { | ||
72 | return false; | ||
73 | |||
74 | } | ||
75 | QTextStream ts( &file ); | ||
76 | ts.setEncoding( QTextStream::UnicodeUTF8 ); | ||
77 | text = ts.read(); | ||
78 | file.close(); | ||
79 | if (!file.open( IO_WriteOnly ) ) { | ||
80 | return false; | ||
81 | } | ||
82 | QTextStream tsIn( &file ); | ||
83 | tsIn.setEncoding( QTextStream::Latin1 ); | ||
84 | tsIn << text.latin1(); | ||
85 | file.close(); | ||
86 | |||
87 | |||
88 | } | ||
67 | void KApplication::showText(QString caption, QString text) | 89 | void KApplication::showText(QString caption, QString text) |
68 | { | 90 | { |
69 | QDialog dia( 0, "name", true ); ; | 91 | QDialog dia( 0, "name", true ); ; |
70 | dia.setCaption( caption ); | 92 | dia.setCaption( caption ); |
71 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 93 | QVBoxLayout* lay = new QVBoxLayout( &dia ); |
72 | lay->setSpacing( 3 ); | 94 | lay->setSpacing( 3 ); |
73 | lay->setMargin( 3 ); | 95 | lay->setMargin( 3 ); |
74 | QTextBrowser tb ( &dia ); | 96 | QTextBrowser tb ( &dia ); |
75 | lay->addWidget( &tb ); | 97 | lay->addWidget( &tb ); |
76 | tb.setText( text ); | 98 | tb.setText( text ); |
77 | #ifdef DESKTOP_VERSION | 99 | #ifdef DESKTOP_VERSION |
78 | dia.resize( 640, 480); | 100 | dia.resize( 640, 480); |
79 | #else | 101 | #else |
80 | dia.showMaximized(); | 102 | dia.showMaximized(); |
81 | #endif | 103 | #endif |
82 | dia.exec(); | 104 | dia.exec(); |
83 | 105 | ||
84 | } | 106 | } |