Merge lp://qastaging/~nick-dedekind/ubuntu-settings-components/indicator-polishing into lp://qastaging/~registry/ubuntu-settings-components/trunk
Proposed by
Nick Dedekind
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Andrea Cimitan | ||||||||
Approved revision: | 108 | ||||||||
Merged at revision: | 78 | ||||||||
Proposed branch: | lp://qastaging/~nick-dedekind/ubuntu-settings-components/indicator-polishing | ||||||||
Merge into: | lp://qastaging/~registry/ubuntu-settings-components/trunk | ||||||||
Prerequisite: | lp://qastaging/~nick-dedekind/ubuntu-settings-components/uqmlscene | ||||||||
Diff against target: |
4066 lines (+1369/-1495) 58 files modified
CMakeLists.txt (+1/-0) Ubuntu/Settings/Components/ActionTextField.qml (+35/-33) Ubuntu/Settings/Components/CMakeLists.txt (+0/-2) Ubuntu/Settings/Components/Calendar.qml (+2/-2) Ubuntu/Settings/Components/IconVisual.qml (+0/-71) Ubuntu/Settings/Components/MessageHeader.qml (+104/-134) Ubuntu/Settings/Components/QuickReply.qml (+4/-4) Ubuntu/Settings/Components/UbuntuShapeForItem.qml (+43/-0) Ubuntu/Settings/Components/artwork/CMakeLists.txt (+0/-2) Ubuntu/Settings/Components/qmldir (+2/-2) Ubuntu/Settings/Menus/AccessPointMenu.qml (+14/-76) Ubuntu/Settings/Menus/ButtonMenu.qml (+15/-13) Ubuntu/Settings/Menus/CMakeLists.txt (+0/-2) Ubuntu/Settings/Menus/CalendarMenu.qml (+3/-4) Ubuntu/Settings/Menus/CheckableMenu.qml (+5/-13) Ubuntu/Settings/Menus/EventMenu.qml (+9/-9) Ubuntu/Settings/Menus/GroupedMessageMenu.qml (+28/-32) Ubuntu/Settings/Menus/MediaPlayerMenu.qml (+39/-29) Ubuntu/Settings/Menus/PlaybackItemMenu.qml (+53/-44) Ubuntu/Settings/Menus/ProgressBarMenu.qml (+20/-12) Ubuntu/Settings/Menus/ProgressValueMenu.qml (+9/-8) Ubuntu/Settings/Menus/SectionMenu.qml (+2/-2) Ubuntu/Settings/Menus/SeparatorMenu.qml (+3/-7) Ubuntu/Settings/Menus/SimpleMessageMenu.qml (+66/-49) Ubuntu/Settings/Menus/SimpleTextMessageMenu.qml (+0/-99) Ubuntu/Settings/Menus/SliderMenu.qml (+6/-7) Ubuntu/Settings/Menus/SnapDecisionMenu.qml (+64/-126) Ubuntu/Settings/Menus/StandardMenu.qml (+24/-8) Ubuntu/Settings/Menus/SwitchMenu.qml (+38/-37) Ubuntu/Settings/Menus/TextMessageMenu.qml (+3/-4) Ubuntu/Settings/Menus/TimeZoneMenu.qml (+10/-7) Ubuntu/Settings/Menus/TransferMenu.qml (+24/-18) Ubuntu/Settings/Menus/UserSessionMenu.qml (+28/-19) Ubuntu/Settings/Menus/artwork/CMakeLists.txt (+0/-2) Ubuntu/Settings/Menus/artwork/default_app.svg (+0/-42) Ubuntu/Settings/Menus/artwork/secure.svg (+0/-71) Ubuntu/Settings/Menus/qmldir (+1/-3) debian/changelog (+8/-0) debian/control (+2/-2) examples/CMakeLists.txt (+2/-0) examples/MessageComponents.qml (+119/-0) examples/OtherComponents.qml (+237/-0) examples/SettingsComponents.qml (+29/-254) examples/TransferComponents.qml (+84/-0) runtests.sh (+2/-2) tests/qmltests/CMakeLists.txt (+3/-2) tests/qmltests/Menus/tst_AccessPointMenu.qml (+3/-21) tests/qmltests/Menus/tst_ButtonMenu.qml (+1/-1) tests/qmltests/Menus/tst_CheckableMenu.qml (+2/-2) tests/qmltests/Menus/tst_EventMenu.qml (+1/-1) tests/qmltests/Menus/tst_GroupedMessageMenu.qml (+1/-1) tests/qmltests/Menus/tst_MediaPlayerMenu.qml (+10/-10) tests/qmltests/Menus/tst_PlaybackItemMenu.qml (+1/-1) tests/qmltests/Menus/tst_SimpleMessageMenu.qml (+57/-50) tests/qmltests/Menus/tst_SnapDecisionMenu.qml (+82/-95) tests/qmltests/Menus/tst_SwitchMenu.qml (+2/-2) tests/qmltests/Menus/tst_TextMessageMenu.qml (+67/-57) tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~nick-dedekind/ubuntu-settings-components/indicator-polishing | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Cimitan (community) | Approve | ||
Albert Astals Cid (community) | Needs Fixing | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Michael Zanetti (community) | Needs Fixing | ||
Review via email:
|
This proposal supersedes a proposal from 2014-07-29.
Description of the change
Visual changes for indicator RTM polishing sprint
https:/
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the UI, has there been a design review?
Yes
To post a comment you must log in.
FAILED: Continuous integration, rev:79 jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- ci/65/ jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- qmltests- utopic/ 23/console jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- utopic- amd64-ci/ 27 jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- utopic- armhf-ci/ 27
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- settings- components- ci/65/rebuild
http://