git.iko.soy/unity8
on xenial help sign in
clickscope is back to unfavoritable
commitc5ca4664bbcf22301f614c1ed739fda0ef6d3269 authorAlbert Astals <albert.astals@canonical.com> dateFri 12 Dec 2014, 10:15 (12 years ago) parent18e9e80
3 files changed+4−4
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+1−1 qml/Dash/ScopesListCategory.qml+1−1 qml/Dash/ScopesListCategoryItem.qml+2−2
qml/Dash/GenericScopeView.qml+1−1
@@ -494,7 +494,7 @@ FocusScope {
494494 showBackButton: scopeView.hasBackAction
495495 searchEntryEnabled: true
496496 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
497− favoriteEnabled: scopeView.scope
497+ favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
498498 favorite: scopeView.scope && scopeView.scope.favorite
499499 scopeStyle: scopeView.scopeStyle
500500 paginationCount: scopeView.paginationCount
qml/Dash/ScopesListCategory.qml+1−1
@@ -86,7 +86,7 @@ Item {
8686 icon: model.art || model.mascot || ""
8787 text: model.title || ""
8888 subtext: model.subtitle || ""
89− showStar: root.isFavoritesFeed || root.isAlsoInstalled
89+ showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)
9090 isFavorite: root.isFavoritesFeed
9191
9292 hideChildren: dragItem.loaderToShrink == loader
qml/Dash/ScopesListCategoryItem.qml+2−2
@@ -29,8 +29,8 @@ MouseArea {
2929 property alias icon: shapeImage.source
3030 property alias text: titleLabel.text
3131 property alias subtext: subtitleLabel.text
32− property alias showStar: star.visible
3332
33+ property bool showStar: false
3434 property bool isFavorite: false
3535 property bool hideChildren: false
3636
@@ -95,7 +95,7 @@ MouseArea {
9595 anchors.centerIn: parent
9696 height: units.gu(2)
9797 width: units.gu(2)
98− visible: !hideChildren
98+ visible: !hideChildren && (editMode || showStar)
9999 // TODO is view-grid-symbolic what we really want here? Looks good but seems semantically wrong
100100 source: editMode ? "image://theme/view-grid-symbolic" : isFavorite ? "image://theme/starred" : "image://theme/non-starred"
101101 }