author | zautrix <zautrix> | 2004-09-22 03:08:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 03:08:05 (UTC) |
commit | d63eac7a612a9724705bc58ad98c65c6ac052d07 (patch) (unidiff) | |
tree | dc584a0ddcbd5f828ea36b86b6af640e46e137f2 /korganizer/mainwindow.cpp | |
parent | 633522024e48efc423155a04b71083a03696211d (diff) | |
download | kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.zip kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.tar.gz kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.tar.bz2 |
connected global config
-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b597a6a..1c4a186 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -13,95 +13,97 @@ | |||
13 | #include <qlabel.h> | 13 | #include <qlabel.h> |
14 | #include <qmap.h> | 14 | #include <qmap.h> |
15 | #include <qwmatrix.h> | 15 | #include <qwmatrix.h> |
16 | #include <qtextbrowser.h> | 16 | #include <qtextbrowser.h> |
17 | #include <qtextstream.h> | 17 | #include <qtextstream.h> |
18 | #ifndef DESKTOP_VERSION | 18 | #ifndef DESKTOP_VERSION |
19 | #include <qpe/global.h> | 19 | #include <qpe/global.h> |
20 | #include <qpe/qpemenubar.h> | 20 | #include <qpe/qpemenubar.h> |
21 | #include <qpe/qpetoolbar.h> | 21 | #include <qpe/qpetoolbar.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qtopia/alarmserver.h> | 24 | #include <qtopia/alarmserver.h> |
25 | #include <qtopia/qcopenvelope_qws.h> | 25 | #include <qtopia/qcopenvelope_qws.h> |
26 | #else | 26 | #else |
27 | #include <qmenubar.h> | 27 | #include <qmenubar.h> |
28 | #include <qtoolbar.h> | 28 | #include <qtoolbar.h> |
29 | #include <qapplication.h> | 29 | #include <qapplication.h> |
30 | //#include <resource.h> | 30 | //#include <resource.h> |
31 | 31 | ||
32 | #endif | 32 | #endif |
33 | #include <libkcal/calendarlocal.h> | 33 | #include <libkcal/calendarlocal.h> |
34 | #include <libkcal/todo.h> | 34 | #include <libkcal/todo.h> |
35 | #include <libkdepim/ksyncprofile.h> | 35 | #include <libkdepim/ksyncprofile.h> |
36 | #include <libkcal/kincidenceformatter.h> | 36 | #include <libkcal/kincidenceformatter.h> |
37 | #include <libkdepim/kpimglobalprefs.h> | ||
37 | 38 | ||
38 | #include "calendarview.h" | 39 | #include "calendarview.h" |
39 | #include "koviewmanager.h" | 40 | #include "koviewmanager.h" |
40 | #include "datenavigator.h" | 41 | #include "datenavigator.h" |
41 | #include "koagendaview.h" | 42 | #include "koagendaview.h" |
42 | #include "koagenda.h" | 43 | #include "koagenda.h" |
43 | #include "kodialogmanager.h" | 44 | #include "kodialogmanager.h" |
44 | #include "kdialogbase.h" | 45 | #include "kdialogbase.h" |
45 | #include "kapplication.h" | 46 | #include "kapplication.h" |
46 | #include "kofilterview.h" | 47 | #include "kofilterview.h" |
47 | #include "kstandarddirs.h" | 48 | #include "kstandarddirs.h" |
48 | #include "koprefs.h" | 49 | #include "koprefs.h" |
49 | #include "kfiledialog.h" | 50 | #include "kfiledialog.h" |
50 | #include "koglobals.h" | 51 | #include "koglobals.h" |
51 | #include "kglobal.h" | 52 | #include "kglobal.h" |
52 | #include "klocale.h" | 53 | #include "klocale.h" |
53 | #include "kconfig.h" | 54 | #include "kconfig.h" |
54 | #include "simplealarmclient.h" | 55 | #include "simplealarmclient.h" |
55 | #include "externalapphandler.h" | 56 | #include "externalapphandler.h" |
56 | 57 | ||
57 | using namespace KCal; | 58 | using namespace KCal; |
58 | #ifndef _WIN32_ | 59 | #ifndef _WIN32_ |
59 | #include <unistd.h> | 60 | #include <unistd.h> |
60 | #else | 61 | #else |
61 | #include "koimportoldialog.h" | 62 | #include "koimportoldialog.h" |
62 | #endif | 63 | #endif |
63 | #include "mainwindow.h" | 64 | #include "mainwindow.h" |
64 | 65 | ||
65 | int globalFlagBlockStartup; | 66 | int globalFlagBlockStartup; |
66 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 67 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
67 | QMainWindow( parent, name ) | 68 | QMainWindow( parent, name ) |
68 | { | 69 | { |
69 | 70 | ||
70 | #ifdef DESKTOP_VERSION | 71 | #ifdef DESKTOP_VERSION |
71 | setFont( QFont("Arial"), 14 ); | 72 | setFont( QFont("Arial"), 14 ); |
72 | #endif | 73 | #endif |
73 | 74 | ||
74 | mClosed = false; | 75 | mClosed = false; |
75 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 76 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
76 | QString confFile = locateLocal("config","korganizerrc"); | 77 | QString confFile = locateLocal("config","korganizerrc"); |
77 | QFileInfo finf ( confFile ); | 78 | QFileInfo finf ( confFile ); |
78 | bool showWarning = !finf.exists(); | 79 | bool showWarning = !finf.exists(); |
79 | setIcon(SmallIcon( "ko24" ) ); | 80 | setIcon(SmallIcon( "ko24" ) ); |
80 | mBlockAtStartup = true; | 81 | mBlockAtStartup = true; |
81 | mFlagKeyPressed = false; | 82 | mFlagKeyPressed = false; |
82 | setCaption("KOrganizer/Pi"); | 83 | setCaption("KOrganizer/Pi"); |
83 | KOPrefs *p = KOPrefs::instance(); | 84 | KOPrefs *p = KOPrefs::instance(); |
85 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
84 | // if ( QApplication::desktop()->height() > 480 ) { | 86 | // if ( QApplication::desktop()->height() > 480 ) { |
85 | // if ( p->mHourSize == 4 ) | 87 | // if ( p->mHourSize == 4 ) |
86 | // p->mHourSize = 6; | 88 | // p->mHourSize = 6; |
87 | // } | 89 | // } |
88 | if ( p->mHourSize > 18 ) | 90 | if ( p->mHourSize > 18 ) |
89 | p->mHourSize = 18; | 91 | p->mHourSize = 18; |
90 | QMainWindow::ToolBarDock tbd; | 92 | QMainWindow::ToolBarDock tbd; |
91 | if ( p->mToolBarHor ) { | 93 | if ( p->mToolBarHor ) { |
92 | if ( p->mToolBarUp ) | 94 | if ( p->mToolBarUp ) |
93 | tbd = Bottom; | 95 | tbd = Bottom; |
94 | else | 96 | else |
95 | tbd = Top; | 97 | tbd = Top; |
96 | } | 98 | } |
97 | else { | 99 | else { |
98 | if ( p->mToolBarUp ) | 100 | if ( p->mToolBarUp ) |
99 | tbd = Right; | 101 | tbd = Right; |
100 | else | 102 | else |
101 | tbd = Left; | 103 | tbd = Left; |
102 | } | 104 | } |
103 | if ( KOPrefs::instance()->mUseAppColors ) | 105 | if ( KOPrefs::instance()->mUseAppColors ) |
104 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 106 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
105 | globalFlagBlockStartup = 1; | 107 | globalFlagBlockStartup = 1; |
106 | iconToolBar = new QPEToolBar( this ); | 108 | iconToolBar = new QPEToolBar( this ); |
107 | addToolBar (iconToolBar , tbd ); | 109 | addToolBar (iconToolBar , tbd ); |