lp:~mterry/ubuntu-ui-toolkit/monitor-only
Created by
Michael Terry
and last modified
- Get this branch:
- bzr branch lp:~mterry/ubuntu-ui-toolkit/monitor-only
Only
Michael Terry
can upload to this branch. If you are
Michael Terry
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- ubuntu-sdk-build-bot: Approve (continuous-integration)
- Zsombor Egri: Approve
- Timo Jyrinki: Approve (trigger ci for non-sdk-team member)
- PS Jenkins bot: Approve (continuous-integration)
-
Diff: 314 lines (+179/-6)6 files modifiedcomponents.api (+2/-0)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+52/-5)
src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+5/-0)
src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+1/-0)
tests/unit_x11/tst_swipearea/DownwardsLauncher.qml (+14/-0)
tests/unit_x11/tst_swipearea/tst_swipearea.cpp (+105/-1)
Superseded
for merging
into
lp:ubuntu-ui-toolkit
- Zsombor Egri: Needs Fixing
- PS Jenkins bot: Approve (continuous-integration)
-
Diff: 3287 lines (+1254/-304)71 files modifiedapicheck/apicheck.cpp (+10/-0)
components.api (+55/-51)
debian/control (+9/-0)
debian/libubuntugestures5-private-dev.install (+3/-0)
documentation/ubuntu-components.qdoc (+1/-1)
documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+2/-2)
examples/ubuntu-ui-toolkit-gallery/Label.qml (+6/-6)
examples/ubuntu-ui-toolkit-gallery/MainPage.qml (+17/-27)
examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+7/-3)
src/Ubuntu/Components/1.2/TextField.qml (+1/-1)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+1/-0)
src/Ubuntu/Components/1.3/AppHeader.qml (+5/-0)
src/Ubuntu/Components/1.3/MainView.qml (+5/-21)
src/Ubuntu/Components/1.3/TextField.qml (+19/-1)
src/Ubuntu/Components/1.3/UbuntuListView.qml (+178/-9)
src/Ubuntu/Components/1.3/UbuntuListView11.qdoc (+0/-38)
src/Ubuntu/Components/ComponentModule.pro (+0/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+9/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml (+4/-2)
src/Ubuntu/Components/plugin/plugin.cpp (+3/-1)
src/Ubuntu/Components/plugin/plugin.pri (+1/-4)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp (+10/-7)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h (+3/-1)
src/Ubuntu/Components/plugin/quickutils.cpp (+2/-1)
src/Ubuntu/Components/plugin/quickutils.h (+7/-0)
src/Ubuntu/Components/plugin/ucaction.cpp (+114/-16)
src/Ubuntu/Components/plugin/ucaction.h (+8/-1)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+1/-1)
src/Ubuntu/Components/plugin/ucbottomedgehint.cpp (+1/-1)
src/Ubuntu/Components/plugin/ucfontutils.h (+6/-6)
src/Ubuntu/Components/plugin/uclistitemlayout.cpp (+80/-4)
src/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+11/-5)
src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+3/-1)
src/Ubuntu/Components/qmldir (+1/-1)
src/Ubuntu/Test/plugin/plugin.pri (+2/-1)
src/Ubuntu/Test/plugin/uctestextras.cpp (+18/-0)
src/Ubuntu/Test/plugin/uctestextras.h (+2/-0)
src/Ubuntu/UbuntuGestures/UbuntuGestures.pro (+6/-0)
src/Ubuntu/UbuntuGestures/damper.cpp (+1/-1)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+58/-13)
src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+7/-3)
src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+8/-6)
tests/api/Extinct/Animals/AnimalModule.pro (+1/-1)
tests/api/Extinct/Animals/plugin/plugin.cpp (+2/-0)
tests/api/Extinct/Animals/plugin/plugin.pri (+2/-0)
tests/api/Extinct/Animals/plugin/tarpan.cpp (+59/-0)
tests/api/Extinct/Animals/plugin/tarpan.h (+46/-0)
tests/api/Extinct/Animals/qmldir (+1/-1)
tests/api/components.api (+11/-8)
tests/autopilot/ubuntuuitoolkit/__init__.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+3/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py (+4/-0)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py (+1/-1)
tests/uitk_test_plan.sh (+1/-0)
tests/unit/plugin_dependency.pri (+1/-1)
tests/unit/runtest.sh (+1/-1)
tests/unit/tst_components/tst_fontutils.qml (+13/-14)
tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp (+1/-1)
tests/unit_x11/tst_bottomedge/tst_bottomedge.pro (+1/-1)
tests/unit_x11/tst_components/battery-100-charging.svg (+25/-0)
tests/unit_x11/tst_components/shape.svg (+77/-0)
tests/unit_x11/tst_components/tst_imageprovider.qml (+29/-4)
tests/unit_x11/tst_components/tst_pagestack.qml (+6/-0)
tests/unit_x11/tst_components/tst_scrollbar.qml (+67/-25)
tests/unit_x11/tst_components/tst_shortcuts.qml (+58/-0)
tests/unit_x11/tst_components/tst_slotslayout.qml (+47/-2)
tests/unit_x11/tst_components/tst_ubuntulistview13.qml (+105/-0)
tests/unit_x11/tst_swipearea/tst_swipearea.cpp (+2/-2)
tests/unit_x11/tst_swipearea/tst_swipearea.pro (+1/-1)
Related bugs
Bug #1527387: SwipeArea: Support watching a swipe without owning its events | Medium | Fix Released |
Related blueprints
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-ui-toolkit