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
@@ -12,24 +12,30 @@ KOpieMail was not able to write files (mails) to MSDOS file system,
 like on an usual preformatted SD card. That should work now.
 To save your mail data on the Sd card do the following:
 Create a dir on the SD card:
 mkdir /mnt/card/localmail
 Go to your home dir:
 cd
 Go to kopiemail data storage dir:
 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
 the used hash algo of file is different then the global 
 hash algo.
 
 Added KA/Pi support for opie mailit mailapplication.
 
 Fixed some bugs in OM/Pi.
 Now character conversion tables are available for the Zaurus
 to make OM/Pi working properly.
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3908dbb..47cd488 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1982,25 +1982,28 @@ void CalendarView::writeFilterSettings(KConfig *config)
     }
     config->setGroup("General");
     config->writeEntry("CalendarFilters",filterList);
 
     config->setGroup("FilterView");
     config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
     config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 
 
 void CalendarView::goToday()
 {
-    mNavigator->selectToday();
+    if ( mViewManager->currentView()->isMonthView() )
+        mNavigator->selectTodayMonth();
+    else
+        mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index e26e20b..3156b2b 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -190,24 +190,30 @@ void DateNavigator::selectWorkWeek( const QDate &d )
   int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
 
   QDate firstDate = d.addDays( 1 - dayOfWeek );
 
   int weekStart = KGlobal::locale()->weekStartDay();
   if ( weekStart != 1 && dayOfWeek >= weekStart ) {
     firstDate = firstDate.addDays( 7 );
   }
 
   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();
 
   int dateCount = mSelectedDates.count();
 
   if ( dateCount == 5 ) selectWorkWeek( d );
   else if ( dateCount == 7 ) selectWeek( d );
   else selectDates( d, dateCount );
 }
 
 void DateNavigator::selectPreviousYear()
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 747e3d3..4a19e17 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -52,24 +52,25 @@ class DateNavigator : public QObject
     void selectDates( const QDate &, int count );
 
     void selectWeek();
     void selectWeek( int weeknum );
     void selectWeek( const QDate & );
 
     void selectWorkWeek();
     void selectWorkWeek( const QDate & );
 
     void selectWeekByDay( int weekDay, const QDate & );
    
     void selectToday();
+    void selectTodayMonth();
    
     void selectPreviousYear();
     void selectPreviousMonth();
     void selectNextMonth();
     void selectNextYear();
 
     void selectMonth();
     void selectMonthByDate(  const QDate & );
    
     void selectPrevious();
     void selectNext();
     void slotMonthSelect( int );
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
@@ -125,24 +125,25 @@ class BaseView : public QWidget
     {
       KMessageBox::sorry(this, i18n("Unfortunately, we don't handle printing for\n"
                                     "that view yet.\n"));
     }
 
     /**
       Return number of currently shown dates. A return value of 0 means no idea.
     */
     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
       different from the requested range, depending on the particular requirements
       of the view.
     
       @param start Start of date range.
       @param end   End of date range.
     */
     virtual void showDates( const QDate &start, const QDate &end ) = 0;
 
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d976246..e94952f 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -191,24 +191,25 @@ class KOMonthView: public KOEventView
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
+    bool isMonthView() { return true; }
 
     MonthViewCell * selectedCell();
   public slots:
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();