Merge lp:~paulliu/unity8/divider20140729 into lp:unity8

[Ying-Chun Liu]

Add divider dots.

* 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

 * 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?
Need someone to review.

[Ying-Chun Liu (paulliu)]

Screenshot
https://lh5.googleusercontent.com/C7jIhYd4yqkHupB9NRP4QPwdenR89GwtIkml6Wp6Vw=w230-h391-no

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1088
http://jenkins.qa.ubuntu.com/job/unity8-ci/3661/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/755
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/755
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3909
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10632

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

See inline.

review: Needs Fixing

[lp:~paulliu/unity8/divider20140729]

1089. By Ying-Chun Liu on 2014-07-31

Rename dividerDots* to pagination*.
Remove some unused id.

1090. By Ying-Chun Liu on 2014-07-31

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1089
http://jenkins.qa.ubuntu.com/job/unity8-ci/3708/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2836
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/802
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2915
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4079
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4079/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10784

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1090
http://jenkins.qa.ubuntu.com/job/unity8-ci/3716/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2867
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/810
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/810/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4110
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10809

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/Components/tst_PageHeader.qml
1 conflicts encountered.

review: Needs Fixing

[lp:~paulliu/unity8/divider20140729]

1091. By Ying-Chun Liu on 2014-08-01

merge trunk

1092. By Ying-Chun Liu on 2014-08-01

rename png

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1091
http://jenkins.qa.ubuntu.com/job/unity8-ci/3729/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2891
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/731/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/823
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/823/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10835

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1092
http://jenkins.qa.ubuntu.com/job/unity8-ci/3735/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2905
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/829
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/829/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/829
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4148
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10850

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Code merges now

review: Abstain

[Michał Sawicz (saviq)]

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

 * Did CI run pass? If not, please explain why.
No, restarted.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1092
http://jenkins.qa.ubuntu.com/job/unity8-ci/3749/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2990
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/843
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10944

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1092
http://jenkins.qa.ubuntu.com/job/unity8-ci/3770/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/864
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/864/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/864
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11037

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-07-31 16:49:50 +0000
+++ qml/Components/PageHeader.qml	2014-08-01 11:23:19 +0000
@@ -35,6 +35,8 @@
     property bool searchInProgress: false
 
     property alias bottomItem: bottomContainer.children
+    property int paginationCount: 0
+    property int paginationIndex: -1
 
     // TODO We should use foreground for the icons
     // of the toolbar but unfortunately Action does not have
@@ -294,6 +296,25 @@
         }
     }
 
+    Row {
+        spacing: units.gu(.5)
+        Repeater {
+            objectName: "paginationRepeater"
+            model: root.paginationCount
+            Image {
+                objectName: "paginationDots_" + index
+                height: units.gu(1)
+                width: height
+                source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
+            }
+        }
+        anchors {
+            top: headerContainer.bottom
+            horizontalCenter: headerContainer.horizontalCenter
+            topMargin: units.gu(.5)
+        }
+    }
+
     Component {
         id: popoverComponent
         Popover {

=== added file 'qml/Components/graphics/[e-mail]'
Binary files qml/Components/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Components/graphics/[e-mail]	2014-08-01 11:23:19 +0000 differ
=== added file 'qml/Components/graphics/[e-mail]'
Binary files qml/Components/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Components/graphics/[e-mail]	2014-08-01 11:23:19 +0000 differ
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-07-24 23:31:44 +0000
+++ qml/Dash/DashContent.qml	2014-08-01 11:23:19 +0000
@@ -143,6 +143,8 @@
                         item.scope = Qt.binding(function() { return scope })
                         item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
                         dashContent.scopeLoaded(item.scope.id)
+                        item.paginationCount = Qt.binding(function() { return dashContentList.count } )
+                        item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
                     }
                     Connections {
                         target: isCurrent ? scope : null

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-25 11:49:28 +0000
+++ qml/Dash/GenericScopeView.qml	2014-08-01 11:23:19 +0000
@@ -32,6 +32,8 @@
     property bool hasBackAction: false
     property bool enableHeightBehaviorOnNextCreation: false
     property var categoryView: categoryView
+    property alias paginationCount: pageHeader.paginationCount
+    property alias paginationIndex: pageHeader.paginationIndex
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}

=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
--- tests/qmltests/Components/tst_PageHeader.qml	2014-07-28 09:14:23 +0000
+++ tests/qmltests/Components/tst_PageHeader.qml	2014-08-01 11:23:19 +0000
@@ -192,6 +192,27 @@
                     ];
         }
 
+        function test_pagination() {
+            var paginationRepeater = findChild(pageHeader, "paginationRepeater");
+            tryCompare(paginationRepeater, "count", 0);
+            pageHeader.paginationCount = 5;
+            tryCompare(paginationRepeater, "count", 5);
+            for (var i=0; i<pageHeader.paginationCount; i++) {
+                pageHeader.paginationIndex = i;
+                for (var j=0; j<paginationRepeater.count; j++) {
+                    var paginationDot = findChild(pageHeader, "paginationDots_"+j);
+                    if (i==j) {
+                        compare(paginationDot.source.toString().indexOf("pagination_dot_on") > -1, true);
+                    } else {
+                        compare(paginationDot.source.toString().indexOf("pagination_dot_off") > -1, true);
+                    }
+                }
+            }
+            pageHeader.paginationIndex = -1;
+            pageHeader.paginationCount = 0;
+            tryCompare(paginationRepeater, "count", 0);
+        }
+
         function test_popup_closing(data) {
             searchEnabled = true;
             pageHeader.searchHistory.clear();