palette : Code : Ubuntu UI Toolkit

Get this branch:: bzr branch lp://qastaging/~zsombi/ubuntu-ui-toolkit/palette

Only Zsombor Egri can upload to this branch. If you are Zsombor Egri please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test at revision 1802

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-01-15

Timo Jyrinki: Approve on 2016-01-15

Diff: 4787 lines (+1958/-742)

94 files modified

components.api (+49/-1)
debian/changelog (+40/-0)
documentation/ubuntu-theming.qdoc (+0/-6)
examples/ubuntu-ui-toolkit-gallery/About.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Colors.qml (+39/-9)
examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Template.qml (+2/-0)
examples/ubuntu-ui-toolkit-gallery/gallery-logging.config (+3/-0)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+2/-2)
src/Ubuntu/Components/1.3/Icon.qdoc (+0/-87)
src/Ubuntu/Components/1.3/Icon.qml (+150/-0)
src/Ubuntu/Components/1.3/MainView.qml (+2/-1)
src/Ubuntu/Components/1.3/MainViewBase.qml (+13/-0)
src/Ubuntu/Components/1.3/Page.qml (+19/-4)
src/Ubuntu/Components/1.3/PageHeader.qml (+1/-1)
src/Ubuntu/Components/1.3/TextArea.qml (+1/-2)
src/Ubuntu/Components/1.3/TextField.qml (+1/-2)
src/Ubuntu/Components/1.3/Toolbar.qml (+1/-1)
src/Ubuntu/Components/1.3/UbuntuColors.qml (+65/-16)
src/Ubuntu/Components/ComponentModule.pro (+2/-1)
src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml (+9/-2)
src/Ubuntu/Components/Popups/1.3/Dialog.qml (+9/-2)
src/Ubuntu/Components/Popups/1.3/Popover.qml (+8/-0)
src/Ubuntu/Components/Themes/1.3/Palette.qml (+13/-1)
src/Ubuntu/Components/Themes/1.3/PaletteValues.qml (+77/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml (+47/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml (+2/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml (+10/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+10/-12)
src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+5/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+3/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+28/-20)
src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+3/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml (+8/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml (+26/-156)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+13/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+5/-0)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml (+0/-25)
src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml (+0/-26)
src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+28/-20)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml (+47/-0)
src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+1/-2)
src/Ubuntu/Components/Themes/SuruDark/qmldir (+1/-0)
src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp (+73/-63)
src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h (+8/-7)
src/Ubuntu/Components/plugin/plugin.cpp (+5/-7)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp (+10/-7)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h (+3/-1)
src/Ubuntu/Components/plugin/ucaction.cpp (+65/-9)
src/Ubuntu/Components/plugin/ucaction.h (+18/-0)
src/Ubuntu/Components/plugin/ucactioncontext.cpp (+138/-9)
src/Ubuntu/Components/plugin/ucactioncontext.h (+45/-3)
src/Ubuntu/Components/plugin/ucactionitem.cpp (+3/-1)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+3/-3)
src/Ubuntu/Components/plugin/ucbottomedge_p.h (+0/-1)
src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+29/-16)
src/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+5/-7)
src/Ubuntu/Components/plugin/uclabel.cpp (+6/-3)
src/Ubuntu/Components/plugin/uclistitem.cpp (+35/-22)
src/Ubuntu/Components/plugin/uclistitem_p.h (+1/-1)
src/Ubuntu/Components/plugin/uclistitemlayout.cpp (+80/-4)
src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+3/-2)
src/Ubuntu/Components/plugin/uctheme.cpp (+75/-62)
src/Ubuntu/Components/plugin/uctheme.h (+6/-12)
src/Ubuntu/Components/plugin/ucthemingextension.cpp (+32/-8)
src/Ubuntu/Components/plugin/ucthemingextension.h (+3/-3)
src/Ubuntu/Components/qmldir (+2/-0)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+7/-4)
src/src.pro (+1/-0)
tests/unit/tst_components/tst_action.qml (+14/-6)
tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml (+1/-1)
tests/unit_x11/tst_components/AppTheme/Palette.qml (+1/-1)
tests/unit_x11/tst_components/MockKeyboard.qml (+1/-1)
tests/unit_x11/tst_components/tst_contextual_actions.qml (+326/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+3/-5)
tests/unit_x11/tst_components/tst_listitem13.qml (+3/-5)
tests/unit_x11/tst_components/tst_pagestack.qml (+6/-0)
tests/unit_x11/tst_components/tst_shortcuts.qml (+32/-8)
tests/unit_x11/tst_components/tst_slotslayout.qml (+47/-2)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+24/-16)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+1/-1)
tests/unit_x11/tst_subtheming/DefaultTheme.qml (+28/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+53/-4)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+3/-0)

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

