lp://staging/~aacid/unity8/dynamic_specialized_cards

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/unity8 at revision 890

Michael Zanetti (community): Approve on 2014-05-08

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-05-07

Diff: 3024 lines (+1590/-714)

48 files modified

debian/unity8-private.install (+1/-1)
plugins/CMakeLists.txt (+1/-1)
plugins/Dash/CMakeLists.txt (+5/-5)
plugins/Dash/CardCreator.js (+518/-0)
plugins/Dash/CardCreatorCache.qml (+40/-0)
plugins/Dash/plugin.cpp (+2/-2)
plugins/Dash/plugin.h (+3/-3)
plugins/Dash/qmldir (+3/-2)
qml/Dash/Card.qml (+0/-236)
qml/Dash/CardCarousel.qml (+13/-10)
qml/Dash/CardFilterGrid.qml (+19/-16)
qml/Dash/CardHeader.qml (+0/-126)
qml/Dash/CardTool.qml (+30/-22)
qml/Dash/Previews/PreviewHeader.qml (+86/-9)
qml/Dash/ScopeListView.qml (+1/-1)
tests/autopilot/unity8/shell/emulators/dash.py (+3/-4)
tests/mocks/Unity/fake_categories.cpp (+15/-2)
tests/mocks/Unity/fake_resultsmodel.cpp (+1/-0)
tests/plugins/CMakeLists.txt (+1/-1)
tests/plugins/Dash/CMakeLists.txt (+16/-9)
tests/plugins/Dash/cardcreator/1.res (+77/-0)
tests/plugins/Dash/cardcreator/1.tst (+3/-0)
tests/plugins/Dash/cardcreator/2.res (+115/-0)
tests/plugins/Dash/cardcreator/2.tst (+3/-0)
tests/plugins/Dash/cardcreator/3.res (+94/-0)
tests/plugins/Dash/cardcreator/3.tst (+3/-0)
tests/plugins/Dash/cardcreator/4.res (+95/-0)
tests/plugins/Dash/cardcreator/4.tst (+3/-0)
tests/plugins/Dash/cardcreator/5.res (+137/-0)
tests/plugins/Dash/cardcreator/5.tst (+3/-0)
tests/plugins/Dash/cardcreatortest.cpp (+91/-0)
tests/plugins/Dash/cardcreatortest.qml (+29/-0)
tests/plugins/Dash/horizontaljournaltest.qml (+1/-1)
tests/plugins/Dash/horizontaljournaltry.qml (+1/-1)
tests/plugins/Dash/listviewwithpageheadertest.qml (+1/-1)
tests/plugins/Dash/listviewwithpageheadertestsection.qml (+1/-1)
tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml (+1/-1)
tests/plugins/Dash/organicgridtest.qml (+1/-1)
tests/plugins/Dash/organicgridtry.qml (+1/-1)
tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml (+1/-1)
tests/plugins/Dash/verticaljournaltest.qml (+1/-1)
tests/plugins/Dash/verticaljournaltry.qml (+1/-1)
tests/qmltests/CMakeLists.txt (+3/-3)
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+66/-4)
tests/qmltests/Dash/tst_Card.qml (+79/-93)
tests/qmltests/Dash/tst_CardBenchmark.qml (+10/-7)
tests/qmltests/Dash/tst_CardHeader.qml (+0/-116)
tests/qmltests/Dash/tst_CardTool.qml (+11/-31)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1297197: New scopes performance needs to be improved

High

Fix Released

Link a bug report

Related blueprints

909. By Albert Astals Cid on 2014-05-07

Don't use the .y to calculate height, otherwise we end up in loops here

908. By Albert Astals Cid on 2014-05-07

Remove line that creates warnings

I think this came from a wrong copy&paste since it wasn't there in the original code

907. By Albert Astals Cid on 2014-05-07

document and narrow the rest of substitutions

906. By Albert Astals Cid on 2014-05-07

Document summaryLabelCode substitutions

905. By Albert Astals Cid on 2014-05-07

Document and limit what you can do with subtitleLabelCode substitutions

904. By Albert Astals Cid on 2014-05-07

Document and narrow what you can do with the arg replacement in headerColumnCode

903. By Albert Astals Cid on 2014-05-07

Document and simplify the %1 replacements of artShapeHolderCode

902. By Albert Astals Cid on 2014-05-06

Rework header row/column creation

This way we don't open it in one place and close it 100 lines later

901. By Albert Astals Cid on 2014-05-06

Move big chunks of boilerplate out of the main function

900. By Albert Astals Cid on 2014-05-06

no need for a variable here