summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/mainwindow.cpp27
-rw-r--r--microkde/kapplication.cpp9
-rw-r--r--microkde/kapplication.h1
3 files changed, 34 insertions, 3 deletions
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 24196b4..e020297 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -176,7 +176,32 @@ void MainWindow::showLicence()
176} 176}
177void MainWindow::showAbout() 177void MainWindow::showAbout()
178{ 178{
179 qDebug("MainWindow::showAbout() "); 179 QString version;
180#include <../version>
181
182 QString cap = "About KOpieMail/Pi";
183 QString text =i18n("KOpieMail/Platform-independent\n") +
184 "(OM/Pi) " + version + " - "
185
186#ifdef DESKTOP_VERSION
187 "Desktop Edition\n"
188#else
189 "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
190#endif
191 "www.pi-sync.net\n\n"
192
193
194
195"Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n"
196 "KOpieMail/Pi is based on Opie Mail\n"
197 "Copyright (c) Rajko Albrecht and the Opie team\n"
198 "KOpieMail/Pi is licensed under the GPL\n"
199 "\n"
200 "KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
201 "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
202 "libEtPan has its own licence - see LibEtPan licence\n";
203
204 KApplication::showText( cap, text );
180} 205}
181void MainWindow::showEtpanLicence() 206void MainWindow::showEtpanLicence()
182{ 207{
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index ad0b78e..98ef2f2 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -60,7 +60,12 @@ void KApplication::showFile(QString caption, QString fn)
60 QTextStream ts( &file ); 60 QTextStream ts( &file );
61 text = ts.read(); 61 text = ts.read();
62 file.close(); 62 file.close();
63 63 KApplication::showText( caption, text );
64
65}
66
67void KApplication::showText(QString caption, QString text)
68{
64 QDialog dia( 0, "name", true ); ; 69 QDialog dia( 0, "name", true ); ;
65 dia.setCaption( caption ); 70 dia.setCaption( caption );
66 QVBoxLayout* lay = new QVBoxLayout( &dia ); 71 QVBoxLayout* lay = new QVBoxLayout( &dia );
@@ -75,5 +80,5 @@ void KApplication::showFile(QString caption, QString fn)
75 dia.showMaximized(); 80 dia.showMaximized();
76#endif 81#endif
77 dia.exec(); 82 dia.exec();
78 83
79} 84}
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 5ae5c00..79cdb33 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -19,6 +19,7 @@ class KApplication
19 static int execDialog( QDialog* ); 19 static int execDialog( QDialog* );
20 static void showLicence(); 20 static void showLicence();
21 static void showFile(QString caption, QString file); 21 static void showFile(QString caption, QString file);
22 static void showText(QString caption, QString text);
22}; 23};
23 24
24 25