summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-29 21:08:59 (UTC)
committer zautrix <zautrix>2005-07-29 21:08:59 (UTC)
commit9cbd19485635dc0edacd14403e4c63d6d469bfce (patch) (side-by-side diff)
treeb3d5a580428ac4ed0b0a7b92149438baf8a66846 /korganizer
parente287df45507793e2e5ad16085a858153f3798941 (diff)
downloadkdepimpi-9cbd19485635dc0edacd14403e4c63d6d469bfce.zip
kdepimpi-9cbd19485635dc0edacd14403e4c63d6d469bfce.tar.gz
kdepimpi-9cbd19485635dc0edacd14403e4c63d6d469bfce.tar.bz2
fixx
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp7
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
@@ -1974,24 +1974,25 @@ void MainWindow::backupAllFiles()
// 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
}
@@ -2550,31 +2551,37 @@ void MainWindow::exportVCalendar()
}
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 );
}