git.iko.soy/unity8
on xenial help sign in
clickscope is back to unfavoritable
c5ca466Albert Astals
qml/Dash/GenericScopeView.qml+1−1
compare with xenial
unifiedsplit
@@ -494,7 +494,7 @@ FocusScope {
494 showBackButton: scopeView.hasBackAction
494 showBackButton: scopeView.hasBackAction
495 searchEntryEnabled: true
495 searchEntryEnabled: true
496 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
496 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
497− favoriteEnabled: scopeView.scope
497+ favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
498 favorite: scopeView.scope && scopeView.scope.favorite
498 favorite: scopeView.scope && scopeView.scope.favorite
499 scopeStyle: scopeView.scopeStyle
499 scopeStyle: scopeView.scopeStyle
500 paginationCount: scopeView.paginationCount
500 paginationCount: scopeView.paginationCount
qml/Dash/ScopesListCategory.qml+1−1
@@ -86,7 +86,7 @@ Item {
86 icon: model.art || model.mascot || ""
86 icon: model.art || model.mascot || ""
87 text: model.title || ""
87 text: model.title || ""
88 subtext: model.subtitle || ""
88 subtext: model.subtitle || ""
89− showStar: root.isFavoritesFeed || root.isAlsoInstalled
89+ showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)
90 isFavorite: root.isFavoritesFeed
90 isFavorite: root.isFavoritesFeed
91
91
92 hideChildren: dragItem.loaderToShrink == loader
92 hideChildren: dragItem.loaderToShrink == loader
qml/Dash/ScopesListCategoryItem.qml+2−2
@@ -29,8 +29,8 @@ MouseArea {
29 property alias icon: shapeImage.source
29 property alias icon: shapeImage.source
30 property alias text: titleLabel.text
30 property alias text: titleLabel.text
31 property alias subtext: subtitleLabel.text
31 property alias subtext: subtitleLabel.text
32− property alias showStar: star.visible
33
32
33+ property bool showStar: false
34 property bool isFavorite: false
34 property bool isFavorite: false
35 property bool hideChildren: false
35 property bool hideChildren: false
36
36
@@ -95,7 +95,7 @@ MouseArea {
95 anchors.centerIn: parent
95 anchors.centerIn: parent
96 height: units.gu(2)
96 height: units.gu(2)
97 width: units.gu(2)
97 width: units.gu(2)
98− visible: !hideChildren
98+ visible: !hideChildren && (editMode || showStar)
99 // TODO is view-grid-symbolic what we really want here? Looks good but seems semantically wrong
99 // TODO is view-grid-symbolic what we really want here? Looks good but seems semantically wrong
100 source: editMode ? "image://theme/view-grid-symbolic" : isFavorite ? "image://theme/starred" : "image://theme/non-starred"
100 source: editMode ? "image://theme/view-grid-symbolic" : isFavorite ? "image://theme/starred" : "image://theme/non-starred"
101 }
101 }