author | zautrix <zautrix> | 2005-08-17 19:54:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-17 19:54:28 (UTC) |
commit | 7b85cd21eac504f2004df9f3c2b818cbc1478fc0 (patch) (unidiff) | |
tree | 8b99349eb4ddb9fb10e44618a03f17a80810a392 | |
parent | 39f1119563e038a029fd23c4b3af03eda02fe308 (diff) | |
download | kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.zip kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.tar.gz kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.tar.bz2 |
uuu
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index fd5e4f9..944ee1e 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,30 +1,32 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.2.1 ************ | 3 | ********** VERSION 2.2.1 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Fixed a problem displaying very long allday events in agenda view in single day mode. | 6 | Fixed a problem displaying very long allday events in agenda view in single day mode. |
7 | Fixed a problem with the default settings for new todos. | 7 | Fixed a problem with the default settings for new todos. |
8 | Added an error message dialog if saving of calendar files is not possible. | ||
9 | Made it impossible to close KO/Pi if saving fails. | ||
8 | 10 | ||
9 | KA/Pi: | 11 | KA/Pi: |
10 | Added a config option to turn on asking before a contact is deleted. | 12 | Added a config option to turn on asking before a contact is deleted. |
11 | Fixed a problem with the default view and view selection at startup. | 13 | Fixed a problem with the default view and view selection at startup. |
12 | Formatted name is now set on import, if formatted name is empty. | 14 | Formatted name is now set on import, if formatted name is empty. |
13 | 15 | ||
14 | ********** VERSION 2.2.0 ************ | 16 | ********** VERSION 2.2.0 ************ |
15 | 17 | ||
16 | New stable release! | 18 | New stable release! |
17 | Fixed some minor usability problems. | 19 | Fixed some minor usability problems. |
18 | Added writing of next alarm to a file for usage on pdaXrom. | 20 | Added writing of next alarm to a file for usage on pdaXrom. |
19 | 21 | ||
20 | 22 | ||
21 | ************************************* | 23 | ************************************* |
22 | 24 | ||
23 | You can find the complete changelog | 25 | You can find the complete changelog |
24 | from version 1.7.7 to 2.2.0 | 26 | from version 1.7.7 to 2.2.0 |
25 | in the source package or on | 27 | in the source package or on |
26 | 28 | ||
27 | http://www.pi-sync.net/html/changelog.html | 29 | http://www.pi-sync.net/html/changelog.html |
28 | 30 | ||
29 | 31 | ||
30 | 32 | ||
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ca071b2..26323b1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2166,769 +2166,768 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd | |||
2166 | QString assembledName; | 2166 | QString assembledName; |
2167 | QString uid; | 2167 | QString uid; |
2168 | bool ok = true; | 2168 | bool ok = true; |
2169 | for ( int i = 0; i < count; i++) | 2169 | for ( int i = 0; i < count; i++) |
2170 | { | 2170 | { |
2171 | if ( ! bar.isVisible() ) | 2171 | if ( ! bar.isVisible() ) |
2172 | return; | 2172 | return; |
2173 | bar.setProgress( i ); | 2173 | bar.setProgress( i ); |
2174 | qApp->processEvents(); | 2174 | qApp->processEvents(); |
2175 | 2175 | ||
2176 | birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); | 2176 | birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); |
2177 | if (!ok) { | 2177 | if (!ok) { |
2178 | ;//qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); | 2178 | ;//qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); |
2179 | } | 2179 | } |
2180 | 2180 | ||
2181 | anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); | 2181 | anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); |
2182 | if (!ok) { | 2182 | if (!ok) { |
2183 | ;//qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); | 2183 | ;//qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); |
2184 | } | 2184 | } |
2185 | realName = realNameList[i]; | 2185 | realName = realNameList[i]; |
2186 | email = emailList[i]; | 2186 | email = emailList[i]; |
2187 | assembledName = assembledNameList[i]; | 2187 | assembledName = assembledNameList[i]; |
2188 | uid = uidList[i]; | 2188 | uid = uidList[i]; |
2189 | //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() ); | 2189 | //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() ); |
2190 | 2190 | ||
2191 | if ( birthday.isValid() ){ | 2191 | if ( birthday.isValid() ){ |
2192 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | 2192 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, |
2193 | KCal::Attendee::ReqParticipant,uid) ; | 2193 | KCal::Attendee::ReqParticipant,uid) ; |
2194 | if ( addAnniversary( birthday, assembledName, a, true ) ) | 2194 | if ( addAnniversary( birthday, assembledName, a, true ) ) |
2195 | ++addCount; | 2195 | ++addCount; |
2196 | } | 2196 | } |
2197 | 2197 | ||
2198 | if ( anniversary.isValid() ){ | 2198 | if ( anniversary.isValid() ){ |
2199 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | 2199 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, |
2200 | KCal::Attendee::ReqParticipant,uid) ; | 2200 | KCal::Attendee::ReqParticipant,uid) ; |
2201 | if ( addAnniversary( anniversary, assembledName, a, false ) ) | 2201 | if ( addAnniversary( anniversary, assembledName, a, false ) ) |
2202 | ++addCount; | 2202 | ++addCount; |
2203 | } | 2203 | } |
2204 | } | 2204 | } |
2205 | 2205 | ||
2206 | mCalendar->setDefaultCalendar( curCal ); | 2206 | mCalendar->setDefaultCalendar( curCal ); |
2207 | updateView(); | 2207 | updateView(); |
2208 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); | 2208 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |
2209 | 2209 | ||
2210 | } | 2210 | } |
2211 | 2211 | ||
2212 | } | 2212 | } |
2213 | 2213 | ||
2214 | 2214 | ||
2215 | 2215 | ||
2216 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) | 2216 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) |
2217 | { | 2217 | { |
2218 | //qDebug("addAnni "); | 2218 | //qDebug("addAnni "); |
2219 | Event * ev = new Event(); | 2219 | Event * ev = new Event(); |
2220 | ev->setOrganizer(KOPrefs::instance()->email()); | 2220 | ev->setOrganizer(KOPrefs::instance()->email()); |
2221 | if ( a ) { | 2221 | if ( a ) { |
2222 | ev->addAttendee( a ); | 2222 | ev->addAttendee( a ); |
2223 | } | 2223 | } |
2224 | QString kind; | 2224 | QString kind; |
2225 | if ( birthday ) { | 2225 | if ( birthday ) { |
2226 | kind = i18n( "Birthday" ); | 2226 | kind = i18n( "Birthday" ); |
2227 | ev->setSummary( name + " (" + QString::number(date.year()) +")"); | 2227 | ev->setSummary( name + " (" + QString::number(date.year()) +")"); |
2228 | } | 2228 | } |
2229 | else { | 2229 | else { |
2230 | kind = i18n( "Anniversary" ); | 2230 | kind = i18n( "Anniversary" ); |
2231 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); | 2231 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); |
2232 | } | 2232 | } |
2233 | ev->setCategories( kind ); | 2233 | ev->setCategories( kind ); |
2234 | ev->setDtStart( QDateTime(date) ); | 2234 | ev->setDtStart( QDateTime(date) ); |
2235 | ev->setDtEnd( QDateTime(date) ); | 2235 | ev->setDtEnd( QDateTime(date) ); |
2236 | ev->setFloats( true ); | 2236 | ev->setFloats( true ); |
2237 | Recurrence * rec = ev->recurrence(); | 2237 | Recurrence * rec = ev->recurrence(); |
2238 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); | 2238 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); |
2239 | rec->addYearlyNum( date.month() ); | 2239 | rec->addYearlyNum( date.month() ); |
2240 | if ( !mCalendar->addAnniversaryNoDup( ev ) ) { | 2240 | if ( !mCalendar->addAnniversaryNoDup( ev ) ) { |
2241 | delete ev; | 2241 | delete ev; |
2242 | return false; | 2242 | return false; |
2243 | } | 2243 | } |
2244 | return true; | 2244 | return true; |
2245 | 2245 | ||
2246 | } | 2246 | } |
2247 | bool CalendarView::importQtopia( const QString &categories, | 2247 | bool CalendarView::importQtopia( const QString &categories, |
2248 | const QString &datebook, | 2248 | const QString &datebook, |
2249 | const QString &todolist ) | 2249 | const QString &todolist ) |
2250 | { | 2250 | { |
2251 | 2251 | ||
2252 | QtopiaFormat qtopiaFormat; | 2252 | QtopiaFormat qtopiaFormat; |
2253 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); | 2253 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); |
2254 | if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories ); | 2254 | if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories ); |
2255 | if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook ); | 2255 | if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook ); |
2256 | if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist ); | 2256 | if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist ); |
2257 | 2257 | ||
2258 | updateView(); | 2258 | updateView(); |
2259 | return true; | 2259 | return true; |
2260 | 2260 | ||
2261 | #if 0 | 2261 | #if 0 |
2262 | mGlobalSyncMode = SYNC_MODE_QTOPIA; | 2262 | mGlobalSyncMode = SYNC_MODE_QTOPIA; |
2263 | mCurrentSyncDevice = "qtopia-XML"; | 2263 | mCurrentSyncDevice = "qtopia-XML"; |
2264 | if ( mSyncManager->mAskForPreferences ) | 2264 | if ( mSyncManager->mAskForPreferences ) |
2265 | edit_sync_options(); | 2265 | edit_sync_options(); |
2266 | qApp->processEvents(); | 2266 | qApp->processEvents(); |
2267 | CalendarLocal* calendar = new CalendarLocal(); | 2267 | CalendarLocal* calendar = new CalendarLocal(); |
2268 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 2268 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
2269 | bool syncOK = false; | 2269 | bool syncOK = false; |
2270 | QtopiaFormat qtopiaFormat; | 2270 | QtopiaFormat qtopiaFormat; |
2271 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); | 2271 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); |
2272 | bool loadOk = true; | 2272 | bool loadOk = true; |
2273 | if ( !categories.isEmpty() ) | 2273 | if ( !categories.isEmpty() ) |
2274 | loadOk = qtopiaFormat.load( calendar, categories ); | 2274 | loadOk = qtopiaFormat.load( calendar, categories ); |
2275 | if ( loadOk && !datebook.isEmpty() ) | 2275 | if ( loadOk && !datebook.isEmpty() ) |
2276 | loadOk = qtopiaFormat.load( calendar, datebook ); | 2276 | loadOk = qtopiaFormat.load( calendar, datebook ); |
2277 | if ( loadOk && !todolist.isEmpty() ) | 2277 | if ( loadOk && !todolist.isEmpty() ) |
2278 | loadOk = qtopiaFormat.load( calendar, todolist ); | 2278 | loadOk = qtopiaFormat.load( calendar, todolist ); |
2279 | 2279 | ||
2280 | if ( loadOk ) { | 2280 | if ( loadOk ) { |
2281 | getEventViewerDialog()->setSyncMode( true ); | 2281 | getEventViewerDialog()->setSyncMode( true ); |
2282 | syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs ); | 2282 | syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs ); |
2283 | getEventViewerDialog()->setSyncMode( false ); | 2283 | getEventViewerDialog()->setSyncMode( false ); |
2284 | qApp->processEvents(); | 2284 | qApp->processEvents(); |
2285 | if ( syncOK ) { | 2285 | if ( syncOK ) { |
2286 | if ( mSyncManager->mWriteBackFile ) | 2286 | if ( mSyncManager->mWriteBackFile ) |
2287 | { | 2287 | { |
2288 | // write back XML file | 2288 | // write back XML file |
2289 | 2289 | ||
2290 | } | 2290 | } |
2291 | setModified( true ); | 2291 | setModified( true ); |
2292 | } | 2292 | } |
2293 | } else { | 2293 | } else { |
2294 | QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ; | 2294 | QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ; |
2295 | QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"), | 2295 | QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"), |
2296 | question, i18n("Ok")) ; | 2296 | question, i18n("Ok")) ; |
2297 | } | 2297 | } |
2298 | delete calendar; | 2298 | delete calendar; |
2299 | updateView(); | 2299 | updateView(); |
2300 | return syncOK; | 2300 | return syncOK; |
2301 | 2301 | ||
2302 | 2302 | ||
2303 | #endif | 2303 | #endif |
2304 | 2304 | ||
2305 | } | 2305 | } |
2306 | 2306 | ||
2307 | void CalendarView::setSyncEventsReadOnly() | 2307 | void CalendarView::setSyncEventsReadOnly() |
2308 | { | 2308 | { |
2309 | mCalendar->setSyncEventsReadOnly(); | 2309 | mCalendar->setSyncEventsReadOnly(); |
2310 | } | 2310 | } |
2311 | 2311 | ||
2312 | bool CalendarView::loadCalendars() | 2312 | bool CalendarView::loadCalendars() |
2313 | { | 2313 | { |
2314 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2314 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2315 | KopiCalendarFile * cal = calendars.first(); | 2315 | KopiCalendarFile * cal = calendars.first(); |
2316 | mCalendar->setDefaultCalendar( 1 ); | 2316 | mCalendar->setDefaultCalendar( 1 ); |
2317 | openCalendar( MainWindow::defaultFileName(), false ); | 2317 | openCalendar( MainWindow::defaultFileName(), false ); |
2318 | cal = calendars.next(); | 2318 | cal = calendars.next(); |
2319 | while ( cal ) { | 2319 | while ( cal ) { |
2320 | addCalendar( cal ); | 2320 | addCalendar( cal ); |
2321 | cal = calendars.next(); | 2321 | cal = calendars.next(); |
2322 | } | 2322 | } |
2323 | restoreCalendarSettings(); | 2323 | restoreCalendarSettings(); |
2324 | return true; | 2324 | return true; |
2325 | } | 2325 | } |
2326 | bool CalendarView::restoreCalendarSettings() | 2326 | bool CalendarView::restoreCalendarSettings() |
2327 | { | 2327 | { |
2328 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2328 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2329 | KopiCalendarFile * cal = calendars.first(); | 2329 | KopiCalendarFile * cal = calendars.first(); |
2330 | while ( cal ) { | 2330 | while ( cal ) { |
2331 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); | 2331 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); |
2332 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); | 2332 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); |
2333 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); | 2333 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); |
2334 | if ( cal->isStandard ) | 2334 | if ( cal->isStandard ) |
2335 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 2335 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
2336 | cal = calendars.next(); | 2336 | cal = calendars.next(); |
2337 | } | 2337 | } |
2338 | setSyncEventsReadOnly(); | 2338 | setSyncEventsReadOnly(); |
2339 | mCalendar->reInitAlarmSettings(); | 2339 | mCalendar->reInitAlarmSettings(); |
2340 | updateUnmanagedViews(); | 2340 | updateUnmanagedViews(); |
2341 | updateView(); | 2341 | updateView(); |
2342 | return true; | 2342 | return true; |
2343 | } | 2343 | } |
2344 | void CalendarView::addCalendarId( int id ) | 2344 | void CalendarView::addCalendarId( int id ) |
2345 | { | 2345 | { |
2346 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); | 2346 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); |
2347 | if ( cal ) | 2347 | if ( cal ) |
2348 | addCalendar( cal ); | 2348 | addCalendar( cal ); |
2349 | } | 2349 | } |
2350 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) | 2350 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) |
2351 | { | 2351 | { |
2352 | cal->mErrorOnLoad = false; | 2352 | cal->mErrorOnLoad = false; |
2353 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) { | 2353 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) { |
2354 | cal->mLoadDt = QDateTime::currentDateTime(); | 2354 | cal->mLoadDt = QDateTime::currentDateTime(); |
2355 | return true; | 2355 | return true; |
2356 | } | 2356 | } |
2357 | qDebug("KO: Error adding calendar file %s ",cal->mFileName.latin1() ); | 2357 | qDebug("KO: Error adding calendar file %s ",cal->mFileName.latin1() ); |
2358 | cal->mErrorOnLoad = true; | 2358 | cal->mErrorOnLoad = true; |
2359 | return false; | 2359 | return false; |
2360 | } | 2360 | } |
2361 | bool CalendarView::openCalendar(QString filename, bool merge) | 2361 | bool CalendarView::openCalendar(QString filename, bool merge) |
2362 | { | 2362 | { |
2363 | 2363 | ||
2364 | if (filename.isEmpty()) { | 2364 | if (filename.isEmpty()) { |
2365 | return false; | 2365 | return false; |
2366 | } | 2366 | } |
2367 | 2367 | ||
2368 | if (!QFile::exists(filename)) { | 2368 | if (!QFile::exists(filename)) { |
2369 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 2369 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
2370 | return false; | 2370 | return false; |
2371 | } | 2371 | } |
2372 | 2372 | ||
2373 | globalFlagBlockAgenda = 1; | 2373 | globalFlagBlockAgenda = 1; |
2374 | clearAllViews(); | 2374 | clearAllViews(); |
2375 | if (!merge) { | 2375 | if (!merge) { |
2376 | mViewManager->setDocumentId( filename ); | 2376 | mViewManager->setDocumentId( filename ); |
2377 | mCalendar->close(); | 2377 | mCalendar->close(); |
2378 | } | 2378 | } |
2379 | mStorage->setFileName( filename ); | 2379 | mStorage->setFileName( filename ); |
2380 | 2380 | ||
2381 | if ( mStorage->load() ) { | 2381 | if ( mStorage->load() ) { |
2382 | if ( merge ) ;//setModified( true ); | 2382 | if ( merge ) ;//setModified( true ); |
2383 | else { | 2383 | else { |
2384 | //setModified( true ); | 2384 | //setModified( true ); |
2385 | mViewManager->setDocumentId( filename ); | 2385 | mViewManager->setDocumentId( filename ); |
2386 | mDialogManager->setDocumentId( filename ); | 2386 | mDialogManager->setDocumentId( filename ); |
2387 | mTodoList->setDocumentId( filename ); | 2387 | mTodoList->setDocumentId( filename ); |
2388 | } | 2388 | } |
2389 | globalFlagBlockAgenda = 2; | 2389 | globalFlagBlockAgenda = 2; |
2390 | // if ( getLastSyncEvent() ) | 2390 | // if ( getLastSyncEvent() ) |
2391 | // getLastSyncEvent()->setReadOnly( true ); | 2391 | // getLastSyncEvent()->setReadOnly( true ); |
2392 | mCalendar->reInitAlarmSettings(); | 2392 | mCalendar->reInitAlarmSettings(); |
2393 | setSyncEventsReadOnly(); | 2393 | setSyncEventsReadOnly(); |
2394 | updateUnmanagedViews(); | 2394 | updateUnmanagedViews(); |
2395 | updateView(); | 2395 | updateView(); |
2396 | if ( filename != MainWindow::defaultFileName() ) { | 2396 | if ( filename != MainWindow::defaultFileName() ) { |
2397 | saveCalendar( MainWindow::defaultFileName() ); | 2397 | saveCalendar( MainWindow::defaultFileName() ); |
2398 | } else { | 2398 | } else { |
2399 | QFileInfo finf ( MainWindow::defaultFileName()); | 2399 | QFileInfo finf ( MainWindow::defaultFileName()); |
2400 | if ( finf.exists() ) { | 2400 | if ( finf.exists() ) { |
2401 | setLoadedFileVersion( finf.lastModified () ); | 2401 | setLoadedFileVersion( finf.lastModified () ); |
2402 | } | 2402 | } |
2403 | } | 2403 | } |
2404 | return true; | 2404 | return true; |
2405 | } else { | 2405 | } else { |
2406 | // while failing to load, the calendar object could | 2406 | // while failing to load, the calendar object could |
2407 | // have become partially populated. Clear it out. | 2407 | // have become partially populated. Clear it out. |
2408 | if ( !merge ) { | 2408 | if ( !merge ) { |
2409 | mCalendar->close(); | 2409 | mCalendar->close(); |
2410 | mViewManager->setDocumentId( filename ); | 2410 | mViewManager->setDocumentId( filename ); |
2411 | mDialogManager->setDocumentId( filename ); | 2411 | mDialogManager->setDocumentId( filename ); |
2412 | mTodoList->setDocumentId( filename ); | 2412 | mTodoList->setDocumentId( filename ); |
2413 | } | 2413 | } |
2414 | 2414 | ||
2415 | //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); | 2415 | //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); |
2416 | 2416 | ||
2417 | QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); | 2417 | QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); |
2418 | globalFlagBlockAgenda = 2; | 2418 | globalFlagBlockAgenda = 2; |
2419 | mCalendar->reInitAlarmSettings(); | 2419 | mCalendar->reInitAlarmSettings(); |
2420 | setSyncEventsReadOnly(); | 2420 | setSyncEventsReadOnly(); |
2421 | updateUnmanagedViews(); | 2421 | updateUnmanagedViews(); |
2422 | updateView(); | 2422 | updateView(); |
2423 | } | 2423 | } |
2424 | return false; | 2424 | return false; |
2425 | } | 2425 | } |
2426 | void CalendarView::mergeFile( QString fn ) | 2426 | void CalendarView::mergeFile( QString fn ) |
2427 | { | 2427 | { |
2428 | clearAllViews(); | 2428 | clearAllViews(); |
2429 | mCalendar->mergeCalendarFile( fn ); | 2429 | mCalendar->mergeCalendarFile( fn ); |
2430 | mCalendar->reInitAlarmSettings(); | 2430 | mCalendar->reInitAlarmSettings(); |
2431 | setSyncEventsReadOnly(); | 2431 | setSyncEventsReadOnly(); |
2432 | updateUnmanagedViews(); | 2432 | updateUnmanagedViews(); |
2433 | updateView(); | 2433 | updateView(); |
2434 | } | 2434 | } |
2435 | void CalendarView::showOpenError() | 2435 | void CalendarView::showOpenError() |
2436 | { | 2436 | { |
2437 | KMessageBox::error(this,i18n("Couldn't load calendar\n.")); | 2437 | KMessageBox::error(this,i18n("Couldn't load calendar\n.")); |
2438 | } | 2438 | } |
2439 | void CalendarView::setLoadedFileVersion(QDateTime dt) | 2439 | void CalendarView::setLoadedFileVersion(QDateTime dt) |
2440 | { | 2440 | { |
2441 | loadedFileVersion = dt; | 2441 | loadedFileVersion = dt; |
2442 | } | 2442 | } |
2443 | bool CalendarView::checkFileChanged(QString fn) | 2443 | bool CalendarView::checkFileChanged(QString fn) |
2444 | { | 2444 | { |
2445 | QFileInfo finf ( fn ); | 2445 | QFileInfo finf ( fn ); |
2446 | if ( !finf.exists() ) | 2446 | if ( !finf.exists() ) |
2447 | return true; | 2447 | return true; |
2448 | QDateTime dt = finf.lastModified (); | 2448 | QDateTime dt = finf.lastModified (); |
2449 | if ( dt <= loadedFileVersion ) | 2449 | if ( dt <= loadedFileVersion ) |
2450 | return false; | 2450 | return false; |
2451 | return true; | 2451 | return true; |
2452 | 2452 | ||
2453 | } | 2453 | } |
2454 | void CalendarView::watchSavedFile() | 2454 | void CalendarView::watchSavedFile() |
2455 | { | 2455 | { |
2456 | QFileInfo finf ( MainWindow::defaultFileName()); | 2456 | QFileInfo finf ( MainWindow::defaultFileName()); |
2457 | if ( !finf.exists() ) | 2457 | if ( !finf.exists() ) |
2458 | return; | 2458 | return; |
2459 | QDateTime dt = finf.lastModified (); | 2459 | QDateTime dt = finf.lastModified (); |
2460 | if ( dt < loadedFileVersion ) { | 2460 | if ( dt < loadedFileVersion ) { |
2461 | //qDebug("watch %s %s ", dt.toString().latin1(), loadedFileVersion.toString().latin1()); | 2461 | //qDebug("watch %s %s ", dt.toString().latin1(), loadedFileVersion.toString().latin1()); |
2462 | QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile() ) ); | 2462 | QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile() ) ); |
2463 | return; | 2463 | return; |
2464 | } | 2464 | } |
2465 | loadedFileVersion = dt; | 2465 | loadedFileVersion = dt; |
2466 | } | 2466 | } |
2467 | bool CalendarView::checkAllFileVersions() | 2467 | bool CalendarView::checkAllFileVersions() |
2468 | { | 2468 | { |
2469 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2469 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2470 | KopiCalendarFile * cal = calendars.first(); | 2470 | KopiCalendarFile * cal = calendars.first(); |
2471 | mCalendar->setDefaultCalendar( 1 ); | 2471 | mCalendar->setDefaultCalendar( 1 ); |
2472 | mCalendar->setDefaultCalendarEnabledOnly(); | 2472 | mCalendar->setDefaultCalendarEnabledOnly(); |
2473 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { | 2473 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { |
2474 | if ( !checkFileVersion(MainWindow::defaultFileName())) { | 2474 | if ( !checkFileVersion(MainWindow::defaultFileName())) { |
2475 | restoreCalendarSettings(); | 2475 | restoreCalendarSettings(); |
2476 | return false; | 2476 | return false; |
2477 | } | 2477 | } |
2478 | } | 2478 | } |
2479 | cal = calendars.next(); | 2479 | cal = calendars.next(); |
2480 | QDateTime storeTemp = loadedFileVersion; | 2480 | QDateTime storeTemp = loadedFileVersion; |
2481 | while ( cal ) { | 2481 | while ( cal ) { |
2482 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { | 2482 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { |
2483 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 2483 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
2484 | mCalendar->setDefaultCalendarEnabledOnly(); | 2484 | mCalendar->setDefaultCalendarEnabledOnly(); |
2485 | loadedFileVersion = cal->mLoadDt.addSecs( 15 ); | 2485 | loadedFileVersion = cal->mLoadDt.addSecs( 15 ); |
2486 | if ( !checkFileVersion(cal->mFileName )) { | 2486 | if ( !checkFileVersion(cal->mFileName )) { |
2487 | loadedFileVersion = storeTemp; | 2487 | loadedFileVersion = storeTemp; |
2488 | restoreCalendarSettings(); | 2488 | restoreCalendarSettings(); |
2489 | return false; | 2489 | return false; |
2490 | } | 2490 | } |
2491 | } | 2491 | } |
2492 | cal = calendars.next(); | 2492 | cal = calendars.next(); |
2493 | } | 2493 | } |
2494 | loadedFileVersion = storeTemp; | 2494 | loadedFileVersion = storeTemp; |
2495 | return true; | 2495 | return true; |
2496 | } | 2496 | } |
2497 | bool CalendarView::checkFileVersion(QString fn) | 2497 | bool CalendarView::checkFileVersion(QString fn) |
2498 | { | 2498 | { |
2499 | QFileInfo finf ( fn ); | 2499 | QFileInfo finf ( fn ); |
2500 | if ( !finf.exists() ) | 2500 | if ( !finf.exists() ) |
2501 | return true; | 2501 | return true; |
2502 | QDateTime dt = finf.lastModified (); | 2502 | QDateTime dt = finf.lastModified (); |
2503 | qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1()); | 2503 | qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1()); |
2504 | qDebug("file on disk version %s %s", fn.latin1(),dt.toString().latin1()); | 2504 | qDebug("file on disk version %s %s", fn.latin1(),dt.toString().latin1()); |
2505 | if ( dt <= loadedFileVersion ) | 2505 | if ( dt <= loadedFileVersion ) |
2506 | return true; | 2506 | return true; |
2507 | int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non 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(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) , | 2507 | int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non 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(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) , |
2508 | i18n("KO/Pi Warning"),i18n("Overwrite"), | 2508 | i18n("KO/Pi Warning"),i18n("Overwrite"), |
2509 | i18n("Sync+save")); | 2509 | i18n("Sync+save")); |
2510 | 2510 | ||
2511 | if ( km == KMessageBox::Cancel ) | 2511 | if ( km == KMessageBox::Cancel ) |
2512 | return false; | 2512 | return false; |
2513 | if ( km == KMessageBox::Yes ) | 2513 | if ( km == KMessageBox::Yes ) |
2514 | return true; | 2514 | return true; |
2515 | 2515 | ||
2516 | setSyncDevice("deleteaftersync" ); | 2516 | setSyncDevice("deleteaftersync" ); |
2517 | mSyncManager->mAskForPreferences = true; | 2517 | mSyncManager->mAskForPreferences = true; |
2518 | mSyncManager->mSyncAlgoPrefs = 3; | 2518 | mSyncManager->mSyncAlgoPrefs = 3; |
2519 | mSyncManager->mWriteBackFile = false; | 2519 | mSyncManager->mWriteBackFile = false; |
2520 | mSyncManager->mWriteBackExistingOnly = false; | 2520 | mSyncManager->mWriteBackExistingOnly = false; |
2521 | mSyncManager->mShowSyncSummary = false; | 2521 | mSyncManager->mShowSyncSummary = false; |
2522 | syncCalendar( fn, 3 ); | 2522 | syncCalendar( fn, 3 ); |
2523 | Event * e = getLastSyncEvent(); | 2523 | Event * e = getLastSyncEvent(); |
2524 | if ( e ) | 2524 | if ( e ) |
2525 | mCalendar->deleteEvent( e ); | 2525 | mCalendar->deleteEvent( e ); |
2526 | return true; | 2526 | return true; |
2527 | } | 2527 | } |
2528 | bool CalendarView::saveCalendars() | 2528 | bool CalendarView::saveCalendars() |
2529 | { | 2529 | { |
2530 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2530 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2531 | KopiCalendarFile * cal = calendars.first(); | 2531 | KopiCalendarFile * cal = calendars.first(); |
2532 | mCalendar->setDefaultCalendar( 1 ); | 2532 | mCalendar->setDefaultCalendar( 1 ); |
2533 | mCalendar->setDefaultCalendarEnabledOnly(); | 2533 | mCalendar->setDefaultCalendarEnabledOnly(); |
2534 | QString saveError; | 2534 | QString saveError; |
2535 | if ( !saveCalendar( MainWindow::defaultFileName() ) ) | 2535 | if ( !saveCalendar( MainWindow::defaultFileName() ) ) |
2536 | saveError = cal->mName +"\n"; | 2536 | saveError = cal->mName +"\n"; |
2537 | cal = calendars.next(); | 2537 | cal = calendars.next(); |
2538 | while ( cal ) { | 2538 | while ( cal ) { |
2539 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { | 2539 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { |
2540 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 2540 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
2541 | mCalendar->setDefaultCalendarEnabledOnly(); | 2541 | mCalendar->setDefaultCalendarEnabledOnly(); |
2542 | if ( saveCalendar( cal->mFileName ) ) | 2542 | if ( saveCalendar( cal->mFileName ) ) |
2543 | cal->mLoadDt = QDateTime::currentDateTime(); | 2543 | cal->mLoadDt = QDateTime::currentDateTime(); |
2544 | else | 2544 | else |
2545 | saveError += cal->mName + "\n"; | 2545 | saveError += cal->mName + "\n"; |
2546 | } | 2546 | } |
2547 | cal = calendars.next(); | 2547 | cal = calendars.next(); |
2548 | } | 2548 | } |
2549 | restoreCalendarSettings(); | 2549 | restoreCalendarSettings(); |
2550 | |||
2551 | if ( !saveError.isEmpty() ) { | 2550 | if ( !saveError.isEmpty() ) { |
2552 | saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError; | 2551 | saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError; |
2553 | KMessageBox::error(this, saveError, i18n("Error saving data")); | 2552 | KMessageBox::error(this, saveError, i18n("Error saving data")); |
2554 | return false; | 2553 | return false; |
2555 | } | 2554 | } |
2556 | return true; | 2555 | return true; |
2557 | } | 2556 | } |
2558 | bool CalendarView::saveCalendar( QString filename ) | 2557 | bool CalendarView::saveCalendar( QString filename ) |
2559 | { | 2558 | { |
2560 | 2559 | ||
2561 | // Store back all unsaved data into calendar object | 2560 | // Store back all unsaved data into calendar object |
2562 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); | 2561 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); |
2563 | if ( mViewManager->currentView() ) | 2562 | if ( mViewManager->currentView() ) |
2564 | mViewManager->currentView()->flushView(); | 2563 | mViewManager->currentView()->flushView(); |
2565 | 2564 | ||
2566 | 2565 | ||
2567 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); | 2566 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); |
2568 | mStorage->setSaveFormat( new ICalFormat() ); | 2567 | mStorage->setSaveFormat( new ICalFormat() ); |
2569 | mStorage->setFileName( filename ); | 2568 | mStorage->setFileName( filename ); |
2570 | bool success; | 2569 | bool success; |
2571 | success = mStorage->save(); | 2570 | success = mStorage->save(); |
2572 | if ( !success ) { | 2571 | if ( !success ) { |
2573 | return false; | 2572 | return false; |
2574 | } | 2573 | } |
2575 | if ( filename == MainWindow::defaultFileName() ) { | 2574 | if ( filename == MainWindow::defaultFileName() ) { |
2576 | setLoadedFileVersion( lfv ); | 2575 | setLoadedFileVersion( lfv ); |
2577 | watchSavedFile(); | 2576 | watchSavedFile(); |
2578 | } | 2577 | } |
2579 | return true; | 2578 | return true; |
2580 | } | 2579 | } |
2581 | 2580 | ||
2582 | void CalendarView::closeCalendar() | 2581 | void CalendarView::closeCalendar() |
2583 | { | 2582 | { |
2584 | 2583 | ||
2585 | // child windows no longer valid | 2584 | // child windows no longer valid |
2586 | clearAllViews(); | 2585 | clearAllViews(); |
2587 | emit closingDown(); | 2586 | emit closingDown(); |
2588 | 2587 | ||
2589 | mCalendar->close(); | 2588 | mCalendar->close(); |
2590 | setModified(false); | 2589 | setModified(false); |
2591 | updateView(); | 2590 | updateView(); |
2592 | } | 2591 | } |
2593 | 2592 | ||
2594 | void CalendarView::archiveCalendar() | 2593 | void CalendarView::archiveCalendar() |
2595 | { | 2594 | { |
2596 | mDialogManager->showArchiveDialog(); | 2595 | mDialogManager->showArchiveDialog(); |
2597 | } | 2596 | } |
2598 | 2597 | ||
2599 | 2598 | ||
2600 | void CalendarView::readSettings() | 2599 | void CalendarView::readSettings() |
2601 | { | 2600 | { |
2602 | 2601 | ||
2603 | 2602 | ||
2604 | // mViewManager->showAgendaView(); | 2603 | // mViewManager->showAgendaView(); |
2605 | QString str; | 2604 | QString str; |
2606 | //qDebug("CalendarView::readSettings() "); | 2605 | //qDebug("CalendarView::readSettings() "); |
2607 | // read settings from the KConfig, supplying reasonable | 2606 | // read settings from the KConfig, supplying reasonable |
2608 | // defaults where none are to be found | 2607 | // defaults where none are to be found |
2609 | KConfig *config = KOGlobals::config(); | 2608 | KConfig *config = KOGlobals::config(); |
2610 | #ifndef KORG_NOSPLITTER | 2609 | #ifndef KORG_NOSPLITTER |
2611 | config->setGroup("KOrganizer Geometry"); | 2610 | config->setGroup("KOrganizer Geometry"); |
2612 | 2611 | ||
2613 | QValueList<int> sizes = config->readIntListEntry("Separator1"); | 2612 | QValueList<int> sizes = config->readIntListEntry("Separator1"); |
2614 | if (sizes.count() != 2) { | 2613 | if (sizes.count() != 2) { |
2615 | sizes << mDateNavigator->minimumSizeHint().width(); | 2614 | sizes << mDateNavigator->minimumSizeHint().width(); |
2616 | sizes << 300; | 2615 | sizes << 300; |
2617 | } | 2616 | } |
2618 | mPanner->setSizes(sizes); | 2617 | mPanner->setSizes(sizes); |
2619 | 2618 | ||
2620 | sizes = config->readIntListEntry("Separator2"); | 2619 | sizes = config->readIntListEntry("Separator2"); |
2621 | if ( ( mResourceView && sizes.count() == 4 ) || | 2620 | if ( ( mResourceView && sizes.count() == 4 ) || |
2622 | ( !mResourceView && sizes.count() == 3 ) ) { | 2621 | ( !mResourceView && sizes.count() == 3 ) ) { |
2623 | mLeftSplitter->setSizes(sizes); | 2622 | mLeftSplitter->setSizes(sizes); |
2624 | } | 2623 | } |
2625 | #endif | 2624 | #endif |
2626 | globalFlagBlockAgenda = 1; | 2625 | globalFlagBlockAgenda = 1; |
2627 | mViewManager->showAgendaView(); | 2626 | mViewManager->showAgendaView(); |
2628 | //mViewManager->readSettings( config ); | 2627 | //mViewManager->readSettings( config ); |
2629 | mTodoList->restoreLayout(config,QString("Todo Layout")); | 2628 | mTodoList->restoreLayout(config,QString("Todo Layout")); |
2630 | readFilterSettings(config); | 2629 | readFilterSettings(config); |
2631 | 2630 | ||
2632 | #ifdef DESKTOP_VERSION | 2631 | #ifdef DESKTOP_VERSION |
2633 | config->setGroup("WidgetLayout"); | 2632 | config->setGroup("WidgetLayout"); |
2634 | QStringList list; | 2633 | QStringList list; |
2635 | list = config->readListEntry("MainLayout"); | 2634 | list = config->readListEntry("MainLayout"); |
2636 | int x,y,w,h; | 2635 | int x,y,w,h; |
2637 | if ( ! list.isEmpty() ) { | 2636 | if ( ! list.isEmpty() ) { |
2638 | x = list[0].toInt(); | 2637 | x = list[0].toInt(); |
2639 | y = list[1].toInt(); | 2638 | y = list[1].toInt(); |
2640 | w = list[2].toInt(); | 2639 | w = list[2].toInt(); |
2641 | h = list[3].toInt(); | 2640 | h = list[3].toInt(); |
2642 | KApplication::testCoords( &x,&y,&w,&h ); | 2641 | KApplication::testCoords( &x,&y,&w,&h ); |
2643 | topLevelWidget()->setGeometry(x,y,w,h); | 2642 | topLevelWidget()->setGeometry(x,y,w,h); |
2644 | 2643 | ||
2645 | } else { | 2644 | } else { |
2646 | topLevelWidget()->setGeometry( 40 ,40 , 640, 440); | 2645 | topLevelWidget()->setGeometry( 40 ,40 , 640, 440); |
2647 | } | 2646 | } |
2648 | list = config->readListEntry("EditEventLayout"); | 2647 | list = config->readListEntry("EditEventLayout"); |
2649 | if ( ! list.isEmpty() ) { | 2648 | if ( ! list.isEmpty() ) { |
2650 | x = list[0].toInt(); | 2649 | x = list[0].toInt(); |
2651 | y = list[1].toInt(); | 2650 | y = list[1].toInt(); |
2652 | w = list[2].toInt(); | 2651 | w = list[2].toInt(); |
2653 | h = list[3].toInt(); | 2652 | h = list[3].toInt(); |
2654 | KApplication::testCoords( &x,&y,&w,&h ); | 2653 | KApplication::testCoords( &x,&y,&w,&h ); |
2655 | mEventEditor->setGeometry(x,y,w,h); | 2654 | mEventEditor->setGeometry(x,y,w,h); |
2656 | 2655 | ||
2657 | } | 2656 | } |
2658 | list = config->readListEntry("EditTodoLayout"); | 2657 | list = config->readListEntry("EditTodoLayout"); |
2659 | if ( ! list.isEmpty() ) { | 2658 | if ( ! list.isEmpty() ) { |
2660 | x = list[0].toInt(); | 2659 | x = list[0].toInt(); |
2661 | y = list[1].toInt(); | 2660 | y = list[1].toInt(); |
2662 | w = list[2].toInt(); | 2661 | w = list[2].toInt(); |
2663 | h = list[3].toInt(); | 2662 | h = list[3].toInt(); |
2664 | KApplication::testCoords( &x,&y,&w,&h ); | 2663 | KApplication::testCoords( &x,&y,&w,&h ); |
2665 | mTodoEditor->setGeometry(x,y,w,h); | 2664 | mTodoEditor->setGeometry(x,y,w,h); |
2666 | 2665 | ||
2667 | } | 2666 | } |
2668 | list = config->readListEntry("ViewerLayout"); | 2667 | list = config->readListEntry("ViewerLayout"); |
2669 | if ( ! list.isEmpty() ) { | 2668 | if ( ! list.isEmpty() ) { |
2670 | x = list[0].toInt(); | 2669 | x = list[0].toInt(); |
2671 | y = list[1].toInt(); | 2670 | y = list[1].toInt(); |
2672 | w = list[2].toInt(); | 2671 | w = list[2].toInt(); |
2673 | h = list[3].toInt(); | 2672 | h = list[3].toInt(); |
2674 | KApplication::testCoords( &x,&y,&w,&h ); | 2673 | KApplication::testCoords( &x,&y,&w,&h ); |
2675 | getEventViewerDialog()->setGeometry(x,y,w,h); | 2674 | getEventViewerDialog()->setGeometry(x,y,w,h); |
2676 | } | 2675 | } |
2677 | #endif | 2676 | #endif |
2678 | config->setGroup( "Views" ); | 2677 | config->setGroup( "Views" ); |
2679 | int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); | 2678 | int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); |
2680 | 2679 | ||
2681 | QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame"); | 2680 | QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame"); |
2682 | 2681 | ||
2683 | int resetval = 0; | 2682 | int resetval = 0; |
2684 | int maxVal = 0; | 2683 | int maxVal = 0; |
2685 | if (sizes.count() != 3) { | 2684 | if (sizes.count() != 3) { |
2686 | if ( KOPrefs::instance()->mVerticalScreen ) { | 2685 | if ( KOPrefs::instance()->mVerticalScreen ) { |
2687 | resetval = mDateNavigator->sizeHint().width()+2; | 2686 | resetval = mDateNavigator->sizeHint().width()+2; |
2688 | } else { | 2687 | } else { |
2689 | resetval = mDateNavigator->sizeHint().height()+2; | 2688 | resetval = mDateNavigator->sizeHint().height()+2; |
2690 | } | 2689 | } |
2691 | } | 2690 | } |
2692 | if ( resetval ) { | 2691 | if ( resetval ) { |
2693 | sizes.clear(); | 2692 | sizes.clear(); |
2694 | if ( KOPrefs::instance()->mVerticalScreen ) { | 2693 | if ( KOPrefs::instance()->mVerticalScreen ) { |
2695 | maxVal = QApplication::desktop()->width() -10; | 2694 | maxVal = QApplication::desktop()->width() -10; |
2696 | } else { | 2695 | } else { |
2697 | maxVal = QApplication::desktop()->height()-10; | 2696 | maxVal = QApplication::desktop()->height()-10; |
2698 | } | 2697 | } |
2699 | sizes << resetval; | 2698 | sizes << resetval; |
2700 | if ( maxVal < resetval + resetval) | 2699 | if ( maxVal < resetval + resetval) |
2701 | resetval = maxVal - resetval; | 2700 | resetval = maxVal - resetval; |
2702 | sizes << resetval; | 2701 | sizes << resetval; |
2703 | sizes << 100; | 2702 | sizes << 100; |
2704 | } | 2703 | } |
2705 | mLeftFrame->setSizes(sizes); | 2704 | mLeftFrame->setSizes(sizes); |
2706 | sizes = config->readIntListEntry("Main Splitter Frame"); | 2705 | sizes = config->readIntListEntry("Main Splitter Frame"); |
2707 | resetval = 0; | 2706 | resetval = 0; |
2708 | maxVal = 0; | 2707 | maxVal = 0; |
2709 | if (sizes.count() != 2) { | 2708 | if (sizes.count() != 2) { |
2710 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 2709 | if ( !KOPrefs::instance()->mVerticalScreen ) { |
2711 | resetval = mDateNavigator->sizeHint().width()+2; | 2710 | resetval = mDateNavigator->sizeHint().width()+2; |
2712 | } else { | 2711 | } else { |
2713 | resetval = mDateNavigator->sizeHint().height()+2; | 2712 | resetval = mDateNavigator->sizeHint().height()+2; |
2714 | } | 2713 | } |
2715 | } | 2714 | } |
2716 | if ( resetval ) { | 2715 | if ( resetval ) { |
2717 | sizes.clear(); | 2716 | sizes.clear(); |
2718 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 2717 | if ( !KOPrefs::instance()->mVerticalScreen ) { |
2719 | maxVal = QApplication::desktop()->width() -10; | 2718 | maxVal = QApplication::desktop()->width() -10; |
2720 | } else { | 2719 | } else { |
2721 | maxVal = QApplication::desktop()->height()-10; | 2720 | maxVal = QApplication::desktop()->height()-10; |
2722 | } | 2721 | } |
2723 | sizes << resetval; | 2722 | sizes << resetval; |
2724 | if ( maxVal < resetval + resetval) | 2723 | if ( maxVal < resetval + resetval) |
2725 | resetval = maxVal - resetval; | 2724 | resetval = maxVal - resetval; |
2726 | sizes << resetval; | 2725 | sizes << resetval; |
2727 | } | 2726 | } |
2728 | mMainFrame->setSizes(sizes); | 2727 | mMainFrame->setSizes(sizes); |
2729 | if ( dateCount == 5 ) mNavigator->selectWorkWeek(); | 2728 | if ( dateCount == 5 ) mNavigator->selectWorkWeek(); |
2730 | else if ( dateCount == 7 ) mNavigator->selectWeek(); | 2729 | else if ( dateCount == 7 ) mNavigator->selectWeek(); |
2731 | else mNavigator->selectDates( dateCount ); | 2730 | else mNavigator->selectDates( dateCount ); |
2732 | // mViewManager->readSettings( config ); | 2731 | // mViewManager->readSettings( config ); |
2733 | updateConfig(); | 2732 | updateConfig(); |
2734 | globalFlagBlockAgenda = 2; | 2733 | globalFlagBlockAgenda = 2; |
2735 | mViewManager->readSettings( config ); | 2734 | mViewManager->readSettings( config ); |
2736 | QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); | 2735 | QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); |
2737 | } | 2736 | } |
2738 | 2737 | ||
2739 | void CalendarView::checkSuspendAlarm() | 2738 | void CalendarView::checkSuspendAlarm() |
2740 | { | 2739 | { |
2741 | if ( mSuspendTimer->isActive() ) { | 2740 | if ( mSuspendTimer->isActive() ) { |
2742 | KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm")); | 2741 | KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm")); |
2743 | } | 2742 | } |
2744 | } | 2743 | } |
2745 | void CalendarView::writeSettings() | 2744 | void CalendarView::writeSettings() |
2746 | { | 2745 | { |
2747 | // kdDebug() << "CalendarView::writeSettings" << endl; | 2746 | // kdDebug() << "CalendarView::writeSettings" << endl; |
2748 | 2747 | ||
2749 | KConfig *config = KOGlobals::config(); | 2748 | KConfig *config = KOGlobals::config(); |
2750 | 2749 | ||
2751 | mViewManager->writeSettings( config ); | 2750 | mViewManager->writeSettings( config ); |
2752 | mTodoList->saveLayout(config,QString("Todo Layout")); | 2751 | mTodoList->saveLayout(config,QString("Todo Layout")); |
2753 | mDialogManager->writeSettings( config ); | 2752 | mDialogManager->writeSettings( config ); |
2754 | //KOPrefs::instance()->usrWriteConfig(); | 2753 | //KOPrefs::instance()->usrWriteConfig(); |
2755 | KOPrefs::instance()->writeConfig(); | 2754 | KOPrefs::instance()->writeConfig(); |
2756 | 2755 | ||
2757 | writeFilterSettings(config); | 2756 | writeFilterSettings(config); |
2758 | config->setGroup( "AppRun" ); | 2757 | config->setGroup( "AppRun" ); |
2759 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 2758 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
2760 | int days = dt.daysTo( QDate::currentDate() ); | 2759 | int days = dt.daysTo( QDate::currentDate() ); |
2761 | dt = dt.addDays( days ); | 2760 | dt = dt.addDays( days ); |
2762 | int secs = dt.secsTo( QDateTime::currentDateTime() ); | 2761 | int secs = dt.secsTo( QDateTime::currentDateTime() ); |
2763 | config->writeEntry( "LatestProgramStopDays", days ); | 2762 | config->writeEntry( "LatestProgramStopDays", days ); |
2764 | config->writeEntry( "LatestProgramStopSecs", secs ); | 2763 | config->writeEntry( "LatestProgramStopSecs", secs ); |
2765 | //qDebug("KO: Writing stop time: %d ", secs); | 2764 | //qDebug("KO: Writing stop time: %d ", secs); |
2766 | //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() ); | 2765 | //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() ); |
2767 | //QDateTime latest = dt.addSecs ( secs ); | 2766 | //QDateTime latest = dt.addSecs ( secs ); |
2768 | //qDebug("KO: Termination on %s ", latest.toString().latin1()); | 2767 | //qDebug("KO: Termination on %s ", latest.toString().latin1()); |
2769 | config->setGroup( "Views" ); | 2768 | config->setGroup( "Views" ); |
2770 | config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() ); | 2769 | config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() ); |
2771 | 2770 | ||
2772 | #if 0 | 2771 | #if 0 |
2773 | qDebug("********************* "); | 2772 | qDebug("********************* "); |
2774 | qDebug("Testcode secsto "); | 2773 | qDebug("Testcode secsto "); |
2775 | QDateTime dt_nodaylight ( QDate (2005,3,26), QTime( 0,0,0 ) ); | 2774 | QDateTime dt_nodaylight ( QDate (2005,3,26), QTime( 0,0,0 ) ); |
2776 | QDateTime dt_daylight ( QDate (2005,3,29), QTime( 0,0,0 ) ); | 2775 | QDateTime dt_daylight ( QDate (2005,3,29), QTime( 0,0,0 ) ); |
2777 | int secsto = dt_nodaylight.secsTo( dt_daylight ); | 2776 | int secsto = dt_nodaylight.secsTo( dt_daylight ); |
2778 | QDateTime dt_daylight_wrong = dt_nodaylight.addSecs( secsto ); | 2777 | QDateTime dt_daylight_wrong = dt_nodaylight.addSecs( secsto ); |
2779 | qDebug("dt nodaylight %s ",dt_nodaylight.toString().latin1() ); | 2778 | qDebug("dt nodaylight %s ",dt_nodaylight.toString().latin1() ); |
2780 | qDebug("dt daylight %s ",dt_daylight.toString().latin1() ); | 2779 | qDebug("dt daylight %s ",dt_daylight.toString().latin1() ); |
2781 | qDebug("dt daylight_wrong %s ",dt_daylight_wrong.toString().latin1() ); | 2780 | qDebug("dt daylight_wrong %s ",dt_daylight_wrong.toString().latin1() ); |
2782 | qDebug("Computed secsTo %d . in minutes: %d . in hours: %d ", secsto, secsto/60, secsto/3600); | 2781 | qDebug("Computed secsTo %d . in minutes: %d . in hours: %d ", secsto, secsto/60, secsto/3600); |
2783 | qDebug("********************* testcode end"); | 2782 | qDebug("********************* testcode end"); |
2784 | 2783 | ||
2785 | #endif | 2784 | #endif |
2786 | 2785 | ||
2787 | QValueList<int> listINT = mLeftFrame->sizes(); | 2786 | QValueList<int> listINT = mLeftFrame->sizes(); |
2788 | config->writeEntry("Left Splitter Frame",listINT); | 2787 | config->writeEntry("Left Splitter Frame",listINT); |
2789 | QValueList<int> listINT2 = mMainFrame->sizes(); | 2788 | QValueList<int> listINT2 = mMainFrame->sizes(); |
2790 | config->writeEntry("Main Splitter Frame",listINT2); | 2789 | config->writeEntry("Main Splitter Frame",listINT2); |
2791 | #ifdef DESKTOP_VERSION | 2790 | #ifdef DESKTOP_VERSION |
2792 | config->setGroup("WidgetLayout"); | 2791 | config->setGroup("WidgetLayout"); |
2793 | QStringList list ;//= config->readListEntry("MainLayout"); | 2792 | QStringList list ;//= config->readListEntry("MainLayout"); |
2794 | int x,y,w,h; | 2793 | int x,y,w,h; |
2795 | QWidget* wid; | 2794 | QWidget* wid; |
2796 | wid = topLevelWidget(); | 2795 | wid = topLevelWidget(); |
2797 | x = wid->geometry().x(); | 2796 | x = wid->geometry().x(); |
2798 | y = wid->geometry().y(); | 2797 | y = wid->geometry().y(); |
2799 | w = wid->width(); | 2798 | w = wid->width(); |
2800 | h = wid->height(); | 2799 | h = wid->height(); |
2801 | list.clear(); | 2800 | list.clear(); |
2802 | list << QString::number( x ); | 2801 | list << QString::number( x ); |
2803 | list << QString::number( y ); | 2802 | list << QString::number( y ); |
2804 | list << QString::number( w ); | 2803 | list << QString::number( w ); |
2805 | list << QString::number( h ); | 2804 | list << QString::number( h ); |
2806 | config->writeEntry("MainLayout",list ); | 2805 | config->writeEntry("MainLayout",list ); |
2807 | 2806 | ||
2808 | wid = mEventEditor; | 2807 | wid = mEventEditor; |
2809 | x = wid->geometry().x(); | 2808 | x = wid->geometry().x(); |
2810 | y = wid->geometry().y(); | 2809 | y = wid->geometry().y(); |
2811 | w = wid->width(); | 2810 | w = wid->width(); |
2812 | h = wid->height(); | 2811 | h = wid->height(); |
2813 | list.clear(); | 2812 | list.clear(); |
2814 | list << QString::number( x ); | 2813 | list << QString::number( x ); |
2815 | list << QString::number( y ); | 2814 | list << QString::number( y ); |
2816 | list << QString::number( w ); | 2815 | list << QString::number( w ); |
2817 | list << QString::number( h ); | 2816 | list << QString::number( h ); |
2818 | config->writeEntry("EditEventLayout",list ); | 2817 | config->writeEntry("EditEventLayout",list ); |
2819 | 2818 | ||
2820 | wid = mTodoEditor; | 2819 | wid = mTodoEditor; |
2821 | x = wid->geometry().x(); | 2820 | x = wid->geometry().x(); |
2822 | y = wid->geometry().y(); | 2821 | y = wid->geometry().y(); |
2823 | w = wid->width(); | 2822 | w = wid->width(); |
2824 | h = wid->height(); | 2823 | h = wid->height(); |
2825 | list.clear(); | 2824 | list.clear(); |
2826 | list << QString::number( x ); | 2825 | list << QString::number( x ); |
2827 | list << QString::number( y ); | 2826 | list << QString::number( y ); |
2828 | list << QString::number( w ); | 2827 | list << QString::number( w ); |
2829 | list << QString::number( h ); | 2828 | list << QString::number( h ); |
2830 | config->writeEntry("EditTodoLayout",list ); | 2829 | config->writeEntry("EditTodoLayout",list ); |
2831 | wid = getEventViewerDialog(); | 2830 | wid = getEventViewerDialog(); |
2832 | x = wid->geometry().x(); | 2831 | x = wid->geometry().x(); |
2833 | y = wid->geometry().y(); | 2832 | y = wid->geometry().y(); |
2834 | w = wid->width(); | 2833 | w = wid->width(); |
2835 | h = wid->height(); | 2834 | h = wid->height(); |
2836 | list.clear(); | 2835 | list.clear(); |
2837 | list << QString::number( x ); | 2836 | list << QString::number( x ); |
2838 | list << QString::number( y ); | 2837 | list << QString::number( y ); |
2839 | list << QString::number( w ); | 2838 | list << QString::number( w ); |
2840 | list << QString::number( h ); | 2839 | list << QString::number( h ); |
2841 | config->writeEntry("ViewerLayout",list ); | 2840 | config->writeEntry("ViewerLayout",list ); |
2842 | wid = mDialogManager->getSearchDialog(); | 2841 | wid = mDialogManager->getSearchDialog(); |
2843 | if ( wid ) { | 2842 | if ( wid ) { |
2844 | x = wid->geometry().x(); | 2843 | x = wid->geometry().x(); |
2845 | y = wid->geometry().y(); | 2844 | y = wid->geometry().y(); |
2846 | w = wid->width(); | 2845 | w = wid->width(); |
2847 | h = wid->height(); | 2846 | h = wid->height(); |
2848 | list.clear(); | 2847 | list.clear(); |
2849 | list << QString::number( x ); | 2848 | list << QString::number( x ); |
2850 | list << QString::number( y ); | 2849 | list << QString::number( y ); |
2851 | list << QString::number( w ); | 2850 | list << QString::number( w ); |
2852 | list << QString::number( h ); | 2851 | list << QString::number( h ); |
2853 | config->writeEntry("SearchLayout",list ); | 2852 | config->writeEntry("SearchLayout",list ); |
2854 | } | 2853 | } |
2855 | #endif | 2854 | #endif |
2856 | 2855 | ||
2857 | 2856 | ||
2858 | config->sync(); | 2857 | config->sync(); |
2859 | } | 2858 | } |
2860 | 2859 | ||
2861 | void CalendarView::readFilterSettings(KConfig *config) | 2860 | void CalendarView::readFilterSettings(KConfig *config) |
2862 | { | 2861 | { |
2863 | // kdDebug() << "CalendarView::readFilterSettings()" << endl; | 2862 | // kdDebug() << "CalendarView::readFilterSettings()" << endl; |
2864 | 2863 | ||
2865 | mFilters.clear(); | 2864 | mFilters.clear(); |
2866 | 2865 | ||
2867 | config->setGroup("General"); | 2866 | config->setGroup("General"); |
2868 | QStringList filterList = config->readListEntry("CalendarFilters"); | 2867 | QStringList filterList = config->readListEntry("CalendarFilters"); |
2869 | 2868 | ||
2870 | QStringList::ConstIterator it = filterList.begin(); | 2869 | QStringList::ConstIterator it = filterList.begin(); |
2871 | QStringList::ConstIterator end = filterList.end(); | 2870 | QStringList::ConstIterator end = filterList.end(); |
2872 | while(it != end) { | 2871 | while(it != end) { |
2873 | // kdDebug() << " filter: " << (*it) << endl; | 2872 | // kdDebug() << " filter: " << (*it) << endl; |
2874 | 2873 | ||
2875 | CalFilter *filter; | 2874 | CalFilter *filter; |
2876 | filter = new CalFilter(*it); | 2875 | filter = new CalFilter(*it); |
2877 | config->setGroup("Filter_" + (*it).utf8()); | 2876 | config->setGroup("Filter_" + (*it).utf8()); |
2878 | //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) ); | 2877 | //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) ); |
2879 | filter->setCriteria(config->readNumEntry("Criteria",0)); | 2878 | filter->setCriteria(config->readNumEntry("Criteria",0)); |
2880 | filter->setCategoryList(config->readListEntry("CategoryList")); | 2879 | filter->setCategoryList(config->readListEntry("CategoryList")); |
2881 | mFilters.append(filter); | 2880 | mFilters.append(filter); |
2882 | 2881 | ||
2883 | ++it; | 2882 | ++it; |
2884 | } | 2883 | } |
2885 | 2884 | ||
2886 | if (mFilters.count() == 0) { | 2885 | if (mFilters.count() == 0) { |
2887 | CalFilter *filter = new CalFilter(i18n("Default")); | 2886 | CalFilter *filter = new CalFilter(i18n("Default")); |
2888 | mFilters.append(filter); | 2887 | mFilters.append(filter); |
2889 | } | 2888 | } |
2890 | mFilterView->updateFilters(); | 2889 | mFilterView->updateFilters(); |
2891 | config->setGroup("FilterView"); | 2890 | config->setGroup("FilterView"); |
2892 | 2891 | ||
2893 | mFilterView->blockSignals(true); | 2892 | mFilterView->blockSignals(true); |
2894 | mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled")); | 2893 | mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled")); |
2895 | mFilterView->setSelectedFilter(config->readEntry("Current Filter")); | 2894 | mFilterView->setSelectedFilter(config->readEntry("Current Filter")); |
2896 | mFilterView->blockSignals(false); | 2895 | mFilterView->blockSignals(false); |
2897 | // We do it manually to avoid it being done twice by the above calls | 2896 | // We do it manually to avoid it being done twice by the above calls |
2898 | updateFilter(); | 2897 | updateFilter(); |
2899 | } | 2898 | } |
2900 | 2899 | ||
2901 | void CalendarView::writeFilterSettings(KConfig *config) | 2900 | void CalendarView::writeFilterSettings(KConfig *config) |
2902 | { | 2901 | { |
2903 | // kdDebug() << "CalendarView::writeFilterSettings()" << endl; | 2902 | // kdDebug() << "CalendarView::writeFilterSettings()" << endl; |
2904 | 2903 | ||
2905 | QStringList filterList; | 2904 | QStringList filterList; |
2906 | 2905 | ||
2907 | CalFilter *filter = mFilters.first(); | 2906 | CalFilter *filter = mFilters.first(); |
2908 | while(filter) { | 2907 | while(filter) { |
2909 | // kdDebug() << " fn: " << filter->name() << endl; | 2908 | // kdDebug() << " fn: " << filter->name() << endl; |
2910 | filterList << filter->name(); | 2909 | filterList << filter->name(); |
2911 | config->setGroup("Filter_" + filter->name().utf8()); | 2910 | config->setGroup("Filter_" + filter->name().utf8()); |
2912 | config->writeEntry("Criteria",filter->criteria()); | 2911 | config->writeEntry("Criteria",filter->criteria()); |
2913 | config->writeEntry("CategoryList",filter->categoryList()); | 2912 | config->writeEntry("CategoryList",filter->categoryList()); |
2914 | filter = mFilters.next(); | 2913 | filter = mFilters.next(); |
2915 | } | 2914 | } |
2916 | config->setGroup("General"); | 2915 | config->setGroup("General"); |
2917 | config->writeEntry("CalendarFilters",filterList); | 2916 | config->writeEntry("CalendarFilters",filterList); |
2918 | 2917 | ||
2919 | config->setGroup("FilterView"); | 2918 | config->setGroup("FilterView"); |
2920 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); | 2919 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); |
2921 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); | 2920 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); |
2922 | } | 2921 | } |
2923 | 2922 | ||
2924 | 2923 | ||
2925 | void CalendarView::goToday() | 2924 | void CalendarView::goToday() |
2926 | { | 2925 | { |
2927 | if ( mViewManager->currentView()->isMonthView() ) | 2926 | if ( mViewManager->currentView()->isMonthView() ) |
2928 | mNavigator->selectTodayMonth(); | 2927 | mNavigator->selectTodayMonth(); |
2929 | else | 2928 | else |
2930 | mNavigator->selectToday(); | 2929 | mNavigator->selectToday(); |
2931 | } | 2930 | } |
2932 | 2931 | ||
2933 | void CalendarView::goNext() | 2932 | void CalendarView::goNext() |
2934 | { | 2933 | { |