Fix regression caused by creating a KalendarApplication::Mode per view

Check for condition using the bit flags instead of exact matches

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

src/contents/ui/Drawers/MainDrawer.qml

@@ -100,7 +100,7 @@ Kirigami.OverlayDrawer {
                     id: searchField
                     Layout.fillWidth: true
 
-                    visible: mainDrawer.mode !== KalendarApplication.Event
+                    visible: mainDrawer.mode & (KalendarApplication.Todo | KalendarApplication.Mail | KalendarApplication.Contact)
                     opacity: mainDrawer.collapsed ? 0 : 1
                     Behavior on opacity {
                         OpacityAnimator {
@@ -449,12 +449,10 @@ Kirigami.OverlayDrawer {
                             isMask: true
                             color: calendarHeadingItem.labelItem.color
                         }
-                        text: switch (mode) {
-                            case KalendarApplication.Event:
-                            case KalendarApplication.Todo:
-                                return i18n("Calendars");
-                            case KalendarApplication.Contact:
-                                return i18n("Contacts");
+                        text: if (mode === KalendarApplication.Contact) {
+                            return i18n("Contacts");
+                        } else {
+                            return i18n("Calendars");
                         }
                         highlighted: visualFocus
                         labelItem.color: visualFocus ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
@@ -479,12 +477,10 @@ Kirigami.OverlayDrawer {
                             model: switch(mainDrawer.mode) {
                             case KalendarApplication.Todo:
                                 return CalendarManager.todoCollections;
-                            case KalendarApplication.Event:
-                                return CalendarManager.viewCollections;
                             case KalendarApplication.Contact:
                                 return ContactManager.contactCollections;
                             default:
-                                console.log('Should not happen', mainDrawer.mode)
+                                return CalendarManager.viewCollections;
                             }
                         }
 

src/contents/ui/KalendarUtils/KalendarUiUtils.qml

@@ -36,7 +36,7 @@ QtObject {
             }
         }
 
-        if (appMain.pageStack.currentItem.mode === KalendarApplication.Event) {
+        if (appMain.pageStack.currentItem.mode & KalendarApplication.Event) {
             appMain.pageStack.currentItem.setToDate(appMain.selectedDate, true);
         }
     }

src/contents/ui/Menus/GlobalMenu.qml

@@ -132,22 +132,22 @@ Labs.MenuBar {
 
         NativeMenuItemFromAction {
             kalendarAction: "move_view_backwards"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
         NativeMenuItemFromAction {
             kalendarAction: "move_view_forwards"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
 
         Labs.MenuSeparator {}
 
         NativeMenuItemFromAction {
             kalendarAction: "move_view_to_today"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
         NativeMenuItemFromAction {
             kalendarAction: "open_date_changer"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
     }
 

src/contents/ui/Menus/WindowMenu.qml

@@ -203,22 +203,22 @@ QQC2.MenuBar {
 
         KActionFromAction {
             kalendarAction: "move_view_backwards"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
         KActionFromAction {
             kalendarAction: "move_view_forwards"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
 
         QQC2.MenuSeparator {}
 
         KActionFromAction {
             kalendarAction: "move_view_to_today"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
         KActionFromAction {
             kalendarAction: "open_date_changer"
-            enabled: mode === KalendarApplication.Event
+            enabled: mode & KalendarApplication.Event
         }
     }
 

src/contents/ui/main.qml

@@ -380,7 +380,7 @@ Kirigami.ApplicationWindow {
 
         function onOpenIncidence(incidenceData, occurrenceDate) {
             // Switch to an event view if the current view is not compatible with the current incidence type
-            if((pageStack.currentItem.mode !== KalendarApplication.Todo && pageStack.currentItem.mode !== KalendarApplication.Event) ||
+            if((pageStack.currentItem.mode & (KalendarApplication.Todo | KalendarApplication.Event) ||
                 (pageStack.currentItem.mode === KalendarApplication.Todo && incidenceData.incidenceType !== IncidenceWrapper.TypeTodo)) {
 
                 Kirigami.Settings.isMobile ? dayViewAction.trigger() : weekViewAction.trigger();