Unity 8

Merge lp:~cimi/unity8/tweaks-libertine-scope into lp:unity8

  1. tweaks-libertine-scope
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 2445
Merged at revision: 2475
Proposed branch: lp:~cimi/unity8/tweaks-libertine-scope
Merge into: lp:unity8
Prerequisite: lp:~cimi/unity8/cardCreatorCache_update-on-artShapeStyle
Diff against target: 93 lines (+18/-7)
5 files modified
qml/Dash/GenericScopeView.qml (+5/-4)
tests/mocks/Unity/fake_scopes.cpp (+1/-0)
tests/qmltests/Dash/tst_Dash.qml (+10/-1)
tests/qmltests/Dash/tst_DashContent.qml (+1/-1)
tests/qmltests/Dash/tst_DashShell.qml (+1/-1)
To merge this branch: bzr merge lp:~cimi/unity8/tweaks-libertine-scope
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+296658@code.launchpad.net

This proposal supersedes a proposal from 2016-06-07.

Commit message

Same tweaks we have for click scope now for libertine

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no, but you need latest libertine-scope
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * 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

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good, Michael Z is finding a designer to decide if we should allow unfavorite or not

lp:~cimi/unity8/tweaks-libertine-scope updated
2445. By Andrea Cimitan

libertine can be unfavorited

Revision history for this message
Albert Astals Cid (aacid) wrote :

 * 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.
Waiting for it before top approving

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2444
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1423/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1895
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/968
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/968
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/968
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1921
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1857
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1857
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1857
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1848/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1423/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

CI failure is unrelated

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2445
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1427/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1899/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1925
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1861
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1861
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1861
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1852
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1852/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1852
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1852/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1852
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1852/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1852/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1852/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1852/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1852
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1852/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1852
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1852/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1852
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1852/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1427/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2445
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1438/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1914
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/977
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/977
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/977
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1940
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1876
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1876
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1876
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1867/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1438/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/GenericScopeView.qml'
2--- qml/Dash/GenericScopeView.qml 2016-05-27 13:52:20 +0000
3+++ qml/Dash/GenericScopeView.qml 2016-06-07 13:49:49 +0000
4@@ -342,8 +342,8 @@
5 }
6 updateRanges();
7 clickScopeSizingHacks();
8- if (scope && scope.id === "clickscope") {
9- if (categoryId === "predefined" || categoryId === "local") {
10+ if (scope && (scope.id === "clickscope" || scope.id === "libertine-scope.ubuntu_libertine-scope")) {
11+ if (scope.id === "libertine-scope.ubuntu_libertine-scope" || categoryId === "predefined" || categoryId === "local") {
12 cardTool.artShapeSize = Qt.binding(function() { return Qt.size(units.gu(8), units.gu(7.5)) });
13 cardTool.artShapeStyle = "icon";
14 } else {
15@@ -367,8 +367,9 @@
16 onPxpguChanged: clickScopeSizingHacks();
17
18 function clickScopeSizingHacks() {
19- if (scope && scope.id === "clickscope" &&
20- (categoryId === "predefined" || categoryId === "local")) {
21+ if (scope &&
22+ ((scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) ||
23+ scope.id === "libertine-scope.ubuntu_libertine-scope")) {
24 // Yeah, hackish :/
25 if (scopeView.width > units.gu(45)) {
26 if (scopeView.width >= units.gu(70)) {
27
28=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
29--- tests/mocks/Unity/fake_scopes.cpp 2016-04-29 14:57:44 +0000
30+++ tests/mocks/Unity/fake_scopes.cpp 2016-06-07 13:49:49 +0000
31@@ -60,6 +60,7 @@
32 addScope(new Scope("MockScope7", "MS7", false, this));
33 addScope(new Scope("MockScope8", "MS8", false, this));
34 addScope(new Scope("MockScope9", "MS9", false, this));
35+ addScope(new Scope("libertine-scope.ubuntu_libertine-scope", "Libertine", true, this));
36
37 Scope *longNavigationScope = new Scope(
38 "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,
39
40=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
41--- tests/qmltests/Dash/tst_Dash.qml 2016-06-07 13:49:49 +0000
42+++ tests/qmltests/Dash/tst_Dash.qml 2016-06-07 13:49:49 +0000
43@@ -58,7 +58,7 @@
44 tryCompare(dashContentList, "count", 0);
45 scopes.load();
46 tryCompare(dashContentList, "currentIndex", 0);
47- tryCompare(dashContentList, "count", 7);
48+ tryCompare(dashContentList, "count", 8);
49 tryCompare(scopes, "loaded", true);
50 tryCompareFunction(function() {
51 var mockScope1Loader = findChild(dash, "scopeLoader0");
52@@ -652,6 +652,15 @@
53 var tile = getCategoryDelegate("predefined", 2);
54 var proportionalShape = findChildsByType(tile, "UCProportionalShape");
55 compare(proportionalShape.length, 1);
56+
57+ dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
58+ var dashContent = findChild(dash, "dashContent");
59+ tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
60+
61+ scrollToCategory("dashCategory2");
62+ tile = getCategoryDelegate("2", 2);
63+ proportionalShape = findChildsByType(tile, "UCProportionalShape");
64+ compare(proportionalShape.length, 1);
65 }
66
67 function test_tempScopeItemXOnResize()
68
69=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
70--- tests/qmltests/Dash/tst_DashContent.qml 2016-05-27 13:52:20 +0000
71+++ tests/qmltests/Dash/tst_DashContent.qml 2016-06-07 13:49:49 +0000
72@@ -124,7 +124,7 @@
73
74 loadScopes();
75
76- compare(dashContentList.count, 7);
77+ compare(dashContentList.count, 8);
78 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
79 }
80
81
82=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
83--- tests/qmltests/Dash/tst_DashShell.qml 2016-05-03 22:39:09 +0000
84+++ tests/qmltests/Dash/tst_DashShell.qml 2016-06-07 13:49:49 +0000
85@@ -60,7 +60,7 @@
86 tryCompare(dashContentList, "count", 0);
87 scopes.load();
88 tryCompare(dashContentList, "currentIndex", 0);
89- tryCompare(dashContentList, "count", 7);
90+ tryCompare(dashContentList, "count", 8);
91 tryCompare(scopes, "loaded", true);
92 tryCompareFunction(function() {
93 var mockScope1Loader = findChild(dash, "scopeLoader0");

Subscribers

People subscribed via source and target branches