-rw-r--r-- | korganizer/calendarview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index b0be340..dd4ea41 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1849,37 +1849,39 @@ bool CalendarView::loadCalendars() | |||
1849 | mCalendar->setDefaultCalendar( 1 ); | 1849 | mCalendar->setDefaultCalendar( 1 ); |
1850 | openCalendar( MainWindow::defaultFileName(), false ); | 1850 | openCalendar( MainWindow::defaultFileName(), false ); |
1851 | cal = calendars.next(); | 1851 | cal = calendars.next(); |
1852 | while ( cal ) { | 1852 | while ( cal ) { |
1853 | addCalendar( cal ); | 1853 | addCalendar( cal ); |
1854 | cal = calendars.next(); | 1854 | cal = calendars.next(); |
1855 | } | 1855 | } |
1856 | restoreCalendarSettings(); | 1856 | restoreCalendarSettings(); |
1857 | mCalendar->reInitAlarmSettings(); | 1857 | mCalendar->reInitAlarmSettings(); |
1858 | setSyncEventsReadOnly(); | 1858 | setSyncEventsReadOnly(); |
1859 | updateUnmanagedViews(); | 1859 | updateUnmanagedViews(); |
1860 | updateView(); | 1860 | updateView(); |
1861 | return true; | ||
1861 | } | 1862 | } |
1862 | bool CalendarView::restoreCalendarSettings() | 1863 | bool CalendarView::restoreCalendarSettings() |
1863 | { | 1864 | { |
1864 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 1865 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
1865 | KopiCalendarFile * cal = calendars.first(); | 1866 | KopiCalendarFile * cal = calendars.first(); |
1866 | while ( cal ) { | 1867 | while ( cal ) { |
1867 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); | 1868 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); |
1868 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); | 1869 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); |
1869 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); | 1870 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); |
1870 | if ( cal->isStandard ) | 1871 | if ( cal->isStandard ) |
1871 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 1872 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
1872 | cal = calendars.next(); | 1873 | cal = calendars.next(); |
1873 | } | 1874 | } |
1875 | return true; | ||
1874 | } | 1876 | } |
1875 | void CalendarView::addCalendarId( int id ) | 1877 | void CalendarView::addCalendarId( int id ) |
1876 | { | 1878 | { |
1877 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); | 1879 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); |
1878 | addCalendar( cal ); | 1880 | addCalendar( cal ); |
1879 | } | 1881 | } |
1880 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) | 1882 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) |
1881 | { | 1883 | { |
1882 | cal->mErrorOnLoad = false; | 1884 | cal->mErrorOnLoad = false; |
1883 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) { | 1885 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) { |
1884 | cal->mLoadDt = QDateTime::currentDateTime(); | 1886 | cal->mLoadDt = QDateTime::currentDateTime(); |
1885 | return true; | 1887 | return true; |
@@ -2053,24 +2055,25 @@ bool CalendarView::saveCalendars() | |||
2053 | saveCalendar( MainWindow::defaultFileName() ); | 2055 | saveCalendar( MainWindow::defaultFileName() ); |
2054 | cal = calendars.next(); | 2056 | cal = calendars.next(); |
2055 | while ( cal ) { | 2057 | while ( cal ) { |
2056 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { | 2058 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { |
2057 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 2059 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
2058 | mCalendar->setDefaultCalendarEnabledOnly(); | 2060 | mCalendar->setDefaultCalendarEnabledOnly(); |
2059 | if ( saveCalendar( cal->mFileName ) ) | 2061 | if ( saveCalendar( cal->mFileName ) ) |
2060 | cal->mLoadDt = QDateTime::currentDateTime(); | 2062 | cal->mLoadDt = QDateTime::currentDateTime(); |
2061 | } | 2063 | } |
2062 | cal = calendars.next(); | 2064 | cal = calendars.next(); |
2063 | } | 2065 | } |
2064 | restoreCalendarSettings(); | 2066 | restoreCalendarSettings(); |
2067 | return true; | ||
2065 | } | 2068 | } |
2066 | bool CalendarView::saveCalendar( QString filename ) | 2069 | bool CalendarView::saveCalendar( QString filename ) |
2067 | { | 2070 | { |
2068 | 2071 | ||
2069 | // Store back all unsaved data into calendar object | 2072 | // Store back all unsaved data into calendar object |
2070 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); | 2073 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); |
2071 | if ( mViewManager->currentView() ) | 2074 | if ( mViewManager->currentView() ) |
2072 | mViewManager->currentView()->flushView(); | 2075 | mViewManager->currentView()->flushView(); |
2073 | 2076 | ||
2074 | 2077 | ||
2075 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); | 2078 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); |
2076 | mStorage->setSaveFormat( new ICalFormat() ); | 2079 | mStorage->setSaveFormat( new ICalFormat() ); |