-rw-r--r-- | korganizer/mainwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 30c0d2f..8daacc7 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -228,96 +228,97 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
228 | if ( KOPrefs::instance()->mLanguageChanged ) { | 228 | if ( KOPrefs::instance()->mLanguageChanged ) { |
229 | KOPrefs::instance()->setCategoryDefaults(); | 229 | KOPrefs::instance()->setCategoryDefaults(); |
230 | int count = mView->addCategories(); | 230 | int count = mView->addCategories(); |
231 | KOPrefs::instance()->mLanguageChanged = false; | 231 | KOPrefs::instance()->mLanguageChanged = false; |
232 | } | 232 | } |
233 | processIncidenceSelection( 0 ); | 233 | processIncidenceSelection( 0 ); |
234 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 234 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
235 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 235 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
236 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 236 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
237 | SLOT( slotModifiedChanged( bool ) ) ); | 237 | SLOT( slotModifiedChanged( bool ) ) ); |
238 | 238 | ||
239 | 239 | ||
240 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 240 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
241 | mView->setModified( false ); | 241 | mView->setModified( false ); |
242 | mBlockAtStartup = false; | 242 | mBlockAtStartup = false; |
243 | mView->setModified( false ); | 243 | mView->setModified( false ); |
244 | setCentralWidget( mView ); | 244 | setCentralWidget( mView ); |
245 | globalFlagBlockStartup = 0; | 245 | globalFlagBlockStartup = 0; |
246 | mView->show(); | 246 | mView->show(); |
247 | delete splash; | 247 | delete splash; |
248 | if ( newFile ) | 248 | if ( newFile ) |
249 | mView->updateConfig(); | 249 | mView->updateConfig(); |
250 | // qApp->processEvents(); | 250 | // qApp->processEvents(); |
251 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 251 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
252 | //fillSyncMenu(); | 252 | //fillSyncMenu(); |
253 | 253 | ||
254 | 254 | ||
255 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 255 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
256 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 256 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
257 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 257 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
258 | mSyncManager->setDefaultFileName( defaultFileName()); | 258 | mSyncManager->setDefaultFileName( defaultFileName()); |
259 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 259 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
260 | mSyncManager->fillSyncMenu(); | 260 | mSyncManager->fillSyncMenu(); |
261 | 261 | ||
262 | 262 | ||
263 | 263 | ||
264 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 264 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
265 | if ( showWarning ) { | 265 | if ( showWarning ) { |
266 | KMessageBox::information( this, | 266 | KMessageBox::information( this, |
267 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 267 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
268 | qApp->processEvents(); | 268 | qApp->processEvents(); |
269 | mView->dialogManager()->showSyncOptions(); | 269 | mView->dialogManager()->showSyncOptions(); |
270 | } | 270 | } |
271 | 271 | ||
272 | //US listen for result adressed from Ka/Pi | 272 | //US listen for result adressed from Ka/Pi |
273 | #ifndef DESKTOP_VERSION | 273 | #ifndef DESKTOP_VERSION |
274 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 274 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
275 | #endif | 275 | #endif |
276 | |||
276 | } | 277 | } |
277 | MainWindow::~MainWindow() | 278 | MainWindow::~MainWindow() |
278 | { | 279 | { |
279 | //qDebug("MainWindow::~MainWindow() "); | 280 | //qDebug("MainWindow::~MainWindow() "); |
280 | //save toolbar location | 281 | //save toolbar location |
281 | delete mCalendar; | 282 | delete mCalendar; |
282 | delete mSyncManager; | 283 | delete mSyncManager; |
283 | 284 | ||
284 | 285 | ||
285 | } | 286 | } |
286 | void MainWindow::showMaximized () | 287 | void MainWindow::showMaximized () |
287 | { | 288 | { |
288 | #ifndef DESKTOP_VERSION | 289 | #ifndef DESKTOP_VERSION |
289 | if ( ! globalFlagBlockStartup ) | 290 | if ( ! globalFlagBlockStartup ) |
290 | if ( mClosed ) | 291 | if ( mClosed ) |
291 | mView->goToday(); | 292 | mView->goToday(); |
292 | #endif | 293 | #endif |
293 | QWidget::showMaximized () ; | 294 | QWidget::showMaximized () ; |
294 | mClosed = false; | 295 | mClosed = false; |
295 | } | 296 | } |
296 | void MainWindow::closeEvent( QCloseEvent* ce ) | 297 | void MainWindow::closeEvent( QCloseEvent* ce ) |
297 | { | 298 | { |
298 | 299 | ||
299 | 300 | ||
300 | 301 | ||
301 | if ( ! KOPrefs::instance()->mAskForQuit ) { | 302 | if ( ! KOPrefs::instance()->mAskForQuit ) { |
302 | saveOnClose(); | 303 | saveOnClose(); |
303 | mClosed = true; | 304 | mClosed = true; |
304 | ce->accept(); | 305 | ce->accept(); |
305 | return; | 306 | return; |
306 | 307 | ||
307 | } | 308 | } |
308 | 309 | ||
309 | switch( QMessageBox::information( this, "KO/Pi", | 310 | switch( QMessageBox::information( this, "KO/Pi", |
310 | i18n("Do you really want\nto close KO/Pi?"), | 311 | i18n("Do you really want\nto close KO/Pi?"), |
311 | i18n("Close"), i18n("No"), | 312 | i18n("Close"), i18n("No"), |
312 | 0, 0 ) ) { | 313 | 0, 0 ) ) { |
313 | case 0: | 314 | case 0: |
314 | saveOnClose(); | 315 | saveOnClose(); |
315 | mClosed = true; | 316 | mClosed = true; |
316 | ce->accept(); | 317 | ce->accept(); |
317 | break; | 318 | break; |
318 | case 1: | 319 | case 1: |
319 | ce->ignore(); | 320 | ce->ignore(); |
320 | break; | 321 | break; |
321 | case 2: | 322 | case 2: |
322 | 323 | ||
323 | default: | 324 | default: |