on xenial help sign in
Should not feature overview in settings page
7e52a60Andrea Cimitan
qml/Dash/Dash.qml+1
@@ -342,6 +342,7 @@ Showable {
342 z: 1
342 z: 1
343 direction: Direction.Upwards
343 direction: Direction.Upwards
344 enabled: !dashContent.previewShown &&
344 enabled: !dashContent.previewShown &&
345+ !dashContent.settingsShown &&
345 dashContent.currentScope &&
346 dashContent.currentScope &&
346 dashContent.currentScope.searchQuery == "" &&
347 dashContent.currentScope.searchQuery == "" &&
347 (overviewController.progress == 0 || dragging)
348 (overviewController.progress == 0 || dragging)
qml/Dash/DashContent.qml+2
@@ -29,6 +29,8 @@ Item {
29 readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
29 readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
30 readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ?
30 readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ?
31 dashContentList.currentItem.item.previewShown : false
31 dashContentList.currentItem.item.previewShown : false
32+ readonly property bool settingsShown: dashContentList.currentItem && dashContentList.currentItem.item ?
33+ dashContentList.currentItem.item.settingsShown : false
32 readonly property bool processing: dashContentList.currentItem && dashContentList.currentItem.item
34 readonly property bool processing: dashContentList.currentItem && dashContentList.currentItem.item
33 && dashContentList.currentItem.item.processing || false
35 && dashContentList.currentItem.item.processing || false
34 readonly property bool pageHeaderTotallyVisible: dashContentList.currentItem && dashContentList.currentItem.item
36 readonly property bool pageHeaderTotallyVisible: dashContentList.currentItem && dashContentList.currentItem.item