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 | |
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 | |||
@@ -1,104 +1,111 @@ | |||
1 | #ifndef DESKTOP_VERSION | 1 | #ifndef DESKTOP_VERSION |
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include <qcopchannel_qws.h> | 3 | #include <qcopchannel_qws.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #else | 5 | #else |
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | #include <qwindowsstyle.h> | 7 | #include <qwindowsstyle.h> |
8 | #include <q3mainwindow.h> | 8 | #include <q3mainwindow.h> |
9 | #include <qmessagebox.h> | 9 | #include <qmessagebox.h> |
10 | #include <stdlib.h> | 10 | #include <stdlib.h> |
11 | #endif | 11 | #endif |
12 | 12 | ||
13 | #include <qtextcodec.h> | 13 | #include <qtextcodec.h> |
14 | #include <kstandarddirs.h> | 14 | #include <kstandarddirs.h> |
15 | #include <qregexp.h> | 15 | #include <qregexp.h> |
16 | #include <kglobal.h> | 16 | #include <kglobal.h> |
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | #include <qdir.h> | 18 | #include <qdir.h> |
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() ) { |
35 | QString hd ("C:/" ); | 36 | QString hd ("C:/" ); |
36 | //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); | 37 | //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); |
37 | if ( QDir::homeDirPath().lower() == hd.lower() ) { | 38 | if ( QDir::homeDirPath().lower() == hd.lower() ) { |
38 | _putenv( "HOME=C:"); | 39 | _putenv( "HOME=C:"); |
39 | //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); | 40 | //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); |
40 | } | 41 | } |
41 | } else { | 42 | } else { |
42 | QDir app_dir; | 43 | QDir app_dir; |
43 | if ( !app_dir.exists(hdir) ) | 44 | if ( !app_dir.exists(hdir) ) |
44 | app_dir.mkdir (hdir); | 45 | app_dir.mkdir (hdir); |
45 | } | 46 | } |
46 | #endif | 47 | #endif |
47 | #endif | 48 | #endif |
48 | 49 | ||
49 | bool exitHelp = false; | 50 | bool exitHelp = false; |
50 | if ( argc > 1 ) { | 51 | if ( argc > 1 ) { |
51 | QString command = argv[1]; | 52 | QString command = argv[1]; |
52 | if ( command == "-help" ){ | 53 | if ( command == "-help" ){ |
53 | printf("KA/E command line commands:\n"); | 54 | printf("KA/E command line commands:\n"); |
54 | printf(" no command: Start KA/E in usual way\n"); | 55 | printf(" no command: Start KA/E in usual way\n"); |
55 | printf(" -help: This output\n"); | 56 | printf(" -help: This output\n"); |
56 | printf(" KA/E is exiting now. Bye!\n"); | 57 | printf(" KA/E is exiting now. Bye!\n"); |
57 | exitHelp = true; | 58 | exitHelp = true; |
58 | } | 59 | } |
59 | } | 60 | } |
60 | if ( ! exitHelp ) { | 61 | if ( ! exitHelp ) { |
61 | 62 | ||
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; |
81 | 88 | ||
82 | 89 | ||
83 | 90 | ||
84 | #ifndef DESKTOP_VERSION | 91 | #ifndef DESKTOP_VERSION |
85 | a.showMainWidget( &m ); | 92 | a.showMainWidget( &m ); |
86 | 93 | ||
87 | #else | 94 | #else |
88 | a.setMainWidget( &m ); | 95 | a.setMainWidget( &m ); |
89 | m.show(); | 96 | m.show(); |
90 | #endif | 97 | #endif |
91 | m.setCaption(i18n("Loading addressbook data ... please wait" )); | 98 | m.setCaption(i18n("Loading addressbook data ... please wait" )); |
92 | a.exec(); | 99 | a.exec(); |
93 | #ifdef DESKTOP_VERSION | 100 | #ifdef DESKTOP_VERSION |
94 | KConfig *config = KABPrefs::instance()->getConfig(); | 101 | KConfig *config = KABPrefs::instance()->getConfig(); |
95 | config->setGroup("WidgetLayout"); | 102 | config->setGroup("WidgetLayout"); |
96 | QStringList list ;//= config->readListEntry("MainLayout"); | 103 | QStringList list ;//= config->readListEntry("MainLayout"); |
97 | int x,y,w,h; | 104 | int x,y,w,h; |
98 | QWidget* wid; | 105 | QWidget* wid; |
99 | wid = &m; | 106 | wid = &m; |
100 | x = wid->geometry().x(); | 107 | x = wid->geometry().x(); |
101 | y = wid->geometry().y(); | 108 | y = wid->geometry().y(); |
102 | w = wid->width(); | 109 | w = wid->width(); |
103 | h = wid->height(); | 110 | h = wid->height(); |
104 | list.clear(); | 111 | list.clear(); |