| author | Michael Krelin <hacker@klever.net> | 2007-07-10 22:34:09 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-07-10 22:34:09 (UTC) |
| commit | 399974b248bf037ff8da6b91d74208acfcde779c (patch) (side-by-side diff) | |
| tree | dcee48dc9f11383b42534775e0fa10b6aab6adb6 /kaddressbook | |
| parent | a08aff328d4393031d5ba7d622c2b05705a89d73 (diff) | |
| download | kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.zip kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.tar.gz kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.tar.bz2 | |
kaddressbook: make it look into proper locations
| -rw-r--r-- | kaddressbook/mainembedded.cpp | 9 |
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 @@ -15,24 +15,25 @@ #include <qregexp.h> #include <kglobal.h> #include <stdio.h> #include <qdir.h> #include "kabprefs.h" #include "kaddressbookmain.h" #include "externalapphandler.h" #include <libkdepim/kpimglobalprefs.h> void dumpMissing(); int main( int argc, char **argv ) { if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); + if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi"); #ifndef DESKTOP_VERSION QPEApplication a( argc, argv ); a.setKeepRunning (); #else QApplication a( argc, argv ); #ifdef _WIN32_ QString hdir ( getenv( "HOME") ); if ( hdir.isEmpty() ) { QString hd ("C:/" ); //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); if ( QDir::homeDirPath().lower() == hd.lower() ) { _putenv( "HOME=C:"); @@ -58,27 +59,33 @@ int main( int argc, char **argv ) } } if ( ! exitHelp ) { KGlobal::setAppName( "kaddressbook" ); #ifndef DESKTOP_VERSION if ( QApplication::desktop()->width() > 320 ) KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); else KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); #else QString fileName ; - fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; + const char *kpd = ::getenv("KDEPIMPIDIR"); + if(kpd) + fileName = QString(kpd) + "/kaddressbook/icons22/"; + else + fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); QApplication::addLibraryPath ( qApp->applicationDirPath () ); + if(kpd) KGlobal::dirs()->addResourceDir( "lib", QString(kpd)+"/kaddressbook/" ); + KGlobal::dirs()->addResourceDir( "lib", "/usr/lib/" ); #endif KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); // init language KPimGlobalPrefs::instance()->setGlobalConfig(); QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); KAddressBookMain m ; //US MainWindow m; #ifndef DESKTOP_VERSION |