-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 1c74307..348dd5e 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -132,6 +132,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
132 | QMainWindow( parent, name ) | 132 | QMainWindow( parent, name ) |
133 | { | 133 | { |
134 | 134 | ||
135 | |||
135 | #ifdef DESKTOP_VERSION | 136 | #ifdef DESKTOP_VERSION |
136 | setFont( QFont("Arial"), 14 ); | 137 | setFont( QFont("Arial"), 14 ); |
137 | #endif | 138 | #endif |
@@ -143,9 +144,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
143 | setIcon(SmallIcon( "ko24" ) ); | 144 | setIcon(SmallIcon( "ko24" ) ); |
144 | mBlockAtStartup = true; | 145 | mBlockAtStartup = true; |
145 | mFlagKeyPressed = false; | 146 | mFlagKeyPressed = false; |
146 | setCaption("KOrganizer/Pi"); | ||
147 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
148 | KOPrefs *p = KOPrefs::instance(); | 147 | KOPrefs *p = KOPrefs::instance(); |
148 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
149 | if ( p->mHourSize > 18 ) | 149 | if ( p->mHourSize > 18 ) |
150 | p->mHourSize = 18; | 150 | p->mHourSize = 18; |
151 | QMainWindow::ToolBarDock tbd; | 151 | QMainWindow::ToolBarDock tbd; |
@@ -168,12 +168,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
168 | addToolBar (iconToolBar , tbd ); | 168 | addToolBar (iconToolBar , tbd ); |
169 | mCalendarModifiedFlag = false; | 169 | mCalendarModifiedFlag = false; |
170 | 170 | ||
171 | setCaption("KOrganizer/Pi"); | ||
171 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 172 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
172 | splash->setAlignment ( AlignCenter ); | 173 | splash->setAlignment ( AlignCenter ); |
173 | setCentralWidget( splash ); | 174 | setCentralWidget( splash ); |
174 | #ifndef DESKTOP_VERSION | 175 | #ifndef DESKTOP_VERSION |
175 | showMaximized(); | 176 | showMaximized(); |
176 | #endif | 177 | #endif |
178 | |||
177 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); | 179 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); |
178 | setDefaultPreferences(); | 180 | setDefaultPreferences(); |
179 | mCalendar = new CalendarLocal(); | 181 | mCalendar = new CalendarLocal(); |
@@ -231,7 +233,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
231 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 233 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
232 | 234 | ||
233 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { | 235 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { |
234 | KOPrefs::instance()->setCategoryDefaults(); | 236 | KOPrefs::instance()->setAllDefaults(); |
235 | int count = mView->addCategories(); | 237 | int count = mView->addCategories(); |
236 | } | 238 | } |
237 | processIncidenceSelection( 0 ); | 239 | processIncidenceSelection( 0 ); |