Merge lp://staging/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes into lp://staging/~registry/ubuntu-settings-components/trunk

Proposed by Nick Dedekind
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 113
Merged at revision: 105
Proposed branch: lp://staging/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes
Merge into: lp://staging/~registry/ubuntu-settings-components/trunk
Prerequisite: lp://staging/~aacid/ubuntu-settings-components/standarizeImports
Diff against target: 460 lines (+197/-24)
17 files modified
debian/changelog (+7/-0)
examples/OtherComponents.qml (+22/-0)
examples/SettingsComponents.qml (+1/-1)
plugins/Ubuntu/Settings/Components/ActionTextField.qml (+1/-1)
plugins/Ubuntu/Settings/Components/Calendar.qml (+3/-3)
plugins/Ubuntu/Settings/Components/MessageHeader.qml (+2/-2)
plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml (+3/-3)
plugins/Ubuntu/Settings/Menus/EventMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml (+128/-0)
plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml (+6/-6)
plugins/Ubuntu/Settings/Menus/SectionMenu.qml (+1/-0)
plugins/Ubuntu/Settings/Menus/SliderMenu.qml (+2/-2)
plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/StandardMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/TransferMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/qmldir (+1/-0)
po/ubuntu-settings-components.pot (+16/-2)
To merge this branch: bzr merge lp://staging/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Unity8 CI Bot (community) continuous-integration Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Lukáš Tinkl (community) Abstain
Zsombor Egri Pending
Review via email: mp+285702@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-01-27.

Commit message

Fixed colors palette value set & updated imports. Moved ModemItem from u8.

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20/+merge/283385
https://code.launchpad.net/~nick-dedekind/unity8/indicator-color-fixes/+merge/284136

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote : Posted in a previous version of this proposal

There seems to be lot more than the colors, never the less please update here as well so you use disabled instead of inactive. More, if you need to highlight an item in case pressed, you have the highlighted valueset for the palette, so you could use theme.palette.highlighted.background for instance in case needed.

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> There seems to be lot more than the colors, never the less please update here
> as well so you use disabled instead of inactive. More, if you need to
> highlight an item in case pressed, you have the highlighted valueset for the
> palette, so you could use theme.palette.highlighted.background for instance in
> case needed.

Done.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote : Posted in a previous version of this proposal

Not sure if POT files are also updated automatically here (as in unity8) but since you added new strings, it should be updated somehow.

review: Needs Fixing
111. By Nick Dedekind

updated pot

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Updated translations

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:111
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-1-ci/11/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/446/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/148
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/148/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/469
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/487
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/487
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/483
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/483/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/483/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/483
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/483/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/483/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/483
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/483/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/483/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-1-ci/11/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Code looks good, not tested (yet) though

review: Abstain
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
112. By Nick Dedekind

version bump

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Code looks good, waiting on silo to be available to do testing.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:112
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-1-ci/15/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/686
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/268
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/268
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/268
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/709
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/726
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/726
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/722
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/722
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/722/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/722
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/722
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/722/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/722
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/722
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/722/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-1-ci/15/rebuild

review: Approve (continuous-integration)
113. By Nick Dedekind

removed import test. Part of another MP.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:113
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-1-ci/16/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/694
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/735
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/735
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/731
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/731/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/731
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/731/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/731
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/731/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/731
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/731/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/731
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/731/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/731
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/731/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-1-ci/16/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Testing of the silo looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: