Unity 8

Merge lp://qastaging/~cimi/unity8/card-shadows-uitk1.1 into lp://qastaging/unity8

card-shadows-uitk1.1
Merge into trunk

Proposed by Andrea Cimitan on 2015-06-15

Status:	Work in progress
Proposed branch:	lp://qastaging/~cimi/unity8/card-shadows-uitk1.1
Merge into:	lp://qastaging/unity8
Diff against target:	498 lines (+116/-31) 14 files modified plugins/Dash/CMakeLists.txt (+2/-0) plugins/Dash/CardCreator.js (+23/-5) qml/Components/ResponsiveGridView.qml (+1/-0) qml/Dash/CardCarousel.qml (+1/-1) qml/Dash/CardGrid.qml (+5/-0) qml/Dash/GenericScopeView.qml (+2/-2) tests/mocks/Unity/fake_categories.cpp (+5/-0) tests/plugins/Dash/cardcreator/1.res (+23/-5) tests/plugins/Dash/cardcreator/2.res (+2/-2) tests/plugins/Dash/cardcreator/3.res (+23/-5) tests/plugins/Dash/cardcreator/4.res (+2/-2) tests/plugins/Dash/cardcreator/5.res (+23/-5) tests/plugins/Dash/cardcreator/6.res (+2/-2) tests/plugins/Dash/cardcreator/7.res (+2/-2)
To merge this branch:	bzr merge lp://qastaging/~cimi/unity8/card-shadows-uitk1.1
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)			Needs Information on 2015-06-25
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-06-25
Albert Astals Cid (community)		2015-06-15	Needs Information on 2015-06-23
Review via email: mp+261977@code.qastaging.launchpad.net

Commit message

add dropshadow to application scope

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No, but other apps to ship new icons
* 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?
yes
* Did you have a look at the warnings when running tests? Can they be reduced?
no new warnings, many come from UITK

lp://qastaging/~cimi/unity8/card-shadows-uitk1.1 updated on 2015-06-15

1801. By Andrea Cimitan on 2015-06-15: Minor tweak to comment

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-15:

FAILED: Continuous integration, rev:1800
http://jenkins.qa.ubuntu.com/job/unity8-ci/5810/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/102/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-15:

FAILED: Continuous integration, rev:1801
http://jenkins.qa.ubuntu.com/job/unity8-ci/5811/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/103/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-06-23:

Why do we need the export_qmlfiles ?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-06-23:

Can maybe we make

readonly property var artShapeStyle: cardTool.artShapeSize === Qt.size(units.gu(8), units.gu(7.5)) ? "shadow" : "inset";

a bit less hackish if we pass the scope name or something from above?

review: Needs Information

Revision history for this message

Andrea Cimitan (cimi) wrote on 2015-06-23:

> Why do we need the export_qmlfiles ?

this export the png files in the installation directory

> Can maybe we make
>
> readonly property var artShapeStyle: cardTool.artShapeSize === Qt.size(units.gu(8), units.gu(7.5)) ? "shadow" : "inset";
>
> a bit less hackish if we pass the scope name or something from above?

This would also require to copy/paste the other logic in place, like "if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local"))"

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-06-23:

> > Can maybe we make
> >
> > readonly property var artShapeStyle: cardTool.artShapeSize ===
> Qt.size(units.gu(8), units.gu(7.5)) ? "shadow" : "inset";
> >
> > a bit less hackish if we pass the scope name or something from above?
>
> This would also require to copy/paste the other logic in place, like "if
> (scope && scope.id === "clickscope" && (categoryId === "predefined" ||
> categoryId === "local"))"

My concern is, is it possible than something else than the clickscope can have Qt.size(units.gu(8), units.gu(7.5)) ?

Also if we're going to go with this hack we should document in GenericScopeView.qml that this depends on that sizing in case it changes someone should come here and change it too

lp://qastaging/~cimi/unity8/card-shadows-uitk1.1 updated on 2015-06-24

1802. By Andrea Cimitan on 2015-06-24: Minor tests
1803. By Andrea Cimitan on 2015-06-24: Tweaks to shadow looks when pressed
1804. By Andrea Cimitan on 2015-06-24: Asset updated

Revision history for this message

Andrea Cimitan (cimi) wrote on 2015-06-24:

> > > Can maybe we make
> > >
> > > readonly property var artShapeStyle: cardTool.artShapeSize ===
> > Qt.size(units.gu(8), units.gu(7.5)) ? "shadow" : "inset";
> > >
> > > a bit less hackish if we pass the scope name or something from above?
> >
> > This would also require to copy/paste the other logic in place, like "if
> > (scope && scope.id === "clickscope" && (categoryId === "predefined" ||
> > categoryId === "local"))"
>
> My concern is, is it possible than something else than the clickscope can have
> Qt.size(units.gu(8), units.gu(7.5)) ?
>
> Also if we're going to go with this hack we should document in
> GenericScopeView.qml that this depends on that sizing in case it changes
> someone should come here and change it too

done, changed to 8x7.4 as should be

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-24:

FAILED: Continuous integration, rev:1803
http://jenkins.qa.ubuntu.com/job/unity8-ci/5878/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/185/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/185/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~cimi/unity8/card-shadows-uitk1.1 updated on 2015-06-24

1805. By Andrea Cimitan on 2015-06-24: Merged trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-24:

FAILED: Continuous integration, rev:1804
http://jenkins.qa.ubuntu.com/job/unity8-ci/5879/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/186/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~cimi/unity8/card-shadows-uitk1.1 updated on 2015-06-24

1806. By Andrea Cimitan on 2015-06-24: Less topMargin is required
1807. By Andrea Cimitan on 2015-06-24: Added small comment

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-24:

FAILED: Continuous integration, rev:1807
http://jenkins.qa.ubuntu.com/job/unity8-ci/5880/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/188/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/161
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/125/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/188
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21448

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~cimi/unity8/card-shadows-uitk1.1 updated on 2015-06-25

1808. By Andrea Cimitan on 2015-06-25: Removed highlight because makes krillin crash

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-25:

FAILED: Continuous integration, rev:1808
http://jenkins.qa.ubuntu.com/job/unity8-ci/5887/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/197
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21480

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2015-06-25:

Performance seems bad on krillin.... we need to put those images into shaders... I'd wait few weeks

review: Needs Information

Unmerged revisions

1808. By Andrea Cimitan on 2015-06-25: Removed highlight because makes krillin crash
1807. By Andrea Cimitan on 2015-06-24: Added small comment
1806. By Andrea Cimitan on 2015-06-24: Less topMargin is required
1805. By Andrea Cimitan on 2015-06-24: Merged trunk
1804. By Andrea Cimitan on 2015-06-24: Asset updated
1803. By Andrea Cimitan on 2015-06-24: Tweaks to shadow looks when pressed
1802. By Andrea Cimitan on 2015-06-24: Minor tests
1801. By Andrea Cimitan on 2015-06-15: Minor tweak to comment
1800. By Andrea Cimitan on 2015-06-15: Merge trunk
1799. By Andrea Cimitan on 2015-06-15: Just add some tweaks to the app scope mock

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Andrea Cimitan

Mohammad Rakibul Hasan

Unity Team