6 files changed, 19 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index eb7cf13..4fff7e1 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -20,8 +20,14 @@ cd kdepim/apps/kopiemail
 Create a symlink to the SD card:
 ls -s /mnt/card/localmail
 Now KOpieMail will store all mails on the SD card.
 
+KO/Pi Monthview:
+Now "Go to Today" selects the current month from day 1-end,
+not the current date + some days.
+I.e. "Go to Today" shows now always
+the current month with first day of month in the first row. 
+
 
 ********** VERSION 1.9.13 ************
 
 Fixed nasty PwM/Pi file reading bug, when
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3908dbb..47cd488 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1990,9 +1990,12 @@ void CalendarView::writeFilterSettings(KConfig *config)
 
 
 void CalendarView::goToday()
 {
-    mNavigator->selectToday();
+    if ( mViewManager->currentView()->isMonthView() )
+        mNavigator->selectTodayMonth();
+    else
+        mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index e26e20b..3156b2b 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -198,8 +198,14 @@ void DateNavigator::selectWorkWeek( const QDate &d )
 
   selectDates( firstDate, 5 );
 }
 
+void DateNavigator::selectTodayMonth()
+{
+    QDate date = QDate::currentDate().addDays( 1-QDate::currentDate().day() );
+    selectDates( date , date.daysInMonth ());
+
+}
 void DateNavigator::selectToday()
 {
   QDate d = QDate::currentDate();
 
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 747e3d3..4a19e17 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -60,8 +60,9 @@ class DateNavigator : public QObject
 
     void selectWeekByDay( int weekDay, const QDate & );
    
     void selectToday();
+    void selectTodayMonth();
    
     void selectPreviousYear();
     void selectPreviousMonth();
     void selectNextMonth();
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 09f8ba3..2ac9de1 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -133,8 +133,9 @@ class BaseView : public QWidget
     virtual int currentDateCount() = 0;
 
     /** Return if this view is a view for displaying events. */
     virtual bool isEventView() { return false; }
+    virtual bool isMonthView() { return false; }
     
   public slots:
     /**
       Show incidences for the given date range. The date range actually shown may be
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d976246..e94952f 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -199,8 +199,9 @@ class KOMonthView: public KOEventView
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
+    bool isMonthView() { return true; }
 
     MonthViewCell * selectedCell();
   public slots:
     virtual void updateView();