-rw-r--r-- | korganizer/calendarview.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 706d05d..799c297 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -109,64 +109,65 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
109 | /** | 109 | /** |
110 | Constructs a new calendar view widget. | 110 | Constructs a new calendar view widget. |
111 | 111 | ||
112 | @param calendar calendar document | 112 | @param calendar calendar document |
113 | @param parent parent window | 113 | @param parent parent window |
114 | @param name Qt internal widget object name | 114 | @param name Qt internal widget object name |
115 | */ | 115 | */ |
116 | CalendarView( CalendarResources *calendar, QWidget *parent = 0, | 116 | CalendarView( CalendarResources *calendar, QWidget *parent = 0, |
117 | const char *name = 0 ); | 117 | const char *name = 0 ); |
118 | CalendarView( Calendar *calendar, QWidget *parent = 0, | 118 | CalendarView( Calendar *calendar, QWidget *parent = 0, |
119 | const char *name = 0 ); | 119 | const char *name = 0 ); |
120 | virtual ~CalendarView(); | 120 | virtual ~CalendarView(); |
121 | 121 | ||
122 | Calendar *calendar() { return mCalendar; } | 122 | Calendar *calendar() { return mCalendar; } |
123 | 123 | ||
124 | KOViewManager *viewManager(); | 124 | KOViewManager *viewManager(); |
125 | KODialogManager *dialogManager(); | 125 | KODialogManager *dialogManager(); |
126 | 126 | ||
127 | QDate startDate(); | 127 | QDate startDate(); |
128 | QDate endDate(); | 128 | QDate endDate(); |
129 | 129 | ||
130 | QWidgetStack *viewStack(); | 130 | QWidgetStack *viewStack(); |
131 | QWidget *leftFrame(); | 131 | QWidget *leftFrame(); |
132 | 132 | ||
133 | DateNavigator *dateNavigator(); | 133 | DateNavigator *dateNavigator(); |
134 | KDateNavigator *dateNavigatorWidget(); | 134 | KDateNavigator *dateNavigatorWidget(); |
135 | 135 | ||
136 | void addView(KOrg::BaseView *); | 136 | void addView(KOrg::BaseView *); |
137 | void showView(KOrg::BaseView *); | 137 | void showView(KOrg::BaseView *); |
138 | KOEventViewerDialog* getEventViewerDialog(); | 138 | KOEventViewerDialog* getEventViewerDialog(); |
139 | Incidence *currentSelection(); | 139 | Incidence *currentSelection(); |
140 | void checkSuspendAlarm(); | 140 | void checkSuspendAlarm(); |
141 | void mergeFile( QString fn ); | ||
141 | 142 | ||
142 | signals: | 143 | signals: |
143 | void save (); | 144 | void save (); |
144 | void saveStopTimer (); | 145 | void saveStopTimer (); |
145 | void tempDisableBR(bool); | 146 | void tempDisableBR(bool); |
146 | /** This todo has been modified */ | 147 | /** This todo has been modified */ |
147 | void todoModified(Todo *, int); | 148 | void todoModified(Todo *, int); |
148 | 149 | ||
149 | /** when change is made to options dialog, the topwidget will catch this | 150 | /** when change is made to options dialog, the topwidget will catch this |
150 | * and emit this signal which notifies all widgets which have registered | 151 | * and emit this signal which notifies all widgets which have registered |
151 | * for notification to update their settings. */ | 152 | * for notification to update their settings. */ |
152 | void configChanged(); | 153 | void configChanged(); |
153 | /** emitted when the topwidget is closing down, so that any attached | 154 | /** emitted when the topwidget is closing down, so that any attached |
154 | child windows can also close. */ | 155 | child windows can also close. */ |
155 | void closingDown(); | 156 | void closingDown(); |
156 | /** emitted right before we die */ | 157 | /** emitted right before we die */ |
157 | void closed(QWidget *); | 158 | void closed(QWidget *); |
158 | 159 | ||
159 | /** Emitted when state of modified flag changes */ | 160 | /** Emitted when state of modified flag changes */ |
160 | void modifiedChanged(bool); | 161 | void modifiedChanged(bool); |
161 | void signalmodified(); | 162 | void signalmodified(); |
162 | 163 | ||
163 | /** Emitted when state of read-only flag changes */ | 164 | /** Emitted when state of read-only flag changes */ |
164 | void readOnlyChanged(bool); | 165 | void readOnlyChanged(bool); |
165 | 166 | ||
166 | /** Emitted when the unit of navigation changes */ | 167 | /** Emitted when the unit of navigation changes */ |
167 | void changeNavStringPrev(const QString &); | 168 | void changeNavStringPrev(const QString &); |
168 | void changeNavStringNext(const QString &); | 169 | void changeNavStringNext(const QString &); |
169 | 170 | ||
170 | /** Emitted when state of events selection has changed and user is organizer*/ | 171 | /** Emitted when state of events selection has changed and user is organizer*/ |
171 | void organizerEventsSelected(bool); | 172 | void organizerEventsSelected(bool); |
172 | /** Emitted when state of events selection has changed and user is attendee*/ | 173 | /** Emitted when state of events selection has changed and user is attendee*/ |