Revert "Made the agenda view of Calendar optional"

This reverts commit 5d58b75fe1.
It was a temporary fix to release v3.7.1

src/Gui/Calendar.cpp

@@ -1803,7 +1803,6 @@ CalendarWeekView::selectedDate
 }
 
 
-#if defined(GC_CALENDAR_AGENDA)
 //////////////////////////////////////////////////////////////////////////////
 // CalendarAgendaView
 
@@ -2307,7 +2306,6 @@ CalendarAgendaView::showContextMenu
 
     contextMenu.exec(agendaTree->viewport()->mapToGlobal(pos));
 }
-#endif
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -2323,17 +2321,13 @@ Calendar::Calendar
     dayView = new CalendarDayView(dateInMonth, athleteMeasures);
     weekView = new CalendarWeekView(dateInMonth);
     monthView = new CalendarMonthTable(dateInMonth, firstDayOfWeek);
-#if defined(GC_CALENDAR_AGENDA)
     agendaView = new CalendarAgendaView();
-#endif
 
     viewStack = new QStackedWidget();
     viewStack->addWidget(dayView);
     viewStack->addWidget(weekView);
     viewStack->addWidget(monthView);
-#if defined(GC_CALENDAR_AGENDA)
     viewStack->addWidget(agendaView);
-#endif
 
     toolbar = new QToolBar();
 
@@ -2383,12 +2377,10 @@ Calendar::Calendar
     monthAction->setActionGroup(viewGroup);
     connect(monthAction, &QAction::triggered, [=]() { setView(CalendarView::Month); });
 
-#if defined(GC_CALENDAR_AGENDA)
     agendaAction = toolbar->addAction(tr("Agenda"));
     agendaAction->setCheckable(true);
     agendaAction->setActionGroup(viewGroup);
     connect(agendaAction, &QAction::triggered, [=]() { setView(CalendarView::Agenda); });
-#endif
 
     applyNavIcons();
 
@@ -2446,7 +2438,6 @@ Calendar::Calendar
         }
     });
 
-#if defined(GC_CALENDAR_AGENDA)
     connect(agendaView, &CalendarAgendaView::dayChanged, [=](const QDate &date) {
         if (currentView() == CalendarView::Agenda) {
             emit dayChanged(date);
@@ -2462,7 +2453,6 @@ Calendar::Calendar
             setDate(date);
         }
     });
-#endif
 
     connect(prevAction, &QAction::triggered, [=]() { goNext(-1); });
     connect(nextAction, &QAction::triggered, [=]() { goNext(1); });
@@ -2493,11 +2483,9 @@ Calendar::setDate
         if (monthView->isInDateRange(date)) {
             monthView->setMonth(date, allowKeepMonth);
         }
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         agendaView->updateDate();
         agendaView->setDateRange(dateRange);
-#endif
     }
 }
 
@@ -2512,10 +2500,8 @@ Calendar::fillEntries
         weekView->fillEntries(activityEntries, summaries, headlineEntries);
     } else if (currentView() == CalendarView::Month) {
         monthView->fillEntries(activityEntries, summaries, headlineEntries);
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         agendaView->fillEntries(activityEntries, summaries, headlineEntries);
-#endif
     }
     filterSpacerAction->setVisible(isFiltered);
     filterLabelAction->setVisible(isFiltered);
@@ -2540,10 +2526,8 @@ Calendar::firstVisibleDay
         return weekView->firstVisibleDay();
     } else if (currentView() == CalendarView::Month) {
         return monthView->firstVisibleDay();
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         return agendaView->firstVisibleDay();
-#endif
     }
     return QDate();
 }
@@ -2559,10 +2543,8 @@ Calendar::lastVisibleDay
         return weekView->lastVisibleDay();
     } else if (currentView() == CalendarView::Month) {
         return monthView->lastVisibleDay();
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         return agendaView->lastVisibleDay();
-#endif
     }
     return QDate();
 }
@@ -2578,10 +2560,8 @@ Calendar::selectedDate
         return weekView->selectedDate();
     } else if (currentView() == CalendarView::Month) {
         return monthView->selectedDate();
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         return agendaView->selectedDate();
-#endif
     }
     return QDate();
 }
@@ -2614,10 +2594,8 @@ Calendar::goNext
         if ((ret = newDate.isValid())) {
             setDate(newDate);
         }
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         ret = false;
-#endif
     }
     return ret;
 }
@@ -2662,10 +2640,8 @@ Calendar::canGoNext
         fom = fom.addMonths(amount);
         lom = lom.addMonths(amount);
         return isInDateRange(fom) || isInDateRange(lom);
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         return false;
-#endif
     }
     return false;
 }
@@ -2689,15 +2665,11 @@ bool
 Calendar::isInDateRange
 (const QDate &date) const
 {
-#if defined(GC_CALENDAR_AGENDA)
     if (currentView() != CalendarView::Agenda) {
         return date.isValid() && dateRange.pass(date);
     } else {
         return false;
     }
-#else
-    return date.isValid() && dateRange.pass(date);
-#endif
 }
 
 
@@ -2714,11 +2686,9 @@ Calendar::activateDateRange
         setDate(currentDate, false);
     } else if (currentView() == CalendarView::Month) {
         setDate(fitToMonth(currentDate, false), true);
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         agendaView->updateDate(); // AgendaView always uses today
         agendaView->setDateRange(dateRange); // AgendaView needs daterange for "Show in month view"
-#endif
     }
     seasonLabel->setText(tr("Season: %1").arg(dateRange.name));
     emit dateRangeActivated(dr.name);
@@ -2760,7 +2730,6 @@ Calendar::setEndHour
 }
 
 
-#if defined(GC_CALENDAR_AGENDA)
 void
 Calendar::setAgendaPastDays
 (int days)
@@ -2775,7 +2744,6 @@ Calendar::setAgendaFutureDays
 {
     agendaView->setFutureDays(days);
 }
-#endif
 
 
 void
@@ -2844,7 +2812,6 @@ Calendar::updateHeader
         separator->setVisible(true);
         dateNavigatorAction->setVisible(true);
         seasonLabelAction->setVisible(false);
-#if defined(GC_CALENDAR_AGENDA)
     } else if (currentView() == CalendarView::Agenda) {
         prevAction->setVisible(false);
         nextAction->setVisible(false);
@@ -2852,7 +2819,6 @@ Calendar::updateHeader
         separator->setVisible(false);
         dateNavigatorAction->setVisible(false);
         seasonLabelAction->setVisible(true);
-#endif
     }
 }
 
@@ -2893,7 +2859,6 @@ Calendar::setView
     int oldIdx = viewStack->currentIndex();
     if (idx != oldIdx) {
         QDate useDate = selectedDate();
-#if defined(GC_CALENDAR_AGENDA)
         if (lastNonAgendaDate.isValid()) {
             useDate = lastNonAgendaDate;
         }
@@ -2915,18 +2880,6 @@ Calendar::setView
             agendaView->updateDate();
             agendaView->setDateRange(dateRange);
         }
-#else
-        if (view == CalendarView::Day) {
-            dayAction->setChecked(true);
-            dayView->setDay(useDate);
-        } else if (view == CalendarView::Week) {
-            weekAction->setChecked(true);
-            weekView->setDay(useDate);
-        } else if (view == CalendarView::Month) {
-            monthAction->setChecked(true);
-            monthView->setMonth(fitToMonth(selectedDate(), false), true);
-        }
-#endif
         viewStack->setCurrentIndex(idx);
         emit viewChanged(view, static_cast<CalendarView>(oldIdx));
         updateHeader();