Fixes per review.
commit9966be2a601b41ed7882e4efdb82e7ecdde526bd
authorRodney Dawes <rodney.dawes@canonical.com>
dateWed 25 Jan 2017, 14:51 (10 years ago)
parent1341e04
qml/Dash/CardTool.qml+2−3
@@ -77,9 +77,8 @@ Item {
7777 return layout;
7878 }
7979
80− readonly property bool isAppLikeScope: scopeId === "clickscope" || scopeId === "libertine-scope.ubuntu_libertine-scope"
81− readonly property bool isAppLikeScopeAppCategory: ((scopeId === "clickscope" && (categoryId === "predefined" || categoryId === "local"))
82− || (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint"))
80+ readonly property bool isAppLikeScope: scopeId === "libertine-scope.ubuntu_libertine-scope"
81+ readonly property bool isAppLikeScopeAppCategory: (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint")
8382
8483 readonly property string artShapeStyle: {
8584 if (isAppLikeScope) {
qml/Dash/GenericScopeView.qml+1−1
@@ -582,7 +582,7 @@ FocusScope {
582582 showSignatureLine: !showBackButton
583583 searchEntryEnabled: true
584584 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
585− favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
585+ favoriteEnabled: scopeView.scope
586586 favorite: scopeView.scope && scopeView.scope.favorite
587587 navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
588588 scopeStyle: scopeView.scopeStyle
qml/Dash/ScopesListCategory.qml+1−1
@@ -89,7 +89,7 @@ Item {
8989 icon: model.art || model.mascot || ""
9090 text: model.title || ""
9191 subtext: model.subtitle || ""
92− showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)
92+ showStar: root.isFavoritesFeed || root.isAlsoInstalled
9393 isFavorite: root.isFavoritesFeed
9494
9595 hideChildren: dragItem.loaderToShrink == loader