git.iko.soy/unity8
on xenial help sign in
Use a proper ScopeStyle
7fe84b9Albert Astals
qml/Dash/ScopesOverview.qml+9−9
compare with xenial
unifiedsplit
@@ -15,6 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18+import Dash 0.1
18import Ubuntu.Components 0.1
19import Ubuntu.Components 0.1
19import "../Components"
20import "../Components"
20
21
@@ -54,12 +55,6 @@ Item {
54
55
55 // Internal properties
56 // Internal properties
56 property bool forceXYScalerEater: false
57 property bool forceXYScalerEater: false
57− property QtObject scopeStyle: QtObject {
58− property string headerLogo: ""
59− property color foreground: "white"
60− property color background: "transparent"
61− }
62−
63
58
64 signal done()
59 signal done()
65 signal favoriteSelected(var scopeId)
60 signal favoriteSelected(var scopeId)
@@ -122,6 +117,11 @@ Item {
122 }
117 }
123 }
118 }
124
119
120+ ScopeStyle {
121+ id: overviewScopeStyle
122+ style: { "foreground-color" : "white", "background-color" : "transparent" }
123+ }
124+
125 DashBackground {
125 DashBackground {
126 anchors.fill: parent
126 anchors.fill: parent
127 Rectangle {
127 Rectangle {
@@ -167,7 +167,7 @@ Item {
167 width: parent.width
167 width: parent.width
168 clip: true
168 clip: true
169 title: i18n.tr("Manage Dash")
169 title: i18n.tr("Manage Dash")
170− scopeStyle: root.scopeStyle
170+ scopeStyle: overviewScopeStyle
171 showSignatureLine: false
171 showSignatureLine: false
172 searchEntryEnabled: true
172 searchEntryEnabled: true
173 searchInProgress: root.scope ? root.scope.searchInProgress : false
173 searchInProgress: root.scope ? root.scope.searchInProgress : false
@@ -304,7 +304,7 @@ Item {
304 bottom: parent.bottom
304 bottom: parent.bottom
305 }
305 }
306 scope: root.scope && root.scope.searchQuery != "" ? root.scope : null
306 scope: root.scope && root.scope.searchQuery != "" ? root.scope : null
307− scopeStyle: root.scopeStyle
307+ scopeStyle: overviewScopeStyle
308 enabled: opacity == 1
308 enabled: opacity == 1
309 showPageHeader: false
309 showPageHeader: false
310 clip: true
310 clip: true
@@ -375,7 +375,7 @@ Item {
375 id: previewListView
375 id: previewListView
376 objectName: "scopesOverviewPreviewListView"
376 objectName: "scopesOverviewPreviewListView"
377 scope: root.scope
377 scope: root.scope
378− scopeStyle: root.scopeStyle
378+ scopeStyle: overviewScopeStyle
379 visible: x != width
379 visible: x != width
380 width: parent.width
380 width: parent.width
381 height: parent.height
381 height: parent.height