Tim Peeters: Approve on 2016-01-15

PS Jenkins bot: Approve (continuous-integration) on 2016-01-14

ubuntu-sdk-build-bot: Needs Fixing (continuous-integration) on 2016-01-07

Cris Dywan: Needs Fixing on 2015-12-10

Diff: 2104 lines (+700/-470)

57 files modified

components.api (+46/-1)
documentation/ubuntu-theming.qdoc (+0/-6)
examples/ubuntu-ui-toolkit-gallery/About.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Colors.qml (+39/-9)
examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Template.qml (+2/-0)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+2/-2)
src/Ubuntu/Components/1.3/Icon.qdoc (+0/-87)
src/Ubuntu/Components/1.3/Icon.qml (+150/-0)
src/Ubuntu/Components/1.3/PageHeader.qml (+1/-1)
src/Ubuntu/Components/1.3/TextArea.qml (+1/-2)
src/Ubuntu/Components/1.3/TextField.qml (+1/-2)
src/Ubuntu/Components/1.3/Toolbar.qml (+1/-1)
src/Ubuntu/Components/1.3/UbuntuColors.qml (+65/-16)
src/Ubuntu/Components/ComponentModule.pro (+2/-1)
src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml (+9/-2)
src/Ubuntu/Components/Popups/1.3/Dialog.qml (+2/-2)
src/Ubuntu/Components/Themes/1.3/Palette.qml (+13/-1)
src/Ubuntu/Components/Themes/1.3/PaletteValues.qml (+77/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml (+47/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml (+2/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml (+10/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+10/-12)
src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+5/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+3/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+28/-20)
src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+3/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml (+8/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml (+26/-156)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+13/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+5/-0)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml (+0/-25)
src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml (+0/-26)
src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+28/-20)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml (+47/-0)
src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+1/-2)
src/Ubuntu/Components/Themes/SuruDark/qmldir (+1/-0)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+1/-1)
src/Ubuntu/Components/plugin/uclabel.cpp (+1/-1)
src/Ubuntu/Components/plugin/uclistitem.cpp (+22/-22)
src/Ubuntu/Components/plugin/uclistitem_p.h (+1/-1)
src/Ubuntu/Components/qmldir (+2/-0)
tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml (+1/-1)
tests/unit_x11/tst_components/AppTheme/Palette.qml (+1/-1)
tests/unit_x11/tst_components/MockKeyboard.qml (+1/-1)
tests/unit_x11/tst_components/tst_listitem.qml (+3/-5)
tests/unit_x11/tst_components/tst_listitem13.qml (+3/-5)

Wishlist

Fix Committed

Link a bug report

Related blueprints

Branch information

Owner:: Zsombor Egri

Project:: Ubuntu UI Toolkit

Status:: Merged

Recent revisions

1775. By Zsombor Egri on 2016-01-14: ActionButton, Section and ListItem.LabelVisual color fixed
1774. By Zsombor Egri on 2016-01-14: adjust AppTheme palette to override Label's default coloring palette value
1773. By Zsombor Egri on 2016-01-13: update BottomEdgeHint artwork
1772. By Zsombor Egri on 2016-01-13: API fixed
1771. By Zsombor Egri on 2016-01-13: fix Popups gallery page
1770. By Zsombor Egri on 2016-01-13: replace lightGreay and darkGrey colors
1769. By Zsombor Egri on 2016-01-13: small tweaks
1768. By Zsombor Egri on 2016-01-13: update colors
1767. By Zsombor Egri on 2016-01-13: staging sync
1766. By Zsombor Egri on 2015-12-14: fix Label's default color

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp://qastaging/ubuntu-ui-toolkit

Ubuntu UI Toolkit

lp://qastaging/~zsombi/ubuntu-ui-toolkit/palette

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Subscribers

Ubuntu UI Toolkit

lp://qastaging/~zsombi/ubuntu-ui-toolkit/palette

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers