fixx

1 files changed, 7 insertions, 0 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7ce0251..45775c5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1890,192 +1890,193 @@ void MainWindow::saveOnClose()
     if (  p->mToolBarHor )
         p->mToolBarUp = iconToolBar->y() > height()/2;
     else
         p->mToolBarUp = iconToolBar->x() > width()/2;
     if ( p->mToolBarHorV )
         p->mToolBarUpV = viewToolBar->y() > height()/2;
     else
         p->mToolBarUpV = viewToolBar->x() > width()/2 ;
     
     if ( p->mToolBarHorN )
         p->mToolBarUpN = navigatorToolBar->y() > height()/2;
     else
         p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
     if ( filterToolBar ) {
         if ( p->mToolBarHorF )
             p->mToolBarUpF = filterToolBar->y() > height()/2;
         else
             p->mToolBarUpF = filterToolBar->x() > width()/2 ;
     }
 #endif
     save();
     mView->writeSettings();
     mView->checkSuspendAlarm();
 }
 void MainWindow::slotModifiedChanged( bool )
 {
     if ( mBlockAtStartup )
         return;
    
     int msec;
     if ( mCalendarModifiedFlag ) {
         //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
     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 ( mView->viewManager()->journalView() )
         mView->viewManager()->journalView()->checkModified();
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() ) {
+        slotModifiedChanged( true );
         return;
     }
     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 = QDateTime::currentDateTime().time();
         if ( !isMinimized () )
             setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->saveCalendars();
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         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;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     KOPrefs *p = KOPrefs::instance();
     bool showSelectedDates = false;
     int size;
     int pro = 0;
     //qDebug("MainWindow::keyPressEvent ");
     switch ( e->key() ) {
     case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->goNextMonth();
         else
             mView->goNext();
         showSelectedDates = true;
         break;
     case Qt::Key_Left:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->goPreviousMonth();
         else
             mView->goPrevious();
         showSelectedDates = true;
         break;
     case Qt::Key_Down:
         mView->viewManager()->agendaView()->scrollOneHourDown();
         break;
     case Qt::Key_Up:
         mView->viewManager()->agendaView()->scrollOneHourUp();
         break;
     case Qt::Key_K:
         mView->viewManager()->showMonthViewWeek();
         break;
     case Qt::Key_I:
         mView->showIncidence();
         break;
     case Qt::Key_Delete:
     case Qt::Key_Backspace:
         mView->deleteIncidence();
         break;
     case Qt::Key_D:
         mView->viewManager()->showDayView();
         showSelectedDates = true;
         break;
     case Qt::Key_O:
         mView->toggleFilerEnabled( );
         break;
     case Qt::Key_0:
     case Qt::Key_1:
     case Qt::Key_2:
@@ -2466,199 +2467,205 @@ void  MainWindow::loadCalendar()
     if ( loadbup ) {
         mView->openCalendar( fn );
         KOPrefs::instance()->mLastLoadFile = fn;
         mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
         setCaption(mess);
     }
 #endif
 
 }
 void  MainWindow::quickImportIcal()
 {
     importFile( KOPrefs::instance()->mLastImportFile, false );
 }
 void MainWindow::importFile( QString  fn, bool quick )
 {
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     if ( !info. exists() ) {
         mess =  i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
         QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                            mess );
         return;
     }
     int result = 0;
     if ( !quick ) {
         mess = i18n(  "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( this, "KO/Pi: Warning!",
                                        mess,
                                        "Import", "Cancel", 0,
                                        0, 1 );
     }
     if ( result == 0 ) {
         if ( mView->openCalendar( fn, true )) {
             KOPrefs::instance()->mLastImportFile = fn;
             setCaption(i18n("Imported file successfully"));
         } else {
             setCaption(i18n("Error importing file"));
         }
     }
 }
 
 void   MainWindow::importIcal()
 {
 
     QString fn =KOPrefs::instance()->mLastImportFile;
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     importFile(  fn, true );
 
 }
 
 void MainWindow::exportVCalendar()
 {
     QString fn =  KOPrefs::instance()->mLastVcalFile;
     fn =  KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mes;
     bool createbup = true;
     if ( info. exists() ) {
         mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                            i18n("Overwrite!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             createbup = false;
         }
     }
     if ( createbup ) {
         if ( mView->exportVCalendar( fn ) ) {
             KOPrefs::instance()->mLastVcalFile = fn;
             if ( fn.length() > 20 )
                 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
             else
                 mes = i18n("KO/Pi:Exported to %1").arg(fn );
             setCaption(mes);
         }
     }
 
 }
 QString MainWindow::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "copysynccal.ics" );
 #else
     return QString( "/tmp/copysynccal.ics" );
 #endif 
 }
 
 void MainWindow::syncFileRequest()
 {
+    while ( mSyncManager->blockSave() ) {
+        qApp->processEvents(); 
+    }
+    mSyncManager->setBlockSave(true);
+
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
 
     setCaption(i18n("Saving Data to temp file ..." ));
     mView->saveCalendar( sentSyncFile() );
     setCaption(i18n("Data saved to temp file!" ));
+    mSyncManager->setBlockSave( false );
 
 }
 void MainWindow::getFile( bool success )
 {
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     mView->mergeFile( sentSyncFile() ); 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
     setCaption( i18n("Pi-Sync successful!") );
 } 
 void MainWindow::printListView()
 {
     
     QString message = i18n("You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.");
     
     KMessageBox::information( this, message);
 }
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
 
 
 #include "libkdepim/kdatepicker.h"
 #include <kdatetbl.h>
 
 void MainWindow::weekAction()
 {
     int month;
     KPopupFrame* popup = new KPopupFrame(this);
     KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
     // -----
     picker->resize(picker->sizeHint());
     popup->setMainWidget(picker);
     picker->setFocus();
     connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
     int x = 0;
     int y = iconToolBar->height();
     int dX = 0;
     int dY = 0;
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         if ( iconToolBar->y() > height()/2 ) {
             dY = picker->sizeHint().height()+8;
             y = 0;
         }
     } else {
         if ( iconToolBar->x() > width()/2 ) { // right side
             x=0;
             dX= picker->sizeHint().width()+8;
             y = 0;
         } else {
             x= iconToolBar->width();
             y = 0;
         }
     }
     //qDebug("dax %d  dy %d         %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
     if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
         {
             month = picker->getResult();
             emit selectWeek ( month );
             //qDebug("weekSelected %d ", month);
         }
     delete popup;
 }
   
 void  MainWindow::hideEvent ( QHideEvent * )
 {
     QString message; 
     QDateTime nextA = mCalendar->nextAlarmEventDateTime();
     if ( nextA.isValid() ) {
         QString sum = mCalendar->nextSummary();   
         
         message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
         setCaption( message );
     } 
 }
 
 void MainWindow::resizeEvent( QResizeEvent* e)
 {
 #ifndef DESKTOP_VERSION
     if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
         if (QApplication::desktop()->width() > QApplication::desktop()->height()  )
             filterToolBar->hide();
         else
             filterToolBar->show();
     }
 #endif