Merge lp://staging/~3v1n0/ubuntu-settings-components/touch+pointer-styles into lp://staging/ubuntu-settings-components
Status: | Merged |
---|---|
Approved by: | Lukáš Tinkl |
Approved revision: | 290 |
Merged at revision: | 169 |
Proposed branch: | lp://staging/~3v1n0/ubuntu-settings-components/touch+pointer-styles |
Merge into: | lp://staging/ubuntu-settings-components |
Prerequisite: | lp://staging/~3v1n0/ubuntu-settings-components/slots-layouts |
Diff against target: |
1390 lines (+475/-138) 39 files modified
debian/changelog (+17/-0) debian/control (+1/-1) examples/MessageComponents.qml (+5/-0) examples/OtherComponents.qml (+19/-15) examples/SettingsComponents.qml (+15/-0) examples/TransferComponents.qml (+3/-0) plugins/Ubuntu/Settings/Components/MessageHeader.qml (+23/-4) plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml (+3/-4) plugins/Ubuntu/Settings/Menus/BaseLayoutMenu.qml (+7/-11) plugins/Ubuntu/Settings/Menus/BaseMenu.qml (+23/-15) plugins/Ubuntu/Settings/Menus/ButtonMenu.qml (+18/-5) plugins/Ubuntu/Settings/Menus/CMakeLists.txt (+2/-0) plugins/Ubuntu/Settings/Menus/CalendarMenu.qml (+3/-2) plugins/Ubuntu/Settings/Menus/CheckableMenu.qml (+2/-1) plugins/Ubuntu/Settings/Menus/EventMenu.qml (+2/-0) plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml (+2/-2) plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml (+17/-4) plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml (+20/-10) plugins/Ubuntu/Settings/Menus/PlaybackButton.qml (+1/-1) plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml (+8/-3) plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml (+3/-0) plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml (+1/-1) plugins/Ubuntu/Settings/Menus/SectionMenu.qml (+0/-2) plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml (+3/-2) plugins/Ubuntu/Settings/Menus/SliderMenu.qml (+11/-11) plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml (+2/-1) plugins/Ubuntu/Settings/Menus/StandardMenu.qml (+2/-2) plugins/Ubuntu/Settings/Menus/Style/BaseStyle.qml (+35/-0) plugins/Ubuntu/Settings/Menus/Style/CMakeLists.txt (+1/-0) plugins/Ubuntu/Settings/Menus/Style/MenuPaddings.qml (+26/-0) plugins/Ubuntu/Settings/Menus/Style/PointerStyle.qml (+38/-0) plugins/Ubuntu/Settings/Menus/Style/TouchStyle.qml (+40/-0) plugins/Ubuntu/Settings/Menus/Style/qmldir (+5/-0) plugins/Ubuntu/Settings/Menus/StyledSlotsLayout.qml (+32/-0) plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml (+2/-0) plugins/Ubuntu/Settings/Menus/TransferMenu.qml (+9/-5) plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml (+2/-2) tests/qmltests/Menus/tst_BaseMenu.qml (+43/-26) tests/qmltests/Menus/tst_ButtonMenu.qml (+29/-8) |
To merge this branch: | bzr merge lp://staging/~3v1n0/ubuntu-settings-components/touch+pointer-styles |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Lukáš Tinkl (community) | Approve | ||
Review via email:
|
Commit message
Menus: add Pointer and Touch styles to be used depending on the user interaction with components
Menu items now have a new Style property that defines some common properties such as shared colors and
sizes that change depending on the UX journey. I'm only defining Pointer and TouchStyles for now, but they
can be easily overridden in case.
Removed some deprecated properties and adapted colors and sizes to new style.
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
Unity8 won't work with this without lp:~3v1n0/unity8/menuitems-slots-cleanup
The examples client won't update the menu items size on the fly (without resizing the window) unless without using lp:~3v1n0/ubuntu-ui-toolkit/slotslayout-paddings-changes-updates-size (not needed for other components for now)
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yep, ran in both laptop and phone
* 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?
I'm updating the paddings and sizes matching the new design specs
* If you changed localized strings, has the POT file been updated?
N/A
FAILED: Continuous integration, rev:281 /unity8- jenkins. ubuntu. com/job/ lp-ubuntu- settings- components- ci/81/ /unity8- jenkins. ubuntu. com/job/ build/3037 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= vivid+overlay, testname= qmluitests. sh/1684 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= xenial+ overlay, testname= qmluitests. sh/1684 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= yakkety, testname= qmluitests. sh/1684 /unity8- jenkins. ubuntu. com/job/ build-0- fetch/3065 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2922/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2922 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2922/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-ubuntu- settings- components- ci/81/rebuild
https:/