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
@@ -1,75 +1,79 @@
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "kapplication.h"
 #include <qapplication.h>
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextbrowser.h>
 
 int KApplication::random()
 {
   return rand();
 }
 
 //US
 QString KApplication::randomString(int length)
 {
    if (length <=0 ) return QString::null;
 
    QString str;
    while (length--)
    {
       int r=random() % 62;
       r+=48;
       if (r>57) r+=7;
       if (r>90) r+=6;
       str += char(r);
       // so what if I work backwards?
    }
    return str;
 }
 int KApplication::execDialog( QDialog* d )
 {
     if (QApplication::desktop()->width() <= 640 )    
         d->showMaximized();
     return d->exec();
 }
 void KApplication::showLicence()
 {
-   QString fileName ;
-   QString text;
+   KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" );
+}
+
+void KApplication::showFile(QString caption, QString fn)
+{
+    QString text;
+    QString fileName;
 #ifndef DESKTOP_VERSION
    fileName = getenv("QPEDIR");
-   fileName += "/pics/kdepim/LICENCE.TXT" ;
+   fileName += "/pics/" + fn ;
 #else
-   fileName  = qApp->applicationDirPath () + "/kdepim/LICENCE.TXT";
+   fileName  = qApp->applicationDirPath () + "/" + fn;
 #endif 
-   QFile file( fileName );
-   qDebug("Licence file name %s ",fileName.latin1() );
-   if (!file.open( IO_ReadOnly ) ) {
-       return ;
-   } 
-   QTextStream ts( &file );
-   text = ts.read();
-   file.close();
-   
-   QDialog dia( 0, "name", true ); ;
-   dia.setCaption( "KDE-Pim/Pi licence" );
-   QVBoxLayout* lay = new QVBoxLayout( &dia );
-   lay->setSpacing( 3 );
-   lay->setMargin( 3 );
-   QTextBrowser tb ( &dia );
-   lay->addWidget( &tb ); 
-   tb.setText( text );
+    QFile file( fileName );
+    if (!file.open( IO_ReadOnly ) ) {
+        return ;
+    } 
+    QTextStream ts( &file );
+    text = ts.read();
+    file.close();
+    
+    QDialog dia( 0, "name", true ); ;
+    dia.setCaption( caption );
+    QVBoxLayout* lay = new QVBoxLayout( &dia );
+    lay->setSpacing( 3 );
+    lay->setMargin( 3 );
+    QTextBrowser tb ( &dia );
+    lay->addWidget( &tb ); 
+    tb.setText( text );
 #ifdef DESKTOP_VERSION
-   dia.resize( 640, 480);
+    dia.resize( 640, 480);
 #else
-   dia.showMaximized();
+    dia.showMaximized();
 #endif
-   dia.exec();
+    dia.exec();
    
 }