summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/mainembedded.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index e373105..72383fd 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -21,12 +21,13 @@
21#include "externalapphandler.h" 21#include "externalapphandler.h"
22#include <libkdepim/kpimglobalprefs.h> 22#include <libkdepim/kpimglobalprefs.h>
23void dumpMissing(); 23void dumpMissing();
24int main( int argc, char **argv ) 24int main( int argc, char **argv )
25{ 25{
26 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); 26 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
27 if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi");
27#ifndef DESKTOP_VERSION 28#ifndef DESKTOP_VERSION
28 QPEApplication a( argc, argv ); 29 QPEApplication a( argc, argv );
29 a.setKeepRunning (); 30 a.setKeepRunning ();
30#else 31#else
31 QApplication a( argc, argv ); 32 QApplication a( argc, argv );
32#ifdef _WIN32_ 33#ifdef _WIN32_
@@ -64,15 +65,21 @@ int main( int argc, char **argv )
64 if ( QApplication::desktop()->width() > 320 ) 65 if ( QApplication::desktop()->width() > 320 )
65 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); 66 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/");
66 else 67 else
67 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); 68 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
68#else 69#else
69 QString fileName ; 70 QString fileName ;
70 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; 71 const char *kpd = ::getenv("KDEPIMPIDIR");
72 if(kpd)
73 fileName = QString(kpd) + "/kaddressbook/icons22/";
74 else
75 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
71 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 76 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
72 QApplication::addLibraryPath ( qApp->applicationDirPath () ); 77 QApplication::addLibraryPath ( qApp->applicationDirPath () );
78 if(kpd) KGlobal::dirs()->addResourceDir( "lib", QString(kpd)+"/kaddressbook/" );
79 KGlobal::dirs()->addResourceDir( "lib", "/usr/lib/" );
73 80
74#endif 81#endif
75 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); 82 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
76 // init language 83 // init language
77 KPimGlobalPrefs::instance()->setGlobalConfig(); 84 KPimGlobalPrefs::instance()->setGlobalConfig();
78 QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); 85 QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont );