-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | korganizer/komonthview.h | 2 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 3c757a1..7c81b3a 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,11 +1,14 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.9 ************ | 3 | ********** VERSION 2.0.9 ************ |
4 | 4 | ||
5 | Made month view icons for multiday events a bit nicer. | 5 | Made month view icons for multiday events a bit nicer. |
6 | Some minor fixes in KO/Pi | ||
7 | (e.g. go to today did not work for new week view properly). | ||
8 | |||
6 | 9 | ||
7 | ********** VERSION 2.0.8 ************ | 10 | ********** VERSION 2.0.8 ************ |
8 | 11 | ||
9 | Fixed a problem in dependency info in the ipk files for the Zaurus. | 12 | Fixed a problem in dependency info in the ipk files for the Zaurus. |
10 | 13 | ||
11 | Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. | 14 | Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index b79a41f..f92a69a 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -223,13 +223,13 @@ class KOMonthView: public KOEventView | |||
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: |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ac67b58..a9f5a41 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -554,12 +554,13 @@ if (!mMonthView) { | |||
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() ) |