-rw-r--r-- | korganizer/calendarview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 51eb1d4..706d05d 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -463,122 +463,124 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
463 | void toggleDateNavigatorWidget(); | 463 | void toggleDateNavigatorWidget(); |
464 | void toggleAllDaySize(); | 464 | void toggleAllDaySize(); |
465 | 465 | ||
466 | /** Look for new messages in the inbox */ | 466 | /** Look for new messages in the inbox */ |
467 | void lookForIncomingMessages(); | 467 | void lookForIncomingMessages(); |
468 | /** Look for new messages in the outbox */ | 468 | /** Look for new messages in the outbox */ |
469 | void lookForOutgoingMessages(); | 469 | void lookForOutgoingMessages(); |
470 | 470 | ||
471 | void processMainViewSelection( Incidence * ); | 471 | void processMainViewSelection( Incidence * ); |
472 | void processTodoListSelection( Incidence * ); | 472 | void processTodoListSelection( Incidence * ); |
473 | 473 | ||
474 | void processIncidenceSelection( Incidence * ); | 474 | void processIncidenceSelection( Incidence * ); |
475 | 475 | ||
476 | void purgeCompleted(); | 476 | void purgeCompleted(); |
477 | bool removeCompletedSubTodos( Todo* ); | 477 | bool removeCompletedSubTodos( Todo* ); |
478 | void slotCalendarChanged(); | 478 | void slotCalendarChanged(); |
479 | bool importBday(); | 479 | bool importBday(); |
480 | bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); | 480 | bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); |
481 | bool importQtopia( const QString &categoriesFile, | 481 | bool importQtopia( const QString &categoriesFile, |
482 | const QString &datebookFile, | 482 | const QString &datebookFile, |
483 | const QString &tasklistFile ); | 483 | const QString &tasklistFile ); |
484 | void syncExternal( int mode ); | 484 | void syncExternal( int mode ); |
485 | void slotSelectPickerDate( QDate ) ; | 485 | void slotSelectPickerDate( QDate ) ; |
486 | void showDatePicker() ; | 486 | void showDatePicker() ; |
487 | void showDatePickerPopup() ; | 487 | void showDatePickerPopup() ; |
488 | void moveIncidence(Incidence *) ; | 488 | void moveIncidence(Incidence *) ; |
489 | void beamIncidence(Incidence *) ; | 489 | void beamIncidence(Incidence *) ; |
490 | void beamCalendar() ; | 490 | void beamCalendar() ; |
491 | void beamFilteredCalendar() ; | 491 | void beamFilteredCalendar() ; |
492 | void beamIncidenceList(QPtrList<Incidence>) ; | 492 | void beamIncidenceList(QPtrList<Incidence>) ; |
493 | void manageCategories(); | 493 | void manageCategories(); |
494 | void editCategories(); | 494 | void editCategories(); |
495 | int addCategories(); | 495 | int addCategories(); |
496 | void removeCategories(); | 496 | void removeCategories(); |
497 | void setSyncDevice( QString ); | 497 | void setSyncDevice( QString ); |
498 | void setSyncName( QString ); | 498 | void setSyncName( QString ); |
499 | void showDay( QDate ); | 499 | void showDay( QDate ); |
500 | void undo_delete(); | 500 | void undo_delete(); |
501 | protected slots: | 501 | protected slots: |
502 | void resetFocus(); | 502 | void resetFocus(); |
503 | void scrollBarValue(int); | 503 | void scrollBarValue(int); |
504 | void slotViewerClosed(); | 504 | void slotViewerClosed(); |
505 | void timerAlarm(); | 505 | void timerAlarm(); |
506 | void suspendAlarm(); | 506 | void suspendAlarm(); |
507 | void beamDone( Ir *ir ); | 507 | void beamDone( Ir *ir ); |
508 | /** Select a view or adapt the current view to display the specified dates. */ | 508 | /** Select a view or adapt the current view to display the specified dates. */ |
509 | void showDates( const KCal::DateList & ); | 509 | void showDates( const KCal::DateList & ); |
510 | void selectWeekNum ( int ); | 510 | void selectWeekNum ( int ); |
511 | void checkConflictForEvent(); | ||
511 | 512 | ||
512 | public: | 513 | public: |
513 | // show a standard warning | 514 | // show a standard warning |
514 | // returns KMsgBox::yesNoCancel() | 515 | // returns KMsgBox::yesNoCancel() |
515 | int msgCalModified(); | 516 | int msgCalModified(); |
516 | virtual bool sync(KSyncManager* manager, QString filename, int mode); | 517 | virtual bool sync(KSyncManager* manager, QString filename, int mode); |
517 | 518 | ||
518 | virtual bool syncExternal(KSyncManager* manager, QString resource); | 519 | virtual bool syncExternal(KSyncManager* manager, QString resource); |
519 | virtual void removeSyncInfo( QString syncProfile); | 520 | virtual void removeSyncInfo( QString syncProfile); |
520 | void setSyncManager(KSyncManager* manager); | 521 | void setSyncManager(KSyncManager* manager); |
521 | void setLoadedFileVersion(QDateTime); | 522 | void setLoadedFileVersion(QDateTime); |
522 | bool checkFileVersion(QString fn); | 523 | bool checkFileVersion(QString fn); |
523 | bool checkAllFileVersions(); | 524 | bool checkAllFileVersions(); |
524 | bool checkFileChanged(QString fn); | 525 | bool checkFileChanged(QString fn); |
525 | Event* getLastSyncEvent(); | 526 | Event* getLastSyncEvent(); |
526 | /** Adapt navigation units correpsonding to step size of navigation of the | 527 | /** Adapt navigation units correpsonding to step size of navigation of the |
527 | * current view. | 528 | * current view. |
528 | */ | 529 | */ |
529 | void adaptNavigationUnits(); | 530 | void adaptNavigationUnits(); |
530 | bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); | 531 | bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); |
531 | int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); | 532 | int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); |
532 | //Attendee* getYourAttendee(Event *event); | 533 | //Attendee* getYourAttendee(Event *event); |
533 | void setBlockShowDates( bool b ) { mBlockShowDates = b ;} | 534 | void setBlockShowDates( bool b ) { mBlockShowDates = b ;} |
534 | void setScrollBarStep(int val ); | 535 | void setScrollBarStep(int val ); |
535 | 536 | ||
536 | protected: | 537 | protected: |
538 | Event *mConflictingEvent; | ||
537 | void schedule(Scheduler::Method, Incidence *incidence = 0); | 539 | void schedule(Scheduler::Method, Incidence *incidence = 0); |
538 | 540 | ||
539 | // returns KMsgBox::OKCandel() | 541 | // returns KMsgBox::OKCandel() |
540 | int msgItemDelete(const QString name); | 542 | int msgItemDelete(const QString name); |
541 | void showEventEditor(); | 543 | void showEventEditor(); |
542 | void showTodoEditor(); | 544 | void showTodoEditor(); |
543 | Todo *selectedTodo(); | 545 | Todo *selectedTodo(); |
544 | private: | 546 | private: |
545 | #ifdef DESKTOP_VERSION | 547 | #ifdef DESKTOP_VERSION |
546 | QScrollBar * mDateScrollBar; | 548 | QScrollBar * mDateScrollBar; |
547 | #endif | 549 | #endif |
548 | QDateTime mNextAlarmDateTime; | 550 | QDateTime mNextAlarmDateTime; |
549 | bool mViewerCallerIsSearchDialog; | 551 | bool mViewerCallerIsSearchDialog; |
550 | bool mBlockShowDates; | 552 | bool mBlockShowDates; |
551 | KSyncManager* mSyncManager; | 553 | KSyncManager* mSyncManager; |
552 | AlarmDialog * mAlarmDialog; | 554 | AlarmDialog * mAlarmDialog; |
553 | QString mAlarmNotification; | 555 | QString mAlarmNotification; |
554 | QString mSuspendAlarmNotification; | 556 | QString mSuspendAlarmNotification; |
555 | QTimer* mSuspendTimer; | 557 | QTimer* mSuspendTimer; |
556 | QTimer* mAlarmTimer; | 558 | QTimer* mAlarmTimer; |
557 | QTimer* mRecheckAlarmTimer; | 559 | QTimer* mRecheckAlarmTimer; |
558 | void computeAlarm( QString ); | 560 | void computeAlarm( QString ); |
559 | void startAlarm( QString, QString ); | 561 | void startAlarm( QString, QString ); |
560 | void setSyncEventsReadOnly(); | 562 | void setSyncEventsReadOnly(); |
561 | 563 | ||
562 | QDateTime loadedFileVersion; | 564 | QDateTime loadedFileVersion; |
563 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); | 565 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); |
564 | void checkExternalId( Incidence * inc ); | 566 | void checkExternalId( Incidence * inc ); |
565 | int mGlobalSyncMode; | 567 | int mGlobalSyncMode; |
566 | QString mCurrentSyncDevice; | 568 | QString mCurrentSyncDevice; |
567 | QString mCurrentSyncName; | 569 | QString mCurrentSyncName; |
568 | void init(); | 570 | void init(); |
569 | int mDatePickerMode; | 571 | int mDatePickerMode; |
570 | bool mFlagEditDescription; | 572 | bool mFlagEditDescription; |
571 | QDateTime mLastCalendarSync; | 573 | QDateTime mLastCalendarSync; |
572 | void createPrinter(); | 574 | void createPrinter(); |
573 | 575 | ||
574 | void calendarModified( bool, Calendar * ); | 576 | void calendarModified( bool, Calendar * ); |
575 | 577 | ||
576 | CalPrinter *mCalPrinter; | 578 | CalPrinter *mCalPrinter; |
577 | 579 | ||
578 | QSplitter *mPanner; | 580 | QSplitter *mPanner; |
579 | QSplitter *mLeftSplitter; | 581 | QSplitter *mLeftSplitter; |
580 | KDGanttMinimizeSplitter *mLeftFrame, *mMainFrame; | 582 | KDGanttMinimizeSplitter *mLeftFrame, *mMainFrame; |
581 | QWidgetStack *mRightFrame; | 583 | QWidgetStack *mRightFrame; |
582 | 584 | ||
583 | KDatePicker* mDatePicker; | 585 | KDatePicker* mDatePicker; |
584 | QVBox* mDateFrame; | 586 | QVBox* mDateFrame; |