lp://qastaging/~zsombi/ubuntu-ui-toolkit/05-palettechanges

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/ubuntu-ui-toolkit/staging

Ubuntu SDK team: Pending requested 2015-03-12

Diff: 1261 lines (+1002/-7)

25 files modified

components.api (+5/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-2)
modules/Ubuntu/Components/plugin/ucpalettesettings.cpp (+297/-0)
modules/Ubuntu/Components/plugin/ucpalettesettings.h (+95/-0)
modules/Ubuntu/Components/plugin/uctheme.cpp (+25/-1)
modules/Ubuntu/Components/plugin/uctheme.h (+7/-0)
tests/resources/styleset/Simple.qml (+22/-0)
tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml (+36/-0)
tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml (+32/-0)
tests/unit_x11/tst_subtheming/ExplicitPaletteSettings.qml (+34/-0)
tests/unit_x11/tst_subtheming/ImplicitPaletteSettings.qml (+34/-0)
tests/unit_x11/tst_subtheming/InvalidPaletteSettings1.qml (+27/-0)
tests/unit_x11/tst_subtheming/InvalidPaletteSettings2.qml (+27/-0)
tests/unit_x11/tst_subtheming/InvalidPaletteSettings3.qml (+27/-0)
tests/unit_x11/tst_subtheming/InvalidPaletteSettings4.qml (+27/-0)
tests/unit_x11/tst_subtheming/InvalidPaletteSettings5.qml (+27/-0)
tests/unit_x11/tst_subtheming/InvalidPaletteSettings6.qml (+28/-0)
tests/unit_x11/tst_subtheming/MorePaletteSettingsInTheme.qml (+28/-0)
tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml (+38/-0)
tests/unit_x11/tst_subtheming/WrongPaletteSettingsDeclaration.qml (+27/-0)
tests/unit_x11/tst_subtheming/themes/CustomTheme/Palette.qml (+29/-0)
tests/unit_x11/tst_subtheming/themes/CustomTheme/parent_theme (+1/-1)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+108/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+15/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1452. By Zsombor Egri on 2015-03-17

prereq sync

1451. By Zsombor Egri on 2015-03-16

documentation updated

1450. By Zsombor Egri on 2015-03-16

component renamed to PaletteSettings, not to be confused with PropertyChanges derivates

1449. By Zsombor Egri on 2015-03-16

propertychanges reverted to original

1448. By Zsombor Egri on 2015-03-16

API complete

1447. By Zsombor Egri on 2015-03-16

switchColors and explicit properties added; test cases covering both implemented

1446. By Zsombor Egri on 2015-03-13

prereq sync

1445. By Zsombor Egri on 2015-03-12

tests added, more featuires to come

1444. By Zsombor Egri on 2015-03-12

prereq sync

1443. By Zsombor Egri on 2015-03-12

change implementation