summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1338224..377a66f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1855,10 +1855,6 @@ bool CalendarView::loadCalendars()
cal = calendars.next();
}
restoreCalendarSettings();
- mCalendar->reInitAlarmSettings();
- setSyncEventsReadOnly();
- updateUnmanagedViews();
- updateView();
return true;
}
bool CalendarView::restoreCalendarSettings()
@@ -1873,6 +1869,10 @@ bool CalendarView::restoreCalendarSettings()
mCalendar->setDefaultCalendar( cal->mCalNumber );
cal = calendars.next();
}
+ setSyncEventsReadOnly();
+ mCalendar->reInitAlarmSettings();
+ updateUnmanagedViews();
+ updateView();
return true;
}
void CalendarView::addCalendarId( int id )
@@ -1995,25 +1995,28 @@ bool CalendarView::checkAllFileVersions()
KopiCalendarFile * cal = calendars.first();
mCalendar->setDefaultCalendar( 1 );
mCalendar->setDefaultCalendarEnabledOnly();
- if ( !checkFileVersion(MainWindow::defaultFileName()))
- return false;
+ if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
+ if ( !checkFileVersion(MainWindow::defaultFileName())) {
+ restoreCalendarSettings();
+ return false;
+ }
+ }
cal = calendars.next();
QDateTime storeTemp = loadedFileVersion;
while ( cal ) {
- if ( !cal->mErrorOnLoad ) {
+ if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
mCalendar->setDefaultCalendar( cal->mCalNumber );
mCalendar->setDefaultCalendarEnabledOnly();
loadedFileVersion = cal->mLoadDt.addSecs( 15 );
if ( !checkFileVersion(cal->mFileName )) {
loadedFileVersion = storeTemp;
- updateView();
+ restoreCalendarSettings();
return false;
}
}
cal = calendars.next();
}
loadedFileVersion = storeTemp;
- updateView();
return true;
}
bool CalendarView::checkFileVersion(QString fn)
@@ -2022,8 +2025,8 @@ bool CalendarView::checkFileVersion(QString fn)
if ( !finf.exists() )
return true;
QDateTime dt = finf.lastModified ();
- //qDebug("loaded file version %s",loadedFileVersion.toString().latin1());
- //qDebug("file on disk version %s",dt.toString().latin1());
+ qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
+ qDebug("file on disk version %s %s", fn.latin1(),dt.toString().latin1());
if ( dt <= loadedFileVersion )
return true;
int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\n on disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(fn).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,