From 6e872509a7a12ac22b243177eddc68be86ff752f Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Mon, 9 Nov 2015 17:44:42 +0100
Subject: [PATCH 28/74] Show agendaview when selecting day / week

This effectively reverts c81b1b08 and goes back to the
enterprise 3.5 behavior.

MERGE: Not directly needs discussion first and is a bit hackish
---
 kontact/plugins/korganizer/korganizerplugin.cpp |  1 +
 korganizer/actionmanager.cpp                    |  4 --
 korganizer/koviewmanager.cpp                    | 49 ++++++++++++++-----------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 961d0ed9f6..f40552eb40 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -127,6 +127,7 @@ QStringList KOrganizerPlugin::invisibleToolbarActions() const
 
   invisible += QLatin1String("view_todo");
   invisible += QLatin1String("view_journal");
+  invisible += QLatin1String("view_agenda");
   return invisible;
 }
 
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 90fc7a5a1f..ddb92c7acd 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -492,25 +492,21 @@ void ActionManager::initActions()
 
   action = new KAction( KIcon( QLatin1String("view-calendar-day") ), i18n( "&Day" ), this );
   mACollection->addAction( QLatin1String("select_day"), action );
-  action->setEnabled( mCalendarView->currentView()->supportsDateRangeSelection() );
   connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
            SLOT(selectDay()) );
 
   mNextXDays = new KAction( KIcon( QLatin1String("view-calendar-upcoming-days") ), QString(), this );
-  mNextXDays->setEnabled( mCalendarView->currentView()->supportsDateRangeSelection() );
   mACollection->addAction( QLatin1String("select_nextx"), mNextXDays );
   connect( mNextXDays, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
            SLOT(selectNextX()) );
   mNextXDays->setText( i18np( "&Next Day", "&Next %1 Days", KOPrefs::instance()->mNextXDays ) );
 
   action = new KAction( KIcon( QLatin1String("view-calendar-workweek") ), i18n( "W&ork Week" ), this );
-  action->setEnabled( mCalendarView->currentView()->supportsDateRangeSelection() );
   mACollection->addAction( QLatin1String("select_workweek"), action );
   connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
            SLOT(selectWorkWeek()) );
 
   action = new KAction( KIcon( QLatin1String("view-calendar-week") ), i18n( "&Week" ), this );
-  action->setEnabled( mCalendarView->currentView()->supportsDateRangeSelection() );
   mACollection->addAction( QLatin1String("select_week"), action );
   connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
            SLOT(selectWeek()) );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index ed715c064c..2f7d9a8c3a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -81,6 +81,27 @@ void KOViewManager::readSettings( KConfig *config )
   KConfigGroup generalConfig( config, "General" );
   const QString view = generalConfig.readEntry( "Current View" );
 
+  mRangeMode = RangeMode( generalConfig.readEntry( "Range Mode", int( OTHER_RANGE ) ) );
+
+  switch ( mRangeMode ) {
+    case WORK_WEEK_RANGE:
+      selectWorkWeek();
+      break;
+    case WEEK_RANGE:
+      selectWeek();
+      break;
+    case NEXTX_RANGE:
+      selectNextX();
+      break;
+    case DAY_RANGE:
+      selectDay();
+      break;
+    case NO_RANGE:
+    default:
+      // Someone has been playing with the config file.
+      mRangeMode = OTHER_RANGE;
+  }
+
   if ( view == QLatin1String( "WhatsNext" ) ) {
     showWhatsNextView();
   } else if ( view == QLatin1String( "OldMonth" ) ) {
@@ -102,27 +123,6 @@ void KOViewManager::readSettings( KConfig *config )
   } else {
     showAgendaView();
   }
-
-  mRangeMode = RangeMode( generalConfig.readEntry( "Range Mode", int( OTHER_RANGE ) ) );
-
-  switch ( mRangeMode ) {
-    case WORK_WEEK_RANGE:
-      selectWorkWeek();
-      break;
-    case WEEK_RANGE:
-      selectWeek();
-      break;
-    case NEXTX_RANGE:
-      selectNextX();
-      break;
-    case DAY_RANGE:
-      selectDay();
-      break;
-    case NO_RANGE:
-    default:
-      // Someone has been playing with the config file.
-      mRangeMode = OTHER_RANGE;
-  }
 }
 
 void KOViewManager::writeSettings( KConfig *config )
@@ -215,12 +215,13 @@ void KOViewManager::showView( KOrg::BaseView *view )
           action->setEnabled( view->supportsZoom() );
         }
       }
-
+/*
       for ( int i = 0; i < rangeActions.size(); ++i ) {
         if ( QAction *action = ac->action( rangeActions[i] ) ) {
           action->setEnabled( view->supportsDateRangeSelection() );
         }
       }
+      */
     }
   }
 }
@@ -535,6 +536,7 @@ void KOViewManager::showAgendaView()
 
 void KOViewManager::selectDay()
 {
+  showAgendaView();
   mRangeMode = DAY_RANGE;
   const QDate date = mMainView->activeDate();
   mMainView->dateNavigator()->selectDate( date );
@@ -542,6 +544,7 @@ void KOViewManager::selectDay()
 
 void KOViewManager::selectWorkWeek()
 {
+  showAgendaView();
   if ( KOGlobals::self()->getWorkWeekMask() != 0 ) {
     mRangeMode = WORK_WEEK_RANGE;
     QDate date = mMainView->activeDate();
@@ -556,6 +559,7 @@ void KOViewManager::selectWorkWeek()
 
 void KOViewManager::selectWeek()
 {
+  showAgendaView();
   mRangeMode = WEEK_RANGE;
   QDate date = mMainView->activeDate();
   mMainView->dateNavigator()->selectWeek( date );
@@ -563,6 +567,7 @@ void KOViewManager::selectWeek()
 
 void KOViewManager::selectNextX()
 {
+  showAgendaView();
   mRangeMode = NEXTX_RANGE;
   mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                            KOPrefs::instance()->mNextXDays );
-- 
2.14.1