author | zautrix <zautrix> | 2005-09-19 00:01:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-09-19 00:01:34 (UTC) |
commit | d73247ed44cab687a0d94a96ea7b3cf604b80ba0 (patch) (unidiff) | |
tree | 7e72ac8e0239163cfec8df67c0053e0cb3a8dd2f | |
parent | 2d346e4052fd726e657daee4ac3f2bcc7103f5fb (diff) | |
download | kdepimpi-d73247ed44cab687a0d94a96ea7b3cf604b80ba0.zip kdepimpi-d73247ed44cab687a0d94a96ea7b3cf604b80ba0.tar.gz kdepimpi-d73247ed44cab687a0d94a96ea7b3cf604b80ba0.tar.bz2 |
wn
-rw-r--r-- | korganizer/mainwindow.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fb0b4ad..1776dcc 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -400,70 +400,67 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
400 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 400 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
401 | mBRdisabled = false; | 401 | mBRdisabled = false; |
402 | //toggleBeamReceive(); | 402 | //toggleBeamReceive(); |
403 | 403 | ||
404 | setCaption(i18n("Loading calendar files ... please wait" )); | 404 | setCaption(i18n("Loading calendar files ... please wait" )); |
405 | mSaveDelay = 0; | 405 | mSaveDelay = 0; |
406 | QTimer::singleShot( 1, this, SLOT ( loadDataAfterStart() )); | 406 | QTimer::singleShot( 1, this, SLOT ( loadDataAfterStart() )); |
407 | } | 407 | } |
408 | MainWindow::~MainWindow() | 408 | MainWindow::~MainWindow() |
409 | { | 409 | { |
410 | //qDebug("MainWindow::~MainWindow() "); | 410 | //qDebug("MainWindow::~MainWindow() "); |
411 | //save toolbar location | 411 | //save toolbar location |
412 | delete mCalendar; | 412 | delete mCalendar; |
413 | delete mSyncManager; | 413 | delete mSyncManager; |
414 | #ifndef DESKTOP_VERSION | 414 | #ifndef DESKTOP_VERSION |
415 | if ( infrared ) | 415 | if ( infrared ) |
416 | delete infrared; | 416 | delete infrared; |
417 | #endif | 417 | #endif |
418 | 418 | ||
419 | 419 | ||
420 | } | 420 | } |
421 | 421 | ||
422 | void MainWindow::loadDataAfterStart() | 422 | void MainWindow::loadDataAfterStart() |
423 | { | 423 | { |
424 | |||
425 | qDebug("KO: Start loading files..." ); | 424 | qDebug("KO: Start loading files..." ); |
426 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 425 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
427 | mView->loadCalendars(); | 426 | mView->loadCalendars(); |
428 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 427 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
429 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 428 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
430 | //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); | 429 | //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); |
431 | mView->setModified( false ); | 430 | mView->setModified( false ); |
432 | mBlockAtStartup = false; | 431 | mBlockAtStartup = false; |
433 | mView->setModified( false ); | 432 | mView->setModified( false ); |
434 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); | 433 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); |
435 | processIncidenceSelection( 0 ); | 434 | processIncidenceSelection( 0 ); |
436 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 435 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
437 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 436 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
438 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 437 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
439 | SLOT( slotModifiedChanged( bool ) ) ); | 438 | SLOT( slotModifiedChanged( bool ) ) ); |
440 | |||
441 | #ifndef DESKTOP_VERSION | 439 | #ifndef DESKTOP_VERSION |
442 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 440 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
443 | connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); | 441 | connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); |
444 | disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); | 442 | disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); |
445 | ((QPEApplication*) qApp)->showMainWidget( this ); | ||
446 | if ( !mCStringMess.isEmpty() ) | 443 | if ( !mCStringMess.isEmpty() ) |
447 | recieve( mCStringMess, mByteData ); | 444 | recieve( mCStringMess, mByteData ); |
448 | #endif | 445 | #endif |
449 | QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); | 446 | QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); |
450 | } | 447 | } |
451 | 448 | ||
452 | void MainWindow::slotResetFocus() | 449 | void MainWindow::slotResetFocus() |
453 | { | 450 | { |
454 | //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); | 451 | //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); |
455 | mFocusLoop = 3; | 452 | mFocusLoop = 3; |
456 | QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); | 453 | QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); |
457 | } | 454 | } |
458 | void MainWindow::slotResetFocusLoop() | 455 | void MainWindow::slotResetFocusLoop() |
459 | { | 456 | { |
460 | --mFocusLoop; | 457 | --mFocusLoop; |
461 | QWidget* fw = mView->viewManager()->currentView(); | 458 | QWidget* fw = mView->viewManager()->currentView(); |
462 | if ( fw ) { | 459 | if ( fw ) { |
463 | //qDebug("loop "); | 460 | //qDebug("loop "); |
464 | fw->setFocus(); | 461 | fw->setFocus(); |
465 | if ( qApp->focusWidget() != fw && mFocusLoop > 0 ) | 462 | if ( qApp->focusWidget() != fw && mFocusLoop > 0 ) |
466 | QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); | 463 | QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); |
467 | } | 464 | } |
468 | 465 | ||
469 | } | 466 | } |