Ubuntu UI Toolkit

Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/paleette2 into lp://qastaging/ubuntu-ui-toolkit/staging

paleette2
Merge into staging

Proposed by Zsombor Egri on 2016-01-22

Status:

Merged

Approved by:

Zsombor Egri on 2016-01-27

Approved revision:

1837

Merged at revision:

1824

Proposed branch:

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

Merge into:

lp://qastaging/ubuntu-ui-toolkit/staging

Diff against target:

1570 lines (+383/-186)

51 files modified

components.api (+5/-2)
examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml (+1/-0)
src/Ubuntu/Components/1.3/OptionSelector.qml (+2/-1)
src/Ubuntu/Components/1.3/PageHeadConfiguration.qml (+2/-2)
src/Ubuntu/Components/1.3/TextField.qml (+1/-1)
src/Ubuntu/Components/1.3/UbuntuColors.qml (+2/-2)
src/Ubuntu/Components/ListItems/1.3/Empty.qml (+3/-1)
src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml (+3/-3)
src/Ubuntu/Components/ListItems/1.3/Standard.qml (+2/-2)
src/Ubuntu/Components/Popups/1.3/Dialog.qml (+3/-3)
src/Ubuntu/Components/Themes/1.3/Palette.qml (+12/-4)
src/Ubuntu/Components/Themes/1.3/PaletteValues.qml (+12/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml (+5/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml (+27/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml (+13/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+5/-36)
src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+7/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml (+13/-11)
src/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml (+4/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml (+6/-6)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+6/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+21/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+4/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+11/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+21/-13)
src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/PopoverForegroundStyle.qml (+4/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml (+12/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+10/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+8/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+5/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+8/-9)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-0)
src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+22/-13)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml (+5/-3)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml (+29/-0)
src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+1/-0)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp (+19/-2)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h (+4/-0)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+4/-0)
src/Ubuntu/Components/plugin/uclabel.cpp (+23/-4)
src/Ubuntu/Components/plugin/uclabel.h (+6/-0)
src/Ubuntu/Components/plugin/uclistitem.cpp (+1/-1)
tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp (+8/-0)
tests/unit_x11/tst_components/AppTheme/Palette.qml (+1/-1)
tests/unit_x11/tst_components/tst_slotslayout.qml (+7/-0)

To merge this branch:

bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/paleette2

Related bugs:

Bug #1495477: TextField placeholderText not visible on SuruDark	High	Fix Released
Bug #1536722: ScrollView scrollbar on a dark theme can be difficult to see	Critical	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-01-27
Tim Peeters			Approve on 2016-01-27
Cris Dywan		2016-01-22	Approve on 2016-01-27
Zoltan Balogh			Approve on 2016-01-27
Review via email: mp+283686@code.qastaging.launchpad.net

Commit message

Palette fix. Update components to use the palette.

Description of the change

Palette fix. Update components to use the palette.

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-22:

FAILED: Continuous integration, rev:1816
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/144/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/331/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/144/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-22:

FAILED: Continuous integration, rev:1816
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/147/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/332/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/147/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-22:

PASSED: Continuous integration, rev:1818
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/145/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/333/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/145/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-22:

PASSED: Continuous integration, rev:1818
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/148/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/334/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/148/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-25:

FAILED: Continuous integration, rev:1821
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/149/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/337/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/149/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-25:

PASSED: Continuous integration, rev:1821
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/147/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/339/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/147/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-25:

PASSED: Continuous integration, rev:1826
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/157/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/352/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/157/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-25:

FAILED: Continuous integration, rev:1826
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/155/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/353/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/155/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-26:

PASSED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/174/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/397/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/174/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-26:

PASSED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/180/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/398/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/180/rebuild

review: Approve (continuous-integration)

lp://qastaging/~zsombi/ubuntu-ui-toolkit/paleette2 updated on 2016-01-27

1831. By Zsombor Egri on 2016-01-27: ListItemLatout label default coloring

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

PASSED: Continuous integration, rev:1831
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/181/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/399/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/181/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

PASSED: Continuous integration, rev:1831
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/175/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/400/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/175/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2016-01-27:

+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp 2016-01-27 06:39:19 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp 2016-01-27 06:39:19 +0000

Unrelated? Probably better in a separate branch?

+ d->m_subtitle = new UCLabel(getSubtitleColor, this);

