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 | |||
@@ -217,25 +217,25 @@ class KOMonthView: public KOEventView | |||
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); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ac67b58..a9f5a41 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -548,24 +548,25 @@ if (!mMonthView) { | |||
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 ); |