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) (unidiff) | |
tree | dcee48dc9f11383b42534775e0fa10b6aab6adb6 /kaddressbook/mainembedded.cpp | |
parent | a08aff328d4393031d5ba7d622c2b05705a89d73 (diff) | |
download | kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.zip kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.tar.gz kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.tar.bz2 |
kaddressbook: make it look into proper locations
Diffstat (limited to 'kaddressbook/mainembedded.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -19,16 +19,17 @@ | |||
19 | #include "kabprefs.h" | 19 | #include "kabprefs.h" |
20 | #include "kaddressbookmain.h" | 20 | #include "kaddressbookmain.h" |
21 | #include "externalapphandler.h" | 21 | #include "externalapphandler.h" |
22 | #include <libkdepim/kpimglobalprefs.h> | 22 | #include <libkdepim/kpimglobalprefs.h> |
23 | void dumpMissing(); | 23 | void dumpMissing(); |
24 | int main( int argc, char **argv ) | 24 | int 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_ |
33 | QString hdir ( getenv( "HOME") ); | 34 | QString hdir ( getenv( "HOME") ); |
34 | if ( hdir.isEmpty() ) { | 35 | if ( hdir.isEmpty() ) { |
@@ -62,19 +63,25 @@ int main( int argc, char **argv ) | |||
62 | KGlobal::setAppName( "kaddressbook" ); | 63 | KGlobal::setAppName( "kaddressbook" ); |
63 | #ifndef DESKTOP_VERSION | 64 | #ifndef DESKTOP_VERSION |
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 ); |
79 | KAddressBookMain m ; | 86 | KAddressBookMain m ; |
80 | //US MainWindow m; | 87 | //US MainWindow m; |