-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 904bbe2..a8ad467 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1637,50 +1637,52 @@ bool CalendarView::importQtopia( const QString &categories, | |||
1637 | void CalendarView::setSyncEventsReadOnly() | 1637 | void CalendarView::setSyncEventsReadOnly() |
1638 | { | 1638 | { |
1639 | Event * ev; | 1639 | Event * ev; |
1640 | QPtrList<Event> eL = mCalendar->rawEvents(); | 1640 | QPtrList<Event> eL = mCalendar->rawEvents(); |
1641 | ev = eL.first(); | 1641 | ev = eL.first(); |
1642 | while ( ev ) { | 1642 | while ( ev ) { |
1643 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) | 1643 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) |
1644 | ev->setReadOnly( true ); | 1644 | ev->setReadOnly( true ); |
1645 | ev = eL.next(); | 1645 | ev = eL.next(); |
1646 | } | 1646 | } |
1647 | } | 1647 | } |
1648 | bool CalendarView::openCalendar(QString filename, bool merge) | 1648 | bool CalendarView::openCalendar(QString filename, bool merge) |
1649 | { | 1649 | { |
1650 | 1650 | ||
1651 | if (filename.isEmpty()) { | 1651 | if (filename.isEmpty()) { |
1652 | return false; | 1652 | return false; |
1653 | } | 1653 | } |
1654 | 1654 | ||
1655 | if (!QFile::exists(filename)) { | 1655 | if (!QFile::exists(filename)) { |
1656 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1656 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
1657 | return false; | 1657 | return false; |
1658 | } | 1658 | } |
1659 | 1659 | ||
1660 | globalFlagBlockAgenda = 1; | 1660 | globalFlagBlockAgenda = 1; |
1661 | if (!merge) mCalendar->close(); | 1661 | if (!merge) { |
1662 | 1662 | mCalendar->close(); | |
1663 | mTodoList->clearList(); | ||
1664 | } | ||
1663 | mStorage->setFileName( filename ); | 1665 | mStorage->setFileName( filename ); |
1664 | 1666 | ||
1665 | if ( mStorage->load() ) { | 1667 | if ( mStorage->load() ) { |
1666 | if ( merge ) ;//setModified( true ); | 1668 | if ( merge ) ;//setModified( true ); |
1667 | else { | 1669 | else { |
1668 | //setModified( true ); | 1670 | //setModified( true ); |
1669 | mViewManager->setDocumentId( filename ); | 1671 | mViewManager->setDocumentId( filename ); |
1670 | mDialogManager->setDocumentId( filename ); | 1672 | mDialogManager->setDocumentId( filename ); |
1671 | mTodoList->setDocumentId( filename ); | 1673 | mTodoList->setDocumentId( filename ); |
1672 | } | 1674 | } |
1673 | globalFlagBlockAgenda = 2; | 1675 | globalFlagBlockAgenda = 2; |
1674 | // if ( getLastSyncEvent() ) | 1676 | // if ( getLastSyncEvent() ) |
1675 | // getLastSyncEvent()->setReadOnly( true ); | 1677 | // getLastSyncEvent()->setReadOnly( true ); |
1676 | mCalendar->reInitAlarmSettings(); | 1678 | mCalendar->reInitAlarmSettings(); |
1677 | setSyncEventsReadOnly(); | 1679 | setSyncEventsReadOnly(); |
1678 | updateUnmanagedViews(); | 1680 | updateUnmanagedViews(); |
1679 | updateView(); | 1681 | updateView(); |
1680 | if ( filename != MainWindow::defaultFileName() ) { | 1682 | if ( filename != MainWindow::defaultFileName() ) { |
1681 | saveCalendar( MainWindow::defaultFileName() ); | 1683 | saveCalendar( MainWindow::defaultFileName() ); |
1682 | } else { | 1684 | } else { |
1683 | QFileInfo finf ( MainWindow::defaultFileName()); | 1685 | QFileInfo finf ( MainWindow::defaultFileName()); |
1684 | if ( finf.exists() ) { | 1686 | if ( finf.exists() ) { |
1685 | setLoadedFileVersion( finf.lastModified () ); | 1687 | setLoadedFileVersion( finf.lastModified () ); |
1686 | } | 1688 | } |