Commit bb80372f authored by Claudio Cambra's avatar Claudio Cambra
Browse files

Fix QML error messages

parent 20730b8d
Pipeline #178802 passed with stage
in 2 minutes and 7 seconds
......@@ -217,9 +217,11 @@ Kirigami.OverlayDrawer {
// Override the default checkable behaviour as we want this to stay highlighted
// in any of the hourly views, at least in desktop mode
checkable: true
checked: pageStack.currentItem.objectName == "weekView" ||
checked: pageStack.currentItem && (
pageStack.currentItem.objectName == "weekView" ||
pageStack.currentItem.objectName == "threeDayView" ||
pageStack.currentItem.objectName == "dayView"
)
onTriggered: {
weekViewAction.trigger()
if (mainDrawer.modal) mainDrawer.close()
......
......@@ -676,7 +676,9 @@ Kirigami.ApplicationWindow {
id: filterHeaderBar
active: false
sourceComponent: Item {
readonly property bool show: header.mode === KalendarApplication.Todo || header.filter.tags.length > 0 || notifyMessage.visible
readonly property bool show: header.mode === KalendarApplication.Todo ||
header.filter.tags.length > 0 ||
notifyMessage.visible
readonly property alias messageItem: notifyMessage
height: show ? headerLayout.implicitHeight + headerSeparator.height : 0
......@@ -1097,19 +1099,19 @@ Kirigami.ApplicationWindow {
Kirigami.Action {
text: "Week"
checkable: true
checked: pageStack.currentItem.objectName == "weekView"
checked: pageStack.currentItem && pageStack.currentItem.objectName == "weekView"
onTriggered: weekViewAction.trigger()
},
Kirigami.Action {
text: "3 Days"
checkable: true
checked: pageStack.currentItem.objectName == "threeDayView"
checked: pageStack.currentItem && pageStack.currentItem.objectName == "threeDayView"
onTriggered: threeDayViewAction.trigger()
},
Kirigami.Action {
text: "Day"
checkable: true
checked: pageStack.currentItem.objectName == "dayView"
checked: pageStack.currentItem && pageStack.currentItem.objectName == "dayView"
onTriggered: dayViewAction.trigger()
}
]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment