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
@@ -11,32 +11,33 @@
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>
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_
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;
@@ -54,35 +55,41 @@ int main( int argc, char **argv )
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 );