lp:~zsombi/ubuntu-ui-toolkit/05-setpalette

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1480

PS Jenkins bot: Approve (continuous-integration) on 2015-04-16

Cris Dywan: Approve on 2015-04-16

Diff: 1213 lines (+864/-27)

23 files modified

components.api (+3/-3)
modules/Ubuntu/Components/MainViewBase.qml (+10/-3)
modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+4/-4)
modules/Ubuntu/Components/Themes/Palette.qml (+3/-3)
modules/Ubuntu/Components/Themes/SuruDark/Palette.qml (+2/-2)
modules/Ubuntu/Components/Themes/qmldir (+4/-0)
modules/Ubuntu/Components/plugin/uctheme.cpp (+227/-2)
modules/Ubuntu/Components/plugin/uctheme.h (+52/-3)
tests/resources/subtheming/Simple.qml (+36/-2)
tests/unit/tst_performance/PaletteConfigurationAllColors.qml (+58/-0)
tests/unit/tst_performance/PaletteConfigurationOneColor.qml (+33/-0)
tests/unit/tst_performance/StyledItemNewTheming.qml (+72/-0)
tests/unit/tst_performance/tst_performance.cpp (+4/-1)
tests/unit/tst_performance/tst_performance.pro (+4/-1)
tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml (+38/-0)
tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml (+34/-0)
tests/unit_x11/tst_subtheming/DynamicPalette.qml (+47/-0)
tests/unit_x11/tst_subtheming/InvalidPalette.qml (+23/-0)
tests/unit_x11/tst_subtheming/MultiplePaletteInstances.qml (+38/-0)
tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml (+39/-0)
tests/unit_x11/tst_subtheming/themes/CustomTheme/Palette.qml (+29/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+95/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+9/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1477. By Zsombor Egri on 2015-04-16

text input style change rolled back; missing test added

1476. By Zsombor Egri on 2015-04-16

fixing TextAreaStyle not picking the field colors properly; removed unnecessary PaletteValue instances

1475. By Zsombor Egri on 2015-04-14

prereq sync

1474. By Zsombor Egri on 2015-04-14

prereq sync

1473. By Zsombor Egri on 2015-04-10

prereq sync

1472. By Zsombor Egri on 2015-04-09

prereq sync

1471. By Zsombor Egri on 2015-04-01

more tests of that type

1470. By Zsombor Egri on 2015-04-01

more performance tests added to see the performance difference between old and new theming solutions

1469. By Zsombor Egri on 2015-04-01

prereq sync

1468. By Zsombor Egri on 2015-03-24

reverting palette component introduced, as we don't reload the palette when removing the bindings anymore