Merge lp:~aacid/unity8/scopeListPageHeaderScopeStyle into lp:unity8

[Albert Astals Cid]

Bind scopeStyle for the scope list header

This does nothing since the backend is not exposing any scopeStyle for the overview scope but in the case they do it'll be ready

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5019/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/184/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/452/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16503

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5019/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/scopeListPageHeaderScopeStyle]

1484. By Launchpad Translations on behalf of unity-team on 2014-12-11

Launchpad automatic translations update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5026/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/191

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5026/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/scopeListPageHeaderScopeStyle]

1485. By Michael Zanetti on 2014-12-11

decrease opacity changes in spread, move it to a separate surface.

This fixes the issue that trusted sessions would cause the app to shine through when being made transparent. Instead, we're putting a black overlay on top now. Additionally it decreases the opacity change as requested by design, in order to avoid the "flickering" effect when going to spread quickly. Fixes: #1360258
Approved by: PS Jenkins bot, Vesa Rautiainen, Albert Astals Cid

1486. By Albert Astals Cid on 2014-12-11

Fix the Dash Header hamburger menu background color

Approved by: Michael Zanetti

1487. By Gerry Boland on 2014-12-11

[indicators] Fix positioning on panel resize.
Approved by: Daniel d'Andrada

1488. By Michael Zanetti on 2014-12-11

Add an initial, rudimentary DesktopStage to get started
Approved by: Gerry Boland

1489. By Michael Zanetti on 2014-12-11

Uninvert Launcher in Desktop Mode

Also some little restruturing
Approved by: Gerry Boland

1490. By Michael Zanetti on 2014-12-11

Add support for Wallpaper in Desktop stage
Approved by: Gerry Boland

1491. By Michael Zanetti on 2014-12-11

Add window control buttons to panel for fullscreen applications
Approved by: Gerry Boland

1492. By CI Train Bot Account on 2014-12-11

Bump version due to new Manage Dash

1493. By Andrea Cimitan on 2014-12-11

Remove dismiss timer in Launcher Fixes: #1368778
Approved by: Michael Zanetti, PS Jenkins bot

1494. By dobey on 2014-12-11

Add dependency on gir1.2-notify-0.7 to unity8-autopilot package. Fixes: #1400437
Approved by: Michał Sawicz

1495. By Albert Astals Cid on 2014-12-11

Fix tests Fixes: #1400449
Approved by: Michael Zanetti

1496. By Albert Astals Cid on 2014-12-11

Allow pulling manage dash if there's no favorite scopes
 Fixes: #1400774
Approved by: Michael Zanetti

1497. By Albert Astals Cid on 2014-12-11

Manage Dash: Make store button work even if you have no favorites
 Fixes: #1400771
Approved by: Michael Zanetti

1498. By Albert Astals Cid on 2014-12-11

Make pot_file
Approved by: Michał Sawicz

1499. By CI Train Bot Account on 2014-12-11

Releasing 8.02+15.04.20141211.2-0ubuntu1

1500. By Launchpad Translations on behalf of unity-team on 2014-12-12

Launchpad automatic translations update.

[Michael Zanetti (mzanetti)]

Think it would make sense setting this from a mock and testing if some of the style elements are properly applied?

review: Needs Information

[lp:~aacid/unity8/scopeListPageHeaderScopeStyle]

1501. By Albert Astals Cid on 2014-12-12

Make Navigation work when "jumping" to the non root

There's two fixes:
 * If the Navigation we jumped to is a leaf, list the model of the parent
 * If we're going back/left but we're already on index 0 of the list prepend the parent so we can continue going back Fixes: #1343242
Approved by: Michael Zanetti

1502. By CI Train Bot Account on 2014-12-12

Releasing 8.02+15.04.20141212.1-0ubuntu1

1503. By Launchpad Translations on behalf of unity-team on 2014-12-13

Launchpad automatic translations update.

1504. By Launchpad Translations on behalf of unity-team on 2014-12-14

Launchpad automatic translations update.

1505. By Launchpad Translations on behalf of unity-team on 2014-12-15

