Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheOptionSelector into lp:ubuntu-ui-toolkit/staging
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Tim Peeters on 2016-09-23 | ||||
| Approved revision: | 2056 | ||||
| Merged at revision: | 2128 | ||||
| Proposed branch: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheOptionSelector | ||||
| Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
| Diff against target: |
367 lines (+284/-6) 5 files modified
src/imports/Components/1.3/OptionSelector.qml (+60/-1) src/imports/Components/1.3/OptionSelectorDelegate.qml (+3/-5) src/imports/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+3/-0) tests/unit/visual/tst_focus.13.qml (+28/-0) tests/unit/visual/tst_optionselector.13.qml (+190/-0) |
||||
| To merge this branch: | bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheOptionSelector | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve on 2016-09-23 | |
| Tim Peeters | 2016-07-29 | Approve on 2016-09-23 | |
|
Review via email:
|
|||
Commit Message
Focus ring, arrow keys and space to expand OptionSelector
PASSED: Continuous integration, rev:2050
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2050
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2050
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2050
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| Tim Peeters (tpeeters) wrote : | # |
After opening the OptionSelector in tst_optionselec
Also, there are inline comments relating to the code.
- 2051. By Christian Dywan on 2016-08-17
-
Drop FIXMEs from unrelated cases (filed as bug 1614045 instead)
- 2052. By Christian Dywan on 2016-08-17
-
Re-arrange Keys.onPressed select
| Christian Dywan (kalikiana) wrote : | # |
> why do you introduce a FIXME in the test?
I removed the FIXMEs and instead filed bug 1614045.
> don't we normally use Qt.resolvedUrl() for all images?
That would be wrong. It's slow enough to show up in function call profiling as can be seen in eg. the fix for bug 1608897. In this particular case it's simply not necessary.
> missing break; ? And did you want to do something
> with the increment variable?
Good catch :-D
PASSED: Continuous integration, rev:2052
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2052
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2052
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2052
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2052
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2053. By Christian Dywan on 2016-08-22
-
Unit test and bug fix for unexpected child tab focus
| Christian Dywan (kalikiana) wrote : | # |
> When the invisible focus is selected,
> the up/down arrow keys can be used to change
> the selected item in the optionselector
Fixed and enhanced the unit test to catch it.
PASSED: Continuous integration, rev:2053
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2053
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2053
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2053
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2053
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| Tim Peeters (tpeeters) wrote : | # |
There is still an issue that some times the selection can be changed while the OptionSelector is closed. Explained how to reproduce in the unit test QML on IRC.
| Tim Peeters (tpeeters) wrote : | # |
^:%s/IRC/Mumble
- 2054. By Christian Dywan on 2016-08-26
-
Fully test custom OptionSelector
FAILED: Continuous integration, rev:2054
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2054
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2054
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2054
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2054
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2055. By Christian Dywan on 2016-09-19
-
Use distinct State, not extending the default
FAILED: Continuous integration, rev:2055
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2055
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2055
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2055
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2055
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2055
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2056. By Christian Dywan on 2016-09-19
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| Tim Peeters (tpeeters) wrote : | # |
I can no longer reproduce any faulty behavior in the optionselector.
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2056
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/

PASSED: Continuous integration, rev:2050 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-i386- gles-stable/ 907/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/4858/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-i386- gles-stable/ 907/rebuild
https:/