-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 | |||
@@ -25,24 +25,25 @@ | |||
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" |
@@ -72,24 +73,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
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; |