Merge lp:~aacid/unity8/apps-special-after-all into lp:unity8

[Albert Astals Cid]

clickscope is back to being unfavoritable

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Not yet.
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-12-03 07:44:46 +0000
+++ qml/Dash/GenericScopeView.qml	2014-12-12 09:59:26 +0000
@@ -494,7 +494,7 @@
                     showBackButton: scopeView.hasBackAction
                     searchEntryEnabled: true
                     settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
-                    favoriteEnabled: scopeView.scope
+                    favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
                     favorite: scopeView.scope && scopeView.scope.favorite
                     scopeStyle: scopeView.scopeStyle
                     paginationCount: scopeView.paginationCount
 
=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2014-11-25 11:03:58 +0000
+++ qml/Dash/ScopesListCategory.qml	2014-12-12 09:59:26 +0000
@@ -78,7 +78,7 @@
             clip: height < listItemHeight
             Behavior on height { enabled: visible; UbuntuNumberAnimation { } }
             sourceComponent: ScopesListCategoryItem {
-                objectName: "delegate" + index
+                objectName: "delegate" + model.scopeId
 
                 width: root.width
                 topMargin: height > listItemHeight ? height - listItemHeight : 0
@@ -86,7 +86,7 @@
                 icon: model.art || model.mascot || ""
                 text: model.title || ""
                 subtext: model.subtitle || ""
-                showStar: root.isFavoritesFeed || root.isAlsoInstalled
+                showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)
                 isFavorite: root.isFavoritesFeed
 
                 hideChildren: dragItem.loaderToShrink == loader
 
=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
--- qml/Dash/ScopesListCategoryItem.qml	2014-10-29 10:57:47 +0000
+++ qml/Dash/ScopesListCategoryItem.qml	2014-12-12 09:59:26 +0000
@@ -29,8 +29,8 @@
     property alias icon: shapeImage.source
     property alias text: titleLabel.text
     property alias subtext: subtitleLabel.text
-    property alias showStar: star.visible
 
+    property bool showStar: false
     property bool isFavorite: false
     property bool hideChildren: false
 
@@ -84,12 +84,14 @@
         }
         MouseArea {
             id: starArea
+            objectName: "starArea"
             height: parent.height
             width: height
             anchors.right: parent.right
             onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
             onPressed: if (editMode) root.handlePressed(starArea);
             onReleased: if (editMode) root.handleReleased(starArea);
+            visible: editMode || showStar
             Icon {
                 id: star
                 anchors.centerIn: parent
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-12-11 13:25:10 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-12-12 09:59:26 +0000
@@ -83,6 +83,30 @@
             return get_scope_data()
         }
 
+        function test_manage_dash_clickscope_unfavoritable() {
+            // Show the manage dash
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+
+            // Make sure stuff is loaded
+            var favScopesListCategory = findChild(dash, "scopesListCategoryfavorites");
+            var favScopesListCategoryList = findChild(favScopesListCategory, "scopesListCategoryInnerList");
+            tryCompare(favScopesListCategoryList, "currentIndex", 0);
+
+            // Click scope star area is not visible (i.e. can't be unfavorited)
+            var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");
+            var starArea = findChild(clickScope, "starArea");
+            compare(starArea.visible, false);
+
+            // Go back
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+        }
+
         function test_manage_dash_select_same_favorite() {
             // Show the manage dash
             touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
 
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-12-03 07:44:46 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-12-12 09:59:26 +0000
@@ -574,6 +574,7 @@
                 var innerHeader = findChild(header, "innerPageHeader");
                 verify(innerHeader, "Could not find the inner header");
 
+                expectFail("Apps", "Click scope should not have a favorite button");
                 var favoriteAction = findChild(innerHeader, "favorite_header_button");
                 verify(favoriteAction, "Could not find the favorite action.");
                 mouseClick(favoriteAction, favoriteAction.width / 2, favoriteAction.height / 2);