-rw-r--r-- | korganizer/calendarview.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3635cfa..eaea040 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1511,13 +1511,13 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1511 | // if ( getLastSyncEvent() ) | 1511 | // if ( getLastSyncEvent() ) |
1512 | // getLastSyncEvent()->setReadOnly( true ); | 1512 | // getLastSyncEvent()->setReadOnly( true ); |
1513 | mCalendar->reInitAlarmSettings(); | 1513 | mCalendar->reInitAlarmSettings(); |
1514 | setSyncEventsReadOnly(); | 1514 | setSyncEventsReadOnly(); |
1515 | updateUnmanagedViews(); | 1515 | updateUnmanagedViews(); |
1516 | updateView(); | 1516 | updateView(); |
1517 | if ( filename != MainWindow::defaultFileName() ) | 1517 | if ( filename != MainWindow::defaultFileName() ) |
1518 | saveCalendar( MainWindow::defaultFileName() ); | 1518 | saveCalendar( MainWindow::defaultFileName() ); |
1519 | loadedFileVersion = QDateTime::currentDateTime(); | 1519 | loadedFileVersion = QDateTime::currentDateTime(); |
1520 | return true; | 1520 | return true; |
1521 | } else { | 1521 | } else { |
1522 | // while failing to load, the calendar object could | 1522 | // while failing to load, the calendar object could |
1523 | // have become partially populated. Clear it out. | 1523 | // have become partially populated. Clear it out. |
@@ -1542,23 +1542,36 @@ bool CalendarView::checkFileChanged(QString fn) | |||
1542 | QDateTime dt = finf.lastModified (); | 1542 | QDateTime dt = finf.lastModified (); |
1543 | if ( dt <= loadedFileVersion ) | 1543 | if ( dt <= loadedFileVersion ) |
1544 | return false; | 1544 | return false; |
1545 | return true; | 1545 | return true; |
1546 | 1546 | ||
1547 | } | 1547 | } |
1548 | void CalendarView::watchSavedFile() | ||
1549 | { | ||
1550 | QFileInfo finf ( MainWindow::defaultFileName()); | ||
1551 | if ( !finf.exists() ) | ||
1552 | return; | ||
1553 | QDateTime dt = finf.lastModified (); | ||
1554 | if ( dt < loadedFileVersion ) { | ||
1555 | QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile() ) ); | ||
1556 | return; | ||
1557 | } | ||
1558 | loadedFileVersion = dt; | ||
1559 | } | ||
1560 | |||
1548 | bool CalendarView::checkFileVersion(QString fn) | 1561 | bool CalendarView::checkFileVersion(QString fn) |
1549 | { | 1562 | { |
1550 | QFileInfo finf ( fn ); | 1563 | QFileInfo finf ( fn ); |
1551 | if ( !finf.exists() ) | 1564 | if ( !finf.exists() ) |
1552 | return true; | 1565 | return true; |
1553 | QDateTime dt = finf.lastModified (); | 1566 | QDateTime dt = finf.lastModified (); |
1554 | //qDebug("loaded file version %s",loadedFileVersion.toString().latin1()); | 1567 | //qDebug("loaded file version %s",loadedFileVersion.toString().latin1()); |
1555 | //qDebug("file on disk version %s",dt.toString().latin1()); | 1568 | //qDebug("file on disk version %s",dt.toString().latin1()); |
1556 | if ( dt <= loadedFileVersion ) | 1569 | if ( dt <= loadedFileVersion ) |
1557 | return true; | 1570 | return true; |
1558 | int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, false)) , | 1571 | int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) , |
1559 | i18n("KO/Pi Warning"),i18n("Overwrite"), | 1572 | i18n("KO/Pi Warning"),i18n("Overwrite"), |
1560 | i18n("Sync+save")); | 1573 | i18n("Sync+save")); |
1561 | 1574 | ||
1562 | if ( km == KMessageBox::Cancel ) | 1575 | if ( km == KMessageBox::Cancel ) |
1563 | return false; | 1576 | return false; |
1564 | if ( km == KMessageBox::Yes ) | 1577 | if ( km == KMessageBox::Yes ) |