| -rw-r--r-- | korganizer/mainwindow.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 98d3e35..fb0b4ad 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -303,18 +303,18 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : setCentralWidget( mView ); //mView->hide(); //mView->resize(splash->size() ); initActions(); mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); mSyncManager->setBlockSave(false); mView->setSyncManager(mSyncManager); #ifndef DESKTOP_VERSION - iconToolBar->show(); - qApp->processEvents(); + //iconToolBar->show(); + //qApp->processEvents(); #endif //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); int vh = height() ; int vw = width(); //qDebug("Toolbar hei %d ",iconToolBar->height() ); if ( iconToolBar->orientation () == Qt:: Horizontal ) { vh -= iconToolBar->height(); } else { @@ -380,17 +380,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : mSyncManager->fillSyncMenu(); mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); if ( showWarning ) { KMessageBox::information( this, "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"); - qApp->processEvents(); + //qApp->processEvents(); mView->dialogManager()->showSyncOptions(); } //US listen for result adressed from Ka/Pi #ifndef DESKTOP_VERSION infrared = 0; #endif @@ -437,21 +437,20 @@ void MainWindow::loadDataAfterStart() SLOT( processIncidenceSelection( Incidence * ) ) ); connect( mView, SIGNAL( modifiedChanged( bool ) ), SLOT( slotModifiedChanged( bool ) ) ); #ifndef DESKTOP_VERSION connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); + ((QPEApplication*) qApp)->showMainWidget( this ); if ( !mCStringMess.isEmpty() ) recieve( mCStringMess, mByteData ); #endif - - QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); } void MainWindow::slotResetFocus() { //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); mFocusLoop = 3; QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); @@ -2039,18 +2038,18 @@ void MainWindow::backupAllFiles() } void MainWindow::save() { if ( mSaveDelay ) { int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() ); if ( mSaveDelay < elapsed ) { qDebug("KO: Pending save after wakeup from suspend detected."); qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); - qDebug("KO: Restarting save timer to save in 15 sec."); - int msec = 15000; + qDebug("KO: Restarting save timer to save in 10 sec."); + int msec = 10000; mSaveTimer.start( msec, true ); mSaveTimerStart = QDateTime::currentDateTime(); mSaveDelay = msec/1000; return; } } if ( mView->viewManager()->journalView() ) |