git.iko.soy/unity8
on xenial help sign in
Change PageHeader's API to not use scope directly
ae567d2Michał Sawicz
qml/Dash/GenericScopeView.qml+1−1
compare with xenial
unifiedsplit
@@ -426,7 +426,7 @@ FocusScope {
426 searchEntryEnabled: true
426 searchEntryEnabled: true
427 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
427 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
428 favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
428 favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
429− scope: scopeView.scope
429+ favorite: scopeView.scope && scopeView.scope.favorite
430 scopeStyle: scopeView.scopeStyle
430 scopeStyle: scopeView.scopeStyle
431 paginationCount: scopeView.paginationCount
431 paginationCount: scopeView.paginationCount
432 paginationIndex: scopeView.paginationIndex
432 paginationIndex: scopeView.paginationIndex
qml/Dash/PageHeader.qml+3−3
@@ -33,6 +33,7 @@ Item {
33 property bool searchEntryEnabled: false
33 property bool searchEntryEnabled: false
34 property bool settingsEnabled: false
34 property bool settingsEnabled: false
35 property bool favoriteEnabled: false
35 property bool favoriteEnabled: false
36+ property bool favorite: false
36 property ListModel searchHistory: SearchHistoryModel
37 property ListModel searchHistory: SearchHistoryModel
37 property alias searchQuery: searchTextField.text
38 property alias searchQuery: searchTextField.text
38 property alias searchHint: searchTextField.placeholderText
39 property alias searchHint: searchTextField.placeholderText
@@ -42,7 +43,6 @@ Item {
42 property int paginationCount: 0
43 property int paginationCount: 0
43 property int paginationIndex: -1
44 property int paginationIndex: -1
44
45
45− property var scope: null
46 property var scopeStyle: null
46 property var scopeStyle: null
47
47
48 signal backClicked()
48 signal backClicked()
@@ -276,8 +276,8 @@ Item {
276 },
276 },
277 Action {
277 Action {
278 objectName: "favorite"
278 objectName: "favorite"
279− text: root.scope && root.scope.favorite ? i18n.tr("Remove from Favorites") : i18n.tr("Add to Favorites")
279+ text: root.favorite ? i18n.tr("Remove from Favorites") : i18n.tr("Add to Favorites")
280− iconName: root.scope && root.scope.favorite ? "starred" : "non-starred"
280+ iconName: root.favorite ? "starred" : "non-starred"
281 visible: root.favoriteEnabled
281 visible: root.favoriteEnabled
282 onTriggered: {
282 onTriggered: {
283 root.favoriteClicked()
283 root.favoriteClicked()