From 0e6d0bfaf5f1dd2e7aa4fc210160c62658be1458 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 7 Aug 2018 12:59:49 +0200 Subject: Invert the calendar filter so all calendars are enabled by default unless explicitly disabled. --- framework/src/domain/daylongeventmodel.cpp | 2 +- framework/src/domain/perioddayeventmodel.cpp | 2 +- views/calendar/qml/View.qml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/src/domain/daylongeventmodel.cpp b/framework/src/domain/daylongeventmodel.cpp index 53b50652..cd26b5c4 100644 --- a/framework/src/domain/daylongeventmodel.cpp +++ b/framework/src/domain/daylongeventmodel.cpp @@ -99,7 +99,7 @@ bool DayLongEventModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourc auto idx = sourceModel()->index(sourceRow, 0, sourceParent); auto event = idx.data(Sink::Store::DomainObjectRole).value(); - if (!mCalendarFilter.contains(event->getCalendar())) { + if (mCalendarFilter.contains(event->getCalendar())) { return false; } diff --git a/framework/src/domain/perioddayeventmodel.cpp b/framework/src/domain/perioddayeventmodel.cpp index 149c0fcb..1f08fbd3 100644 --- a/framework/src/domain/perioddayeventmodel.cpp +++ b/framework/src/domain/perioddayeventmodel.cpp @@ -83,7 +83,7 @@ void PeriodDayEventModel::partitionData() SinkWarning() << "Invalid date in the eventModel, ignoring..."; continue; } - if (!mCalendarFilter.contains(event->getCalendar())) { + if (mCalendarFilter.contains(event->getCalendar())) { continue; } diff --git a/views/calendar/qml/View.qml b/views/calendar/qml/View.qml index ac446b88..529f165f 100644 --- a/views/calendar/qml/View.qml +++ b/views/calendar/qml/View.qml @@ -132,8 +132,8 @@ RowLayout { spacing: Kube.Units.smallSpacing Kube.CheckBox { opacity: 0.9 - checked: model.checked - onToggled: model.checked = checked + checked: !model.checked + onToggled: model.checked = !checked } Kube.Label { text: model.name -- cgit v1.2.3