File r905616.diff of Package kdepim4

Subject: korganizer: maintain selected day on view change
From: wstephenson@suse.de
Bug: 
Patch-upstream: 905616
--- korganizer/calendarview.h	(revision 905615)
+++ korganizer/calendarview.h	(revision 905616)
@@ -599,6 +599,11 @@ class KORGANIZERPRIVATE_EXPORT CalendarV
     */
     void adaptNavigationUnits();
 
+    /**
+      Returns the best guess at the current active date in the view.
+    */
+    QDate activeDate();
+
   protected:
     void setIncidenceChanger( IncidenceChangerBase *changer );
 
@@ -623,10 +628,6 @@ class KORGANIZERPRIVATE_EXPORT CalendarV
   private:
     void init();
 
-    /**
-      Returns the best guess at the current active date in the view.
-    */
-    QDate activeDate();
 
     void createPrinter();
 
--- korganizer/koviewmanager.cpp	(revision 905615)
+++ korganizer/koviewmanager.cpp	(revision 905616)
@@ -412,20 +412,23 @@ void KOViewManager::showAgendaView()
 
 void KOViewManager::showDayView()
 {
+  QDate date = mMainView->activeDate();
   showAgendaView();
-  mMainView->dateNavigator()->selectDates( 1 );
+  mMainView->dateNavigator()->selectDate( date );
 }
 
 void KOViewManager::showWorkWeekView()
 {
+  QDate date = mMainView->activeDate();
   showAgendaView();
-  mMainView->dateNavigator()->selectWorkWeek();
+  mMainView->dateNavigator()->selectWorkWeek( date );
 }
 
 void KOViewManager::showWeekView()
 {
+  QDate date = mMainView->activeDate();
   showAgendaView();
-  mMainView->dateNavigator()->selectWeek();
+  mMainView->dateNavigator()->selectWeek( date );
 }
 
 void KOViewManager::showNextXView()
Index: korganizer/calendarview.h
===================================================================
Index: korganizer/koviewmanager.cpp
===================================================================