-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7044e90..f9685e9 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -346,49 +346,49 @@ CalendarView::CalendarView( CalendarResources *calendar, | |||
346 | mResourceManager( calendar->resourceManager() ) | 346 | mResourceManager( calendar->resourceManager() ) |
347 | { | 347 | { |
348 | 348 | ||
349 | mEventEditor = 0; | 349 | mEventEditor = 0; |
350 | mTodoEditor = 0; | 350 | mTodoEditor = 0; |
351 | 351 | ||
352 | init(); | 352 | init(); |
353 | } | 353 | } |
354 | 354 | ||
355 | CalendarView::CalendarView( Calendar *calendar, | 355 | CalendarView::CalendarView( Calendar *calendar, |
356 | QWidget *parent, const char *name ) | 356 | QWidget *parent, const char *name ) |
357 | : CalendarViewBase( parent, name ), | 357 | : CalendarViewBase( parent, name ), |
358 | mCalendar( calendar ), | 358 | mCalendar( calendar ), |
359 | mResourceManager( 0 ) | 359 | mResourceManager( 0 ) |
360 | { | 360 | { |
361 | 361 | ||
362 | mEventEditor = 0; | 362 | mEventEditor = 0; |
363 | mTodoEditor = 0; | 363 | mTodoEditor = 0; |
364 | init(); | 364 | init(); |
365 | } | 365 | } |
366 | 366 | ||
367 | void CalendarView::init() | 367 | void CalendarView::init() |
368 | { | 368 | { |
369 | mNextAlarmDateTime = QDateTime::currentDateTime(); | 369 | mNextAlarmDateTime = QDateTime::currentDateTime(); |
370 | setFocusPolicy ( NoFocus ); | 370 | //setFocusPolicy ( NoFocus ); |
371 | mViewerCallerIsSearchDialog = false; | 371 | mViewerCallerIsSearchDialog = false; |
372 | mBlockShowDates = false; | 372 | mBlockShowDates = false; |
373 | 373 | ||
374 | mDatePickerMode = 0; | 374 | mDatePickerMode = 0; |
375 | mCurrentSyncDevice = ""; | 375 | mCurrentSyncDevice = ""; |
376 | mViewManager = new KOViewManager( this ); | 376 | mViewManager = new KOViewManager( this ); |
377 | mDialogManager = new KODialogManager( this ); | 377 | mDialogManager = new KODialogManager( this ); |
378 | mEventViewerDialog = 0; | 378 | mEventViewerDialog = 0; |
379 | mModified = false; | 379 | mModified = false; |
380 | mReadOnly = false; | 380 | mReadOnly = false; |
381 | mSelectedIncidence = 0; | 381 | mSelectedIncidence = 0; |
382 | mCalPrinter = 0; | 382 | mCalPrinter = 0; |
383 | mFilters.setAutoDelete(true); | 383 | mFilters.setAutoDelete(true); |
384 | 384 | ||
385 | mCalendar->registerObserver( this ); | 385 | mCalendar->registerObserver( this ); |
386 | // TODO: Make sure that view is updated, when calendar is changed. | 386 | // TODO: Make sure that view is updated, when calendar is changed. |
387 | 387 | ||
388 | mStorage = new FileStorage( mCalendar ); | 388 | mStorage = new FileStorage( mCalendar ); |
389 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); | 389 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); |
390 | 390 | ||
391 | QBoxLayout *topLayout = (QBoxLayout*)layout(); | 391 | QBoxLayout *topLayout = (QBoxLayout*)layout(); |
392 | #ifndef KORG_NOSPLITTER | 392 | #ifndef KORG_NOSPLITTER |
393 | // create the main layout frames. | 393 | // create the main layout frames. |
394 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); | 394 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); |
@@ -4666,50 +4666,50 @@ void CalendarView::purgeCompleted() | |||
4666 | QPtrList<Todo> todoCal; | 4666 | QPtrList<Todo> todoCal; |
4667 | QPtrList<Todo> rootTodos; | 4667 | QPtrList<Todo> rootTodos; |
4668 | //QPtrList<Incidence> rel; | 4668 | //QPtrList<Incidence> rel; |
4669 | Todo *aTodo; | 4669 | Todo *aTodo; |
4670 | todoCal = calendar()->todos(); | 4670 | todoCal = calendar()->todos(); |
4671 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { | 4671 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { |
4672 | if ( !aTodo->relatedTo() ) | 4672 | if ( !aTodo->relatedTo() ) |
4673 | rootTodos.append( aTodo ); | 4673 | rootTodos.append( aTodo ); |
4674 | } | 4674 | } |
4675 | for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) { | 4675 | for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) { |
4676 | removeCompletedSubTodos( aTodo ); | 4676 | removeCompletedSubTodos( aTodo ); |
4677 | } | 4677 | } |
4678 | 4678 | ||
4679 | updateView(); | 4679 | updateView(); |
4680 | } | 4680 | } |
4681 | } | 4681 | } |
4682 | 4682 | ||
4683 | void CalendarView::slotCalendarChanged() | 4683 | void CalendarView::slotCalendarChanged() |
4684 | { | 4684 | { |
4685 | ; | 4685 | ; |
4686 | } | 4686 | } |
4687 | 4687 | ||
4688 | void CalendarView::keyPressEvent ( QKeyEvent *e) | 4688 | void CalendarView::keyPressEvent ( QKeyEvent *e) |
4689 | { | 4689 | { |
4690 | //qDebug(" alendarView::keyPressEvent "); | 4690 | //qDebug("CalendarView::keyPressEvent "); |
4691 | e->ignore(); | 4691 | e->ignore(); |
4692 | } | 4692 | } |
4693 | 4693 | ||
4694 | 4694 | ||
4695 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | 4695 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) |
4696 | { | 4696 | { |
4697 | 4697 | ||
4698 | if ( manager != mSyncManager) | 4698 | if ( manager != mSyncManager) |
4699 | qDebug("KO: Internal error-1. SyncManager mismatch "); | 4699 | qDebug("KO: Internal error-1. SyncManager mismatch "); |
4700 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { | 4700 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { |
4701 | qDebug("KO: SyncKDE request detected!"); | 4701 | qDebug("KO: SyncKDE request detected!"); |
4702 | } | 4702 | } |
4703 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 4703 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
4704 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 4704 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
4705 | return syncCalendar( filename, mode ); | 4705 | return syncCalendar( filename, mode ); |
4706 | } | 4706 | } |
4707 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) | 4707 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) |
4708 | { | 4708 | { |
4709 | //mSyncManager = manager; | 4709 | //mSyncManager = manager; |
4710 | if ( manager != mSyncManager) | 4710 | if ( manager != mSyncManager) |
4711 | qDebug("KO: Internal error-2. SyncManager mismatch "); | 4711 | qDebug("KO: Internal error-2. SyncManager mismatch "); |
4712 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 4712 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
4713 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 4713 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
4714 | if ( resource == "sharp" ) | 4714 | if ( resource == "sharp" ) |
4715 | syncExternal( 0 ); | 4715 | syncExternal( 0 ); |