You're passing a method so the Label gets to evaluate the color lambda-style. But UCLabel.m_defaultColor is right now only called in postThemeChanged. To make this really work you'll also need (the equivalent of) onEnabledChanged and onActiveFocusChanged.
I like the idea, but I feel this should be done cleaner...

This might be the right time to fill a gap in our API. I think we already agree we need state-based colors in some form.

How about getPaletteColor returning a UCPaletteColor(QQuickItem* item, const QString& color) object that has a color based on activeFocus and enabled, so UCLabel just needs to listen to colorChanged?
This would kind of enforce consistent use of the palette, and even states which UCLabel doesn't currently implement, but I think that would be a good thing.

review: Needs Information

lp://qastaging/~zsombi/ubuntu-ui-toolkit/paleette2 updated on 2016-01-27

1832. By Zsombor Egri on 2016-01-27: Scrollbar colors fixed

Revision history for this message

Zsombor Egri (zsombi) wrote on 2016-01-27:

> +++ src/Ubuntu/Components/plugin/ucbottomedge.cpp 2016-01-27 06:39:19
> +0000
> +++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp 2016-01-27 06:39:19
> +0000
>
> Unrelated? Probably better in a separate branch?

As we discussed, I had to do code change in the BottomEdge, so I thought it would be wiser to also add a test to it. The coloring wasn't working otherwise.

>
>
> + d->m_subtitle = new UCLabel(getSubtitleColor, this);
>
> You're passing a method so the Label gets to evaluate the color lambda-style.
> But UCLabel.m_defaultColor is right now only called in postThemeChanged. To
> make this really work you'll also need (the equivalent of) onEnabledChanged
> and onActiveFocusChanged.
> I like the idea, but I feel this should be done cleaner...

You are right, the enabled must also be handled.

>
> This might be the right time to fill a gap in our API. I think we already
> agree we need state-based colors in some form.
>
> How about getPaletteColor returning a UCPaletteColor(QQuickItem* item, const
> QString& color) object that has a color based on activeFocus and enabled, so
> UCLabel just needs to listen to colorChanged?
> This would kind of enforce consistent use of the palette, and even states
> which UCLabel doesn't currently implement, but I think that would be a good
> thing.

Summarizing of what we discussed, we need a code which selects the color from the proper valueset, however that must be based on enabled and "selected" notion rather than enabled and activeFocus. The selected valueset should only be used if the item has the ability to do that. And we need to decide what will be the criteria. I'd rather do this in a separate MR than in this one. But we can agree on that in the standup.

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

PASSED: Continuous integration, rev:1832
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/186/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/418/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/186/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

FAILED: Continuous integration, rev:1832
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/176/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/424/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/176/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~zsombi/ubuntu-ui-toolkit/paleette2 updated on 2016-01-27

1833. By Zsombor Egri on 2016-01-27: OptionSelector and ListItem.Empty
1834. By Zsombor Egri on 2016-01-27: introducing highlighted valueset; changing inactive into disabled, selectedInactive into selectedDisabled; update components
1835. By Zsombor Egri on 2016-01-27: remove pointer from Popover, shoudl come back when UbuntuShape will have support for it
1836. By Zsombor Egri on 2016-01-27: refresh default color for Label also when enabled changes

Revision history for this message

Zoltan Balogh (bzoltan) wrote on 2016-01-27:

I like it, let's see it in the silo

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

PASSED: Continuous integration, rev:1836
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/187/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/428/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/187/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

PASSED: Continuous integration, rev:1836
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/177/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/429/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/177/rebuild

review: Approve (continuous-integration)

lp://qastaging/~zsombi/ubuntu-ui-toolkit/paleette2 updated on 2016-01-27

1837. By Zsombor Egri on 2016-01-27: fix opacity used for disabled state

Revision history for this message

Cris Dywan (kalikiana) wrote on 2016-01-27:

> Summarizing of what we discussed, we need a code which selects the color from
> the proper valueset, however that must be based on enabled and "selected"
> notion rather than enabled and activeFocus. The selected valueset should only
> be used if the item has the ability to do that. And we need to decide what
> will be the criteria. I'd rather do this in a separate MR than in this one.
> But we can agree on that in the standup.

Yeah, as agreed we can iterate it later; enabled is now handled and that's enough for what we need here.
Things are looking a lot better with all the fixes!

review: Approve

Revision history for this message

Tim Peeters (tpeeters) wrote on 2016-01-27:

Looks fine.

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-27:

PASSED: Continuous integration, rev:1837
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/178/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/430/console