author | zautrix <zautrix> | 2004-09-08 02:15:33 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-08 02:15:33 (UTC) |
commit | 858de54fa69a6e93072652a9cb33783ad10a9f0a (patch) (unidiff) | |
tree | e2cc31a725057c84b94de0a58029321485f093c7 /kmicromail | |
parent | e5f6ea343bc2b129f81fde3734b100cfa2ed6c83 (diff) | |
download | kdepimpi-858de54fa69a6e93072652a9cb33783ad10a9f0a.zip kdepimpi-858de54fa69a6e93072652a9cb33783ad10a9f0a.tar.gz kdepimpi-858de54fa69a6e93072652a9cb33783ad10a9f0a.tar.bz2 |
Some more fixes
-rw-r--r-- | kmicromail/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index 65de770..30637e2 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp | |||
@@ -1,61 +1,61 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | 2 | ||
3 | 3 | ||
4 | #ifndef DESKTOP_VERSION | 4 | #ifndef DESKTOP_VERSION |
5 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
6 | #include <libkdepim/externalapphandler.h> | 6 | #include <libkdepim/externalapphandler.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #else | 8 | #else |
9 | #include <qapplication.h> | 9 | #include <qapplication.h> |
10 | #include <qstring.h> | 10 | #include <qstring.h> |
11 | #include <qwindowsstyle.h> | 11 | #include <qwindowsstyle.h> |
12 | #include <qplatinumstyle.h> | 12 | #include <qplatinumstyle.h> |
13 | #include <qsgistyle.h> | 13 | #include <qsgistyle.h> |
14 | #endif | 14 | #endif |
15 | #include "opiemail.h" | 15 | #include "opiemail.h" |
16 | #include <qdir.h> | 16 | #include <qdir.h> |
17 | #include <kstandarddirs.h> | 17 | #include <kstandarddirs.h> |
18 | #include <kglobal.h> | 18 | #include <kglobal.h> |
19 | #include <stdio.h> | 19 | #include <stdio.h> |
20 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
21 | 21 | ||
22 | using namespace Opie::Core; | 22 | //using namespace Opie::Core; |
23 | int main( int argc, char **argv ) { | 23 | int main( int argc, char **argv ) { |
24 | 24 | ||
25 | #ifndef DESKTOP_VERSION | 25 | #ifndef DESKTOP_VERSION |
26 | QPEApplication a( argc, argv ); | 26 | QPEApplication a( argc, argv ); |
27 | a.setKeepRunning (); | 27 | a.setKeepRunning (); |
28 | #else | 28 | #else |
29 | QApplication a( argc, argv ); | 29 | QApplication a( argc, argv ); |
30 | QApplication::setStyle( new QPlatinumStyle ()); | 30 | QApplication::setStyle( new QPlatinumStyle ()); |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | KGlobal::setAppName( "kmicromail" ); | 33 | KGlobal::setAppName( "kmicromail" ); |
34 | QString fileName ; | 34 | QString fileName ; |
35 | #ifndef DESKTOP_VERSION | 35 | #ifndef DESKTOP_VERSION |
36 | fileName = getenv("QPEDIR"); | 36 | fileName = getenv("QPEDIR"); |
37 | if ( QApplication::desktop()->width() > 320 ) | 37 | if ( QApplication::desktop()->width() > 320 ) |
38 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); | 38 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); |
39 | else | 39 | else |
40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); | 40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); |
41 | #else | 41 | #else |
42 | fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; | 42 | fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; |
43 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 43 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
44 | #endif | 44 | #endif |
45 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail"))); | 45 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); |
46 | OpieMail mw; | 46 | OpieMail mw; |
47 | #ifndef DESKTOP_VERSION | 47 | #ifndef DESKTOP_VERSION |
48 | //qDebug("CONNECT "); | 48 | //qDebug("CONNECT "); |
49 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); | 49 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); |
50 | // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 50 | // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
51 | a.showMainWidget(&mw ); | 51 | a.showMainWidget(&mw ); |
52 | #else | 52 | #else |
53 | a.setMainWidget(&mw ); | 53 | a.setMainWidget(&mw ); |
54 | mw.show(); | 54 | mw.show(); |
55 | //m.resize( 800, 600 ); | 55 | //m.resize( 800, 600 ); |
56 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | 56 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); |
57 | #endif | 57 | #endif |
58 | int rv = a.exec(); | 58 | int rv = a.exec(); |
59 | return rv; | 59 | return rv; |
60 | 60 | ||
61 | } | 61 | } |