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
@@ -247,267 +247,266 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     } else {
         filterToolBar = 0;
         filterMenubar  = 0;
         filterPopupMenu = 0;
     }
     if ( p->mShowIconOnetoolbar ) {
         viewToolBar = iconToolBar ;
         navigatorToolBar = iconToolBar ;
     } else {
 #ifndef DESKTOP_VERSION
         setToolBarsMovable( false );
 #endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpV )
                 tbd = Right;
             else
                 tbd = Left;
         }
         viewToolBar = new QPEToolBar( this );
         addToolBar (viewToolBar , tbd );
         if ( p->mToolBarHorN ) {
             if ( p->mToolBarUpN )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpN )
                 tbd = Right;
             else
                 tbd = Left;
         }
         navigatorToolBar = new QPEToolBar( this );
         addToolBar (navigatorToolBar , tbd );
     }
 
   
 
     mCalendarModifiedFlag = false;
     // QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     //splash->setAlignment ( AlignCenter );
     //setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     //showMaximized();
 #endif
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
     mCalendar = new CalendarLocal();
     mView = new CalendarView( mCalendar, this,"mCalendar " );
     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 {
         vw -= iconToolBar->height();
     }
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
             finfo.setFile( oldFile );
             if (finfo.exists() ) {
                 KMessageBox::information( this, message);
                 mView->openCalendar( oldFile );
                 qApp->processEvents();
             }
         }
         mView->saveCalendar( defaultFileName() );
         newFile = true;
     }
 
     //QTime neededSaveTime = QDateTime::currentDateTime().time();
     //mView->loadCalendars();
     //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     //qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
     }
 
 
     connect( mView, SIGNAL( tempDisableBR(bool) ),
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
     //mView->show();
     //delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     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
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
 
     setCaption(i18n("Loading calendar files ... please wait" ));
     mSaveDelay = 0;
     QTimer::singleShot( 1, this, SLOT ( loadDataAfterStart() ));
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 
 
 }
 
 void  MainWindow::loadDataAfterStart()
 {
     
     qDebug("KO: Start loading files..." );
     QTime neededSaveTime = QDateTime::currentDateTime().time();
     mView->loadCalendars();
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
     //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
     mView->setModified( false );
     mBlockAtStartup = false;
     mView->setModified( false );
     connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              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()  ));
 }
 void MainWindow::slotResetFocusLoop()
 {
     --mFocusLoop;
     QWidget* fw = mView->viewManager()->currentView();
     if ( fw ) {
         //qDebug("loop ");
         fw->setFocus();
         if ( qApp->focusWidget() != fw && mFocusLoop > 0 )
             QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop()  ));
     }
         
 }
 void MainWindow::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive();
             mBRdisabled = true;
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //makes no sense,because other cal ap is probably running
             // toggleBeamReceive(); 
         }
     }
 #endif
 
 }
 bool MainWindow::beamReceiveEnabled()
 {
 #ifndef DESKTOP_VERSION
     return ( infrared != 0 );
 #endif
     return false;
 }
 
 void MainWindow::toggleBeamReceive()
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
         qDebug("KO: Disable BeamReceive ");
         delete infrared;
         infrared = 0;
         brAction->setOn(false);
         return;
     } 
     qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
@@ -1983,130 +1982,130 @@ void MainWindow::slotModifiedChanged( bool )
         //qDebug(" MainWindow timer is running ");
         return;
     }
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     mSaveTimerStart = QDateTime::currentDateTime();
     mSaveDelay = msec/1000;
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
 void MainWindow::backupAllFiles()
 {
     QDate reference ( 2000,1,1);
     int daysTo = reference.daysTo ( QDate::currentDate() );
     setCaption(i18n("Creating backup ... please wait ..." ));
     qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
     // we need the file path, the backup dir and the number of bups as param
     QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
     if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
         bupDir = KGlobalSettings::backupDataDir();
     int retval =  KApplication::createBackup(  defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
     if ( retval == 0 ) {
         setCaption(i18n("Backup cancelled" ));
         qDebug("KO: Backup cancelled. Will try again tomorrow ");
         // retval == 0 : backup skipped for today, try again tomorrow
         KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
     } else if ( retval == 1 ){
         qDebug("KO: Backup created.");
         // backup ok
         QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
         KopiCalendarFile * cal = calendars.first();
         cal = calendars.next();
         while ( cal ) {
             if ( !cal->mErrorOnLoad ) {
                 KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
             }
             cal = calendars.next();
         }
         KOPrefs::instance()->mLastBackupDate =  daysTo;
         setCaption(i18n("Backup succesfully finished" ));
     } else if ( retval == 2 ){
         setCaption(i18n("Backup globally disabled" ));
         qDebug("KO: Backup globally cancelled.");
         // backup globally cancelled
         KPimGlobalPrefs::instance()->mBackupEnabled = false;
     }
     // retval == 3: do nothing, try again later
 }
 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() )
         mView->viewManager()->journalView()->checkModified();
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() ) {
         slotModifiedChanged( true );
         return;
     }
     mSaveDelay = 0;
     mSyncManager->setBlockSave(true);
     if ( mView->checkAllFileVersions() ) {
         if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
             QDate reference ( 2000,1,1);
             int daysTo = reference.daysTo ( QDate::currentDate() );
             if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
                 backupAllFiles();
             }
             ; //  KPimGlobalPrefs::instance()->mLastBackupDate
         }
         QTime neededSaveTime;
         neededSaveTime.start();
         if ( !isMinimized () )
             setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         if ( mView->saveCalendars() )
             mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.elapsed();
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         if ( !isMinimized () )
             setCaption(savemes);
         else
             qDebug(savemes);
     } else {
         setCaption(i18n("Saving cancelled!"));
         mCalendarModifiedFlag = false;
         slotModifiedChanged( true );
     }
     mSyncManager->setBlockSave( false );
 }
 
 void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;