Diffstat (limited to 'kaddressbook/mainembedded.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/mainembedded.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 10b1013..965fb06 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -10,16 +10,17 @@ | |||
10 | 10 | ||
11 | #include <kstandarddirs.h> | 11 | #include <kstandarddirs.h> |
12 | #include <qregexp.h> | 12 | #include <qregexp.h> |
13 | #include <kglobal.h> | 13 | #include <kglobal.h> |
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | #include <qdir.h> | 15 | #include <qdir.h> |
16 | #include "kaddressbookmain.h" | 16 | #include "kaddressbookmain.h" |
17 | #include "externalapphandler.h" | 17 | #include "externalapphandler.h" |
18 | #include <libkdepim/kpimglobalprefs.h> | ||
18 | 19 | ||
19 | int main( int argc, char **argv ) | 20 | int main( int argc, char **argv ) |
20 | { | 21 | { |
21 | #ifndef DESKTOP_VERSION | 22 | #ifndef DESKTOP_VERSION |
22 | QPEApplication a( argc, argv ); | 23 | QPEApplication a( argc, argv ); |
23 | a.setKeepRunning (); | 24 | a.setKeepRunning (); |
24 | #else | 25 | #else |
25 | QApplication a( argc, argv ); | 26 | QApplication a( argc, argv ); |
@@ -68,29 +69,17 @@ int main( int argc, char **argv ) | |||
68 | 69 | ||
69 | #endif | 70 | #endif |
70 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 71 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
71 | KAddressBookMain m ; | 72 | KAddressBookMain m ; |
72 | //US MainWindow m; | 73 | //US MainWindow m; |
73 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 74 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
74 | 75 | ||
75 | { | 76 | { |
76 | KConfig kon ( locateLocal( "config", "korganizerrc" ) ); | 77 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
77 | kon.setGroup("Locale"); | ||
78 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) ); | ||
79 | QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( ""); | ||
80 | KGlobal::locale()->setHore24Format( !kon.readNumEntry( "PreferredTime",0 ) ); | ||
81 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | ||
82 | dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" ); | ||
83 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | ||
84 | kon.setGroup("Time & Date"); | ||
85 | KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ), | ||
86 | kon.readNumEntry( "DaylightsavingStart", 90), | ||
87 | kon.readNumEntry( "DaylightsavingEnd",304) ); | ||
88 | KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); | ||
89 | } | 78 | } |
90 | #ifndef DESKTOP_VERSION | 79 | #ifndef DESKTOP_VERSION |
91 | a.showMainWidget( &m ); | 80 | a.showMainWidget( &m ); |
92 | #else | 81 | #else |
93 | a.setMainWidget( &m ); | 82 | a.setMainWidget( &m ); |
94 | m.resize (640, 480 ); | 83 | m.resize (640, 480 ); |
95 | m.show(); | 84 | m.show(); |
96 | #endif | 85 | #endif |