-rw-r--r-- | microkde/kapplication.cpp | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index f0de71e..ad0b78e 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp | |||
@@ -19,57 +19,61 @@ int KApplication::random() | |||
19 | QString KApplication::randomString(int length) | 19 | QString KApplication::randomString(int length) |
20 | { | 20 | { |
21 | if (length <=0 ) return QString::null; | 21 | if (length <=0 ) return QString::null; |
22 | 22 | ||
23 | QString str; | 23 | QString str; |
24 | while (length--) | 24 | while (length--) |
25 | { | 25 | { |
26 | int r=random() % 62; | 26 | int r=random() % 62; |
27 | r+=48; | 27 | r+=48; |
28 | if (r>57) r+=7; | 28 | if (r>57) r+=7; |
29 | if (r>90) r+=6; | 29 | if (r>90) r+=6; |
30 | str += char(r); | 30 | str += char(r); |
31 | // so what if I work backwards? | 31 | // so what if I work backwards? |
32 | } | 32 | } |
33 | return str; | 33 | return str; |
34 | } | 34 | } |
35 | int KApplication::execDialog( QDialog* d ) | 35 | int KApplication::execDialog( QDialog* d ) |
36 | { | 36 | { |
37 | if (QApplication::desktop()->width() <= 640 ) | 37 | if (QApplication::desktop()->width() <= 640 ) |
38 | d->showMaximized(); | 38 | d->showMaximized(); |
39 | return d->exec(); | 39 | return d->exec(); |
40 | } | 40 | } |
41 | void KApplication::showLicence() | 41 | void KApplication::showLicence() |
42 | { | 42 | { |
43 | QString fileName ; | 43 | KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" ); |
44 | QString text; | 44 | } |
45 | |||
46 | void KApplication::showFile(QString caption, QString fn) | ||
47 | { | ||
48 | QString text; | ||
49 | QString fileName; | ||
45 | #ifndef DESKTOP_VERSION | 50 | #ifndef DESKTOP_VERSION |
46 | fileName = getenv("QPEDIR"); | 51 | fileName = getenv("QPEDIR"); |
47 | fileName += "/pics/kdepim/LICENCE.TXT" ; | 52 | fileName += "/pics/" + fn ; |
48 | #else | 53 | #else |
49 | fileName = qApp->applicationDirPath () + "/kdepim/LICENCE.TXT"; | 54 | fileName = qApp->applicationDirPath () + "/" + fn; |
50 | #endif | 55 | #endif |
51 | QFile file( fileName ); | 56 | QFile file( fileName ); |
52 | qDebug("Licence file name %s ",fileName.latin1() ); | 57 | if (!file.open( IO_ReadOnly ) ) { |
53 | if (!file.open( IO_ReadOnly ) ) { | 58 | return ; |
54 | return ; | 59 | } |
55 | } | 60 | QTextStream ts( &file ); |
56 | QTextStream ts( &file ); | 61 | text = ts.read(); |
57 | text = ts.read(); | 62 | file.close(); |
58 | file.close(); | 63 | |
59 | 64 | QDialog dia( 0, "name", true ); ; | |
60 | QDialog dia( 0, "name", true ); ; | 65 | dia.setCaption( caption ); |
61 | dia.setCaption( "KDE-Pim/Pi licence" ); | 66 | QVBoxLayout* lay = new QVBoxLayout( &dia ); |
62 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 67 | lay->setSpacing( 3 ); |
63 | lay->setSpacing( 3 ); | 68 | lay->setMargin( 3 ); |
64 | lay->setMargin( 3 ); | 69 | QTextBrowser tb ( &dia ); |
65 | QTextBrowser tb ( &dia ); | 70 | lay->addWidget( &tb ); |
66 | lay->addWidget( &tb ); | 71 | tb.setText( text ); |
67 | tb.setText( text ); | ||
68 | #ifdef DESKTOP_VERSION | 72 | #ifdef DESKTOP_VERSION |
69 | dia.resize( 640, 480); | 73 | dia.resize( 640, 480); |
70 | #else | 74 | #else |
71 | dia.showMaximized(); | 75 | dia.showMaximized(); |
72 | #endif | 76 | #endif |
73 | dia.exec(); | 77 | dia.exec(); |
74 | 78 | ||
75 | } | 79 | } |