author | zautrix <zautrix> | 2005-02-20 11:14:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-20 11:14:04 (UTC) |
commit | bb74ffa01010ca364e101e05a6b3e090ae363a0e (patch) (unidiff) | |
tree | 573f3b5244f064996c9cb4c73cc0ad04816bda9b /korganizer | |
parent | ce9aa88149547443452a2077f5c3832fbea34f63 (diff) | |
download | kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.zip kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.tar.gz kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.tar.bz2 |
minor month-weekview fixes
-rw-r--r-- | korganizer/komonthview.h | 2 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index b79a41f..f92a69a 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -197,65 +197,65 @@ class MonthViewCell : public QWidget | |||
197 | QPalette mHolidayPalette; | 197 | QPalette mHolidayPalette; |
198 | QPalette mStandardPalette; | 198 | QPalette mStandardPalette; |
199 | QPalette mPrimaryPalette; | 199 | QPalette mPrimaryPalette; |
200 | QPalette mNonPrimaryPalette; | 200 | QPalette mNonPrimaryPalette; |
201 | void setMyPalette(); | 201 | void setMyPalette(); |
202 | QPalette getPalette (); | 202 | QPalette getPalette (); |
203 | void keyPressEvent ( QKeyEvent * ) ; | 203 | void keyPressEvent ( QKeyEvent * ) ; |
204 | 204 | ||
205 | }; | 205 | }; |
206 | 206 | ||
207 | 207 | ||
208 | class KOMonthView: public KOEventView | 208 | class KOMonthView: public KOEventView |
209 | { | 209 | { |
210 | Q_OBJECT | 210 | Q_OBJECT |
211 | public: | 211 | public: |
212 | KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 ); | 212 | KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 ); |
213 | ~KOMonthView(); | 213 | ~KOMonthView(); |
214 | 214 | ||
215 | /** Returns maximum number of days supported by the komonthview */ | 215 | /** Returns maximum number of days supported by the komonthview */ |
216 | virtual int maxDatesHint(); | 216 | virtual int maxDatesHint(); |
217 | 217 | ||
218 | /** Returns number of currently shown dates. */ | 218 | /** Returns number of currently shown dates. */ |
219 | virtual int currentDateCount(); | 219 | virtual int currentDateCount(); |
220 | 220 | ||
221 | /** returns the currently selected events */ | 221 | /** returns the currently selected events */ |
222 | virtual QPtrList<Incidence> selectedIncidences(); | 222 | virtual QPtrList<Incidence> selectedIncidences(); |
223 | 223 | ||
224 | /** returns dates of the currently selected events */ | 224 | /** returns dates of the currently selected events */ |
225 | virtual DateList selectedDates(); | 225 | virtual DateList selectedDates(); |
226 | 226 | ||
227 | virtual void printPreview(CalPrinter *calPrinter, | 227 | virtual void printPreview(CalPrinter *calPrinter, |
228 | const QDate &, const QDate &); | 228 | const QDate &, const QDate &); |
229 | bool isMonthView() { return true; } | 229 | bool isMonthView() { return !mShowWeekView; } |
230 | bool isUpdatePossible() { return updatePossible; } | 230 | bool isUpdatePossible() { return updatePossible; } |
231 | 231 | ||
232 | MonthViewCell * selectedCell(); | 232 | MonthViewCell * selectedCell(); |
233 | bool skipResize; | 233 | bool skipResize; |
234 | NavigatorBar* navigatorBar() { return mNavigatorBar ;} | 234 | NavigatorBar* navigatorBar() { return mNavigatorBar ;} |
235 | public slots: | 235 | public slots: |
236 | virtual void updateView(); | 236 | virtual void updateView(); |
237 | virtual void updateConfig(); | 237 | virtual void updateConfig(); |
238 | virtual void showDates(const QDate &start, const QDate &end); | 238 | virtual void showDates(const QDate &start, const QDate &end); |
239 | virtual void showEvents(QPtrList<Event> eventList); | 239 | virtual void showEvents(QPtrList<Event> eventList); |
240 | 240 | ||
241 | void changeEventDisplay(Event *, int); | 241 | void changeEventDisplay(Event *, int); |
242 | 242 | ||
243 | void clearSelection(); | 243 | void clearSelection(); |
244 | 244 | ||
245 | void showContextMenu( Incidence * ); | 245 | void showContextMenu( Incidence * ); |
246 | 246 | ||
247 | void setSelectedCell( MonthViewCell * ); | 247 | void setSelectedCell( MonthViewCell * ); |
248 | void switchView(); | 248 | void switchView(); |
249 | 249 | ||
250 | protected slots: | 250 | protected slots: |
251 | void selectInternalWeekNum ( int ); | 251 | void selectInternalWeekNum ( int ); |
252 | void processSelectionChange(); | 252 | void processSelectionChange(); |
253 | signals: | 253 | signals: |
254 | void nextMonth(); | 254 | void nextMonth(); |
255 | void prevMonth(); | 255 | void prevMonth(); |
256 | void selectWeekNum ( int ); | 256 | void selectWeekNum ( int ); |
257 | void selectMonth (); | 257 | void selectMonth (); |
258 | void showDaySignal( QDate ); | 258 | void showDaySignal( QDate ); |
259 | protected: | 259 | protected: |
260 | void resizeEvent(QResizeEvent *); | 260 | void resizeEvent(QResizeEvent *); |
261 | void viewChanged(); | 261 | void viewChanged(); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ac67b58..a9f5a41 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -528,64 +528,65 @@ if (!mMonthView) { | |||
528 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), | 528 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), |
529 | mMainView, SLOT ( showDay( QDate ) ) ); | 529 | mMainView, SLOT ( showDay( QDate ) ) ); |
530 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); | 530 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); |
531 | connect( mMonthView, SIGNAL(nextMonth() ), | 531 | connect( mMonthView, SIGNAL(nextMonth() ), |
532 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); | 532 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); |
533 | connect( mMonthView, SIGNAL(prevMonth() ), | 533 | connect( mMonthView, SIGNAL(prevMonth() ), |
534 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); | 534 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); |
535 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), | 535 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), |
536 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); | 536 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); |
537 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), | 537 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), |
538 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); | 538 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); |
539 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), | 539 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), |
540 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); | 540 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); |
541 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), | 541 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), |
542 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); | 542 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); |
543 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), | 543 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), |
544 | mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); | 544 | mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); |
545 | connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), | 545 | connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), |
546 | mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); | 546 | mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); |
547 | 547 | ||
548 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 548 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
549 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); | 549 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); |
550 | 550 | ||
551 | 551 | ||
552 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), | 552 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), |
553 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); | 553 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); |
554 | 554 | ||
555 | } | 555 | } |
556 | } | 556 | } |
557 | void KOViewManager::showMonthViewWeek() | 557 | void KOViewManager::showMonthViewWeek() |
558 | { | 558 | { |
559 | createMonthView(); | 559 | createMonthView(); |
560 | globalFlagBlockAgenda = 1; | ||
560 | bool full = true; | 561 | bool full = true; |
561 | if ( mCurrentView == mMonthView) | 562 | if ( mCurrentView == mMonthView) |
562 | full = mMainView->leftFrame()->isVisible(); | 563 | full = mMainView->leftFrame()->isVisible(); |
563 | if ( !KOPrefs::instance()->mMonthViewWeek ) { | 564 | if ( !KOPrefs::instance()->mMonthViewWeek ) { |
564 | mMonthView->switchView(); | 565 | mMonthView->switchView(); |
565 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) | 566 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) |
566 | full = false; | 567 | full = false; |
567 | else | 568 | else |
568 | full = true; | 569 | full = true; |
569 | } | 570 | } |
570 | mMainView->dateNavigator()->selectWeek(); | 571 | mMainView->dateNavigator()->selectWeek(); |
571 | showView(mMonthView, full ); | 572 | showView(mMonthView, full ); |
572 | } | 573 | } |
573 | 574 | ||
574 | void KOViewManager::showMonthView() | 575 | void KOViewManager::showMonthView() |
575 | { | 576 | { |
576 | 577 | ||
577 | createMonthView(); | 578 | createMonthView(); |
578 | globalFlagBlockAgenda = 1; | 579 | globalFlagBlockAgenda = 1; |
579 | //mFlagShowNextxDays = false; | 580 | //mFlagShowNextxDays = false; |
580 | bool full = true; | 581 | bool full = true; |
581 | if ( mCurrentView == mMonthView) | 582 | if ( mCurrentView == mMonthView) |
582 | full = mMainView->leftFrame()->isVisible(); | 583 | full = mMainView->leftFrame()->isVisible(); |
583 | // if(mMonthView == mCurrentView) return; | 584 | // if(mMonthView == mCurrentView) return; |
584 | if ( KOPrefs::instance()->mMonthViewWeek ) { | 585 | if ( KOPrefs::instance()->mMonthViewWeek ) { |
585 | mMonthView->switchView(); | 586 | mMonthView->switchView(); |
586 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) | 587 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) |
587 | full = false; | 588 | full = false; |
588 | else | 589 | else |
589 | full = true; | 590 | full = true; |
590 | } | 591 | } |
591 | mMainView->dateNavigator()->selectMonth(); | 592 | mMainView->dateNavigator()->selectMonth(); |