-rw-r--r-- | korganizer/komonthview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 4d62e9b..61a141a 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -281,67 +281,69 @@ class KOMonthView: public KOEventView | |||
281 | void switchView(); | 281 | void switchView(); |
282 | void setKeyBFocus(); | 282 | void setKeyBFocus(); |
283 | 283 | ||
284 | protected slots: | 284 | protected slots: |
285 | void catChanged( Incidence * ); | 285 | void catChanged( Incidence * ); |
286 | void setKeyBoardFocus(); | 286 | void setKeyBoardFocus(); |
287 | void slotNewTodo(); | 287 | void slotNewTodo(); |
288 | void slotNewEvent(); | 288 | void slotNewEvent(); |
289 | void slotEditJournal(); | 289 | void slotEditJournal(); |
290 | void slotComputeLayout(); | 290 | void slotComputeLayout(); |
291 | void selectInternalWeekNum ( int ); | 291 | void selectInternalWeekNum ( int ); |
292 | void processSelectionChange(); | 292 | void processSelectionChange(); |
293 | signals: | 293 | signals: |
294 | void nextMonth(); | 294 | void nextMonth(); |
295 | void prevMonth(); | 295 | void prevMonth(); |
296 | void selectWeekNum ( int ); | 296 | void selectWeekNum ( int ); |
297 | void selectMonth (); | 297 | void selectMonth (); |
298 | void showDaySignal( QDate ); | 298 | void showDaySignal( QDate ); |
299 | void newTodoSignal( QDateTime, bool ); | 299 | void newTodoSignal( QDateTime, bool ); |
300 | void showJournalSignal( int,QDate ); | 300 | void showJournalSignal( int,QDate ); |
301 | protected: | 301 | protected: |
302 | void resizeEvent(QResizeEvent *); | 302 | void resizeEvent(QResizeEvent *); |
303 | void viewChanged(); | 303 | void viewChanged(); |
304 | void updateDayLabels(); | 304 | void updateDayLabels(); |
305 | int mapWeekLayout( int, bool ); | ||
305 | 306 | ||
306 | private: | 307 | private: |
307 | int mKBFcounter; | 308 | int mKBFcounter; |
308 | QTimer* mComputeLayoutTimer; | 309 | QTimer* mComputeLayoutTimer; |
309 | NavigatorBar* mNavigatorBar; | 310 | NavigatorBar* mNavigatorBar; |
310 | int currentWeek(); | 311 | int currentWeek(); |
311 | bool clPending; | 312 | bool clPending; |
312 | QWidgetStack * mWidStack; | 313 | QWidgetStack * mWidStack; |
313 | QWidget* mMonthView; | 314 | QWidget* mMonthView; |
314 | QWidget* mWeekView; | 315 | QWidget* mWeekView; |
315 | bool mShowWeekView; | 316 | bool mShowWeekView; |
316 | bool updatePossible; | 317 | bool updatePossible; |
317 | int mDaysPerWeek; | 318 | int mDaysPerWeek; |
318 | int mNumWeeks; | 319 | int mNumWeeks; |
319 | int mNumCells; | 320 | int mNumCells; |
320 | //bool mWeekStartsMonday; | 321 | //bool mWeekStartsMonday; |
321 | bool mShowSatSunComp; | 322 | bool mShowSatSunComp; |
322 | void computeLayout(); | 323 | void computeLayout(); |
323 | void computeLayoutWeek(); | 324 | void computeLayoutWeek(); |
325 | void doComputeLayoutWeek(); | ||
324 | 326 | ||
325 | QPtrVector<MonthViewCell> mCells; | 327 | QPtrVector<MonthViewCell> mCells; |
326 | QPtrVector<QLabel> mDayLabels; | 328 | QPtrVector<QLabel> mDayLabels; |
327 | QPtrVector<KOWeekButton> mWeekLabels; | 329 | QPtrVector<KOWeekButton> mWeekLabels; |
328 | QPtrVector<MonthViewCell> mCellsW; | 330 | QPtrVector<MonthViewCell> mCellsW; |
329 | QPtrVector<QLabel> mDayLabelsW; | 331 | QPtrVector<QLabel> mDayLabelsW; |
330 | QPtrVector<KOWeekButton> mWeekLabelsW; | 332 | QPtrVector<KOWeekButton> mWeekLabelsW; |
331 | 333 | ||
332 | bool mShortDayLabelsM; | 334 | bool mShortDayLabelsM; |
333 | bool mShortDayLabelsW; | 335 | bool mShortDayLabelsW; |
334 | int mWidthLongDayLabel; | 336 | int mWidthLongDayLabel; |
335 | 337 | ||
336 | QDate mStartDate; | 338 | QDate mStartDate; |
337 | 339 | ||
338 | MonthViewCell *mSelectedCell; | 340 | MonthViewCell *mSelectedCell; |
339 | MonthViewCell *mPopupCell; | 341 | MonthViewCell *mPopupCell; |
340 | bool mFlagKeyPressed; | 342 | bool mFlagKeyPressed; |
341 | KOEventPopupMenu *mContextMenu; | 343 | KOEventPopupMenu *mContextMenu; |
342 | QPopupMenu *mNewItemMenu; | 344 | QPopupMenu *mNewItemMenu; |
343 | void keyPressEvent ( QKeyEvent * ) ; | 345 | void keyPressEvent ( QKeyEvent * ) ; |
344 | void keyReleaseEvent ( QKeyEvent * ) ; | 346 | void keyReleaseEvent ( QKeyEvent * ) ; |
345 | 347 | ||
346 | }; | 348 | }; |
347 | 349 | ||