-rw-r--r-- | korganizer/calendarview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index e7aa351..fda02f7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -158,33 +158,34 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
158 | void pasteEnabled(bool); | 158 | void pasteEnabled(bool); |
159 | 159 | ||
160 | /** Emitted, when the number of incoming messages has changed. */ | 160 | /** Emitted, when the number of incoming messages has changed. */ |
161 | void numIncomingChanged(int); | 161 | void numIncomingChanged(int); |
162 | 162 | ||
163 | /** Emitted, when the number of outgoing messages has changed. */ | 163 | /** Emitted, when the number of outgoing messages has changed. */ |
164 | void numOutgoingChanged(int); | 164 | void numOutgoingChanged(int); |
165 | 165 | ||
166 | /** Send status message, which can e.g. be displayed in the status bar. */ | 166 | /** Send status message, which can e.g. be displayed in the status bar. */ |
167 | void statusMessage(const QString &); | 167 | void statusMessage(const QString &); |
168 | 168 | ||
169 | void calendarViewExpanded( bool ); | 169 | void calendarViewExpanded( bool ); |
170 | void updateSearchDialog(); | 170 | void updateSearchDialog(); |
171 | 171 | ||
172 | 172 | ||
173 | public slots: | 173 | public slots: |
174 | 174 | void recheckTimerAlarm(); | |
175 | void checkNextTimerAlarm(); | ||
175 | void addAlarm(const QDateTime &qdt, const QString ¬i ); | 176 | void addAlarm(const QDateTime &qdt, const QString ¬i ); |
176 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); | 177 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); |
177 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); | 178 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); |
178 | 179 | ||
179 | /** options dialog made a changed to the configuration. we catch this | 180 | /** options dialog made a changed to the configuration. we catch this |
180 | * and notify all widgets which need to update their configuration. */ | 181 | * and notify all widgets which need to update their configuration. */ |
181 | void updateConfig(); | 182 | void updateConfig(); |
182 | 183 | ||
183 | /** | 184 | /** |
184 | Load calendar from file \a filename. If \a merge is true, load | 185 | Load calendar from file \a filename. If \a merge is true, load |
185 | calendar into existing one, if it is false, clear calendar, before | 186 | calendar into existing one, if it is false, clear calendar, before |
186 | loading. Return true, if calendar could be successfully loaded. | 187 | loading. Return true, if calendar could be successfully loaded. |
187 | */ | 188 | */ |
188 | bool openCalendar(QString filename, bool merge=false); | 189 | bool openCalendar(QString filename, bool merge=false); |
189 | bool syncCalendar(QString filename,int mode = 0 ); | 190 | bool syncCalendar(QString filename,int mode = 0 ); |
190 | 191 | ||
@@ -461,32 +462,33 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
461 | protected: | 462 | protected: |
462 | void schedule(Scheduler::Method, Incidence *incidence = 0); | 463 | void schedule(Scheduler::Method, Incidence *incidence = 0); |
463 | 464 | ||
464 | // returns KMsgBox::OKCandel() | 465 | // returns KMsgBox::OKCandel() |
465 | int msgItemDelete(); | 466 | int msgItemDelete(); |
466 | void showEventEditor(); | 467 | void showEventEditor(); |
467 | void showTodoEditor(); | 468 | void showTodoEditor(); |
468 | void writeLocale(); | 469 | void writeLocale(); |
469 | Todo *selectedTodo(); | 470 | Todo *selectedTodo(); |
470 | 471 | ||
471 | private: | 472 | private: |
472 | AlarmDialog * mAlarmDialog; | 473 | AlarmDialog * mAlarmDialog; |
473 | QString mAlarmNotification; | 474 | QString mAlarmNotification; |
474 | QString mSuspendAlarmNotification; | 475 | QString mSuspendAlarmNotification; |
475 | QTimer* mSuspendTimer; | 476 | QTimer* mSuspendTimer; |
476 | QTimer* mAlarmTimer; | 477 | QTimer* mAlarmTimer; |
478 | QTimer* mRecheckAlarmTimer; | ||
477 | void computeAlarm( QString ); | 479 | void computeAlarm( QString ); |
478 | void startAlarm( QString, QString ); | 480 | void startAlarm( QString, QString ); |
479 | void setSyncEventsReadOnly(); | 481 | void setSyncEventsReadOnly(); |
480 | 482 | ||
481 | QDateTime loadedFileVersion; | 483 | QDateTime loadedFileVersion; |
482 | void checkSharpEvent( Event* lastSync, Incidence* toDelete ); | 484 | void checkSharpEvent( Event* lastSync, Incidence* toDelete ); |
483 | QPtrList<KSyncProfile> mSyncProfiles; | 485 | QPtrList<KSyncProfile> mSyncProfiles; |
484 | QStringList mSyncProfileNames; | 486 | QStringList mSyncProfileNames; |
485 | void checkZaurusId( int id, bool todo = false ); | 487 | void checkZaurusId( int id, bool todo = false ); |
486 | int mGlobalSyncMode; | 488 | int mGlobalSyncMode; |
487 | QString mCurrentSyncDevice; | 489 | QString mCurrentSyncDevice; |
488 | QString mCurrentSyncName; | 490 | QString mCurrentSyncName; |
489 | KOBeamPrefs* beamDialog; | 491 | KOBeamPrefs* beamDialog; |
490 | void init(); | 492 | void init(); |
491 | int mDatePickerMode; | 493 | int mDatePickerMode; |
492 | bool mFlagEditDescription; | 494 | bool mFlagEditDescription; |