Launchpad automatic translations update.

1506. By Albert Astals Cid on 2014-12-15

Use the default scope style for the header

Unmerged revisions

1506. By Albert Astals Cid on 2014-12-15

Use the default scope style for the header

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-12-11 13:25:10 +0000
+++ qml/Dash/Dash.qml	2014-12-12 13:04:21 +0000
@@ -75,6 +75,7 @@
             return
         }
 
+        dashContent.workaroundRestoreIndex = -1;
         dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
     }
 

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-12-03 07:44:46 +0000
+++ qml/Dash/GenericScopeView.qml	2014-12-12 13:04:21 +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/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2014-12-02 12:04:11 +0000
+++ qml/Dash/ScopesList.qml	2014-12-12 13:04:21 +0000
@@ -34,6 +34,10 @@
 
     state: "browse"
 
+    property var scopeStyle: ScopeStyle {
+        style: scope ? scope.customizations : {}
+    }
+
     onStateChanged: {
         if (state == "edit") {
             // As per design entering edit mode clears the possible existing search
@@ -66,6 +70,7 @@
         backIsClose: root.state == "edit"
         storeEntryEnabled: root.state == "browse"
         searchEntryEnabled: false // Disable search for now
+        scopeStyle: root.scopeStyle
         onBackClicked: {
             if (backIsClose) {
                 root.state = "browse"
@@ -111,7 +116,7 @@
 
                         editMode: root.state == "edit"
 
-                        scopeStyle: root.scope.scopeStyle
+                        scopeStyle: root.scopeStyle
                         isFavoritesFeed: categoryId == "favorites"
                         isAlsoInstalled: categoryId == "other"
 

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2014-11-25 11:03:58 +0000
+++ qml/Dash/ScopesListCategory.qml	2014-12-12 13:04:21 +0000
@@ -40,6 +40,7 @@
 
     ListItems.Header {
         id: header
+        objectName: "scopesListCategoryHeader"
         width: root.width
         height: units.gu(5)
         color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
@@ -78,7 +79,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 +87,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 13:04:21 +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/mocks/Unity/fake_scopesoverview.cpp'
--- tests/mocks/Unity/fake_scopesoverview.cpp	2014-10-06 08:52:00 +0000
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2014-12-12 13:04:21 +0000
@@ -22,6 +22,7 @@
 
 ScopesOverview::ScopesOverview(Scopes* parent)
  : Scope("scopesOverview", "Scopes Overview", false, parent)
+ , m_headerBlue(false)
 {
     delete m_categories; // delete the usual categories, we're not going to use it
     m_scopesOverviewCategories = new ScopesOverviewCategories(parent, this);
@@ -52,6 +53,23 @@
     }
 }
 
+void ScopesOverview::setHeaderBlue(bool blue)
+{
+    if (m_headerBlue != blue) {
+        m_headerBlue = blue;
+        Q_EMIT customizationsChanged();
+    }
+}
+
+QVariantMap ScopesOverview::customizations() const
+{
+    QVariantMap res;
+    if (m_headerBlue) {
+        res["foreground-color"] = "blue";
+    }
+    return res;
+}
+
 void ScopesOverview::setFavorite(Scope *scope, bool favorite)
 {
     m_scopesOverviewCategories->setFavorite(scope, favorite);

=== modified file 'tests/mocks/Unity/fake_scopesoverview.h'
--- tests/mocks/Unity/fake_scopesoverview.h	2014-09-26 11:21:19 +0000
+++ tests/mocks/Unity/fake_scopesoverview.h	2014-12-12 13:04:21 +0000
@@ -34,6 +34,9 @@
     void setSearchQuery(const QString& search_query) override;
     Q_INVOKABLE void activate(QVariant const& result) override;
 
+    Q_INVOKABLE void setHeaderBlue(bool blue);
+    QVariantMap customizations() const;
+
     // This is implementation detail
     void setFavorite(Scope *scope, bool favorite);
     void moveFavoriteTo(Scope *scope, int index);
@@ -41,6 +44,7 @@
 private:
     ScopesOverviewCategories *m_scopesOverviewCategories;
     unity::shell::scopes::CategoriesInterface *m_searchCategories;
+    bool m_headerBlue;
 };
 
 class ScopesOverviewCategories : public unity::shell::scopes::CategoriesInterface

=== 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 13:04:21 +0000
@@ -70,17 +70,28 @@
             waitForRendering(findChild(dash, "scopeLoader0").item);
         }
 
-        function get_scope_data() {
-            return [
-                        { tag: "MockScope1", visualIndex: 0 },
-                        { tag: "MockScope2", visualIndex: -1 },
-                        { tag: "clickscope", visualIndex: 1 },
-                        { tag: "MockScope5", visualIndex: 2 },
-            ]
-        }
-
-        function test_show_scope_on_load_data() {
-            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() {
@@ -306,7 +317,7 @@
             spy.target = scopesList.scope;
             spy.signalName = "performQuery";
 
-            // Do a search
+            // Click on the store
             var scopesListPageHeader = findChild(scopesList, "pageHeader");
             var searchButton = findChild(scopesListPageHeader, "store_header_button");
             mouseClick(searchButton, 0, 0);
@@ -315,5 +326,106 @@
             compare(spy.signalArguments[0][0], "scope://com.canonical.scopes.clickstore");
             tryCompare(bottomEdgeController, "progress", 0);
         }
+
+        function test_manage_dash_move_current() {
+            var dashContentList = findChild(dash, "dashContentList");
+            compare(dashContentList.currentIndex, 0);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+
+            // 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);
+
+            // Enter edit mode
+            var scopesList = findChild(dash, "scopesList");
+            var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");
+            mousePress(clickScope, 0, 0);
+            tryCompare(scopesList, "state", "edit");
+            mouseRelease(clickScope, 0, 0);
+
+            var starArea = findChild(clickScope, "starArea");
+            touchFlick(starArea, 0, 0, 0, -units.gu(10));
+
+            // Exit edit mode and go back
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+            mouseClick(backButton, 0, 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+
+            tryCompare(dashContentList, "currentIndex", 0);
+            compare(dashContentList.currentItem.scopeId, "clickscope");
+
+            // Move to second scope
+            touchFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2));
+            tryCompare(dashContentList, "currentIndex", 1);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+        }
+
+        function test_manage_dash_move_current_click_other() {
+            var dashContentList = findChild(dash, "dashContentList");
+            compare(dashContentList.currentIndex, 0);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+
+            // 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);
+
+            // Enter edit mode
+            var scopesList = findChild(dash, "scopesList");
+            var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");
+            mousePress(clickScope, 0, 0);
+            tryCompare(scopesList, "state", "edit");
+            mouseRelease(clickScope, 0, 0);
+
+            var starArea = findChild(clickScope, "starArea");
+            touchFlick(starArea, 0, 0, 0, -units.gu(10));
+
+            // wait for the animation to settle
+            tryCompare(clickScope, "height", units.gu(6));
+
+            // Exit edit mode
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+
+            // Click on third scope
+            var mockScope5 = findChild(favScopesListCategoryList, "delegateMockScope5");
+            waitForRendering(mockScope5)
+            mouseClick(mockScope5, 0, 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+            tryCompare(dashContentList, "currentIndex", 2);
+            compare(dashContentList.currentItem.scopeId, "MockScope5");
+        }
+
+        function test_manage_dash_customizations() {
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "innerPageHeader");
+
+            var favScopesListCategory = findChild(dash, "scopesListCategoryfavorites");
+            var scopesListCategoryHeader = findChild(favScopesListCategory, "scopesListCategoryHeader");
+
+            compare(scopesListPageHeader.config.foregroundColor, "#5d5d5d");
+            compare(scopesListCategoryHeader.color, "#5d5d5d");
+
+            scopesList.scope.setHeaderBlue(true);
+
+            compare(scopesListPageHeader.config.foregroundColor, "#0000ff");
+            compare(scopesListCategoryHeader.color, "#0000ff");
+        }
     }
 }

=== 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 13:04:21 +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);