lp:~gerboland/ubuntu-ui-toolkit/ubuntu-shape-release
Created by
Gerry Boland
and last modified
- Get this branch:
- bzr branch lp:~gerboland/ubuntu-ui-toolkit/ubuntu-shape-release
Only
Gerry Boland
can upload to this branch. If you are
Gerry Boland
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Ubuntu SDK team: Pending requested
-
Diff: 18150 lines (+11207/-1764)230 files modifiedapicheck/apicheck.pro (+1/-1)
components.api (+70/-2)
debian/control (+31/-12)
debian/libubuntugestures5-dev.install (+29/-22)
debian/libubuntutoolkit5-dev.install (+13/-0)
debian/libubuntutoolkit5.install (+1/-0)
debian/rules (+1/-1)
documentation/statesaving.qdoc (+1/-1)
documentation/ubuntu-components.qdoc (+1/-1)
documentation/ubuntu-theming.qdoc (+0/-6)
documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1)
examples/ubuntu-ui-toolkit-gallery/About.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Colors.qml (+39/-9)
examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml (+1/-0)
examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Template.qml (+2/-0)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+87/-96)
examples/ubuntu-ui-toolkit-gallery/manifest.json.in (+15/-0)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery-click.pro (+36/-0)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.apparmor (+9/-0)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop (+4/-4)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro (+1/-1)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+1/-1)
export_modules_dir.sh (+1/-1)
gallery.sh (+3/-2)
src/Ubuntu/Components/1.2/MainViewBase.qml (+1/-1)
src/Ubuntu/Components/1.2/Panel.qml (+1/-1)
src/Ubuntu/Components/1.2/colorUtils.js (+0/-25)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+5/-3)
src/Ubuntu/Components/1.3/AppHeader.qml (+5/-0)
src/Ubuntu/Components/1.3/Icon.qdoc (+0/-87)
src/Ubuntu/Components/1.3/Icon.qml (+150/-0)
src/Ubuntu/Components/1.3/MainView.qml (+14/-22)
src/Ubuntu/Components/1.3/MainViewBase.qml (+0/-173)
src/Ubuntu/Components/1.3/OptionSelector.qml (+2/-1)
src/Ubuntu/Components/1.3/Page.qml (+19/-4)
src/Ubuntu/Components/1.3/PageHeadConfiguration.qml (+2/-2)
src/Ubuntu/Components/1.3/PageHeader.qml (+1/-1)
src/Ubuntu/Components/1.3/Panel.qml (+1/-1)
src/Ubuntu/Components/1.3/TextArea.qml (+1/-2)
src/Ubuntu/Components/1.3/TextField.qml (+16/-11)
src/Ubuntu/Components/1.3/Toolbar.qml (+1/-1)
src/Ubuntu/Components/1.3/UbuntuColors.qml (+66/-17)
src/Ubuntu/Components/1.3/colorUtils.js (+0/-37)
src/Ubuntu/Components/ComponentModule.pro (+2/-3)
src/Ubuntu/Components/ListItems/1.3/Empty.qml (+3/-1)
src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml (+9/-2)
src/Ubuntu/Components/ListItems/1.3/Standard.qml (+2/-2)
src/Ubuntu/Components/Popups/1.3/Dialog.qml (+11/-4)
src/Ubuntu/Components/Popups/1.3/Popover.qml (+8/-0)
src/Ubuntu/Components/Themes/1.3/Palette.qml (+21/-1)
src/Ubuntu/Components/Themes/1.3/PaletteValues.qml (+89/-3)
src/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml (+7/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml (+49/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml (+27/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml (+14/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml (+10/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+5/-36)
src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+14/-12)
src/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml (+13/-11)
src/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml (+14/-21)
src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml (+8/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+11/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml (+7/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+21/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+4/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+20/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+3/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+37/-21)
src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+4/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/PopoverForegroundStyle.qml (+4/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml (+12/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+10/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+8/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml (+9/-9)
src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml (+26/-156)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+13/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+11/-7)
src/Ubuntu/Components/Themes/Ambiance/1.3/colorUtils.js (+0/-36)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+2/-0)
src/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml (+0/-25)
src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml (+0/-26)
src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+38/-21)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml (+49/-0)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml (+29/-0)
src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+2/-2)
src/Ubuntu/Components/Themes/SuruDark/qmldir (+1/-0)
src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp (+73/-63)
src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h (+8/-7)
src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp (+2/-2)
src/Ubuntu/Components/plugin/i18n.cpp (+7/-0)
src/Ubuntu/Components/plugin/i18n.h (+8/-4)
src/Ubuntu/Components/plugin/inversemouseareatype.cpp (+3/-3)
src/Ubuntu/Components/plugin/plugin.cpp (+73/-87)
src/Ubuntu/Components/plugin/plugin.h (+1/-0)
src/Ubuntu/Components/plugin/plugin.pri (+13/-5)
src/Ubuntu/Components/plugin/plugin.qrc (+2/-0)
src/Ubuntu/Components/plugin/privates/frame.cpp (+469/-0)
src/Ubuntu/Components/plugin/privates/frame.h (+101/-0)
src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp (+2/-3)
src/Ubuntu/Components/plugin/privates/shaders/frame.frag (+33/-0)
src/Ubuntu/Components/plugin/privates/shaders/frame.vert (+34/-0)
src/Ubuntu/Components/plugin/privates/textures.h (+5483/-0)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp (+30/-10)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h (+7/-1)
src/Ubuntu/Components/plugin/quickutils.cpp (+8/-1)
src/Ubuntu/Components/plugin/quickutils.h (+9/-3)
src/Ubuntu/Components/plugin/statesaverbackend_p.cpp (+10/-7)
src/Ubuntu/Components/plugin/statesaverbackend_p.h (+10/-3)
src/Ubuntu/Components/plugin/ucabstractbutton.cpp (+0/-1)
src/Ubuntu/Components/plugin/ucaction.cpp (+67/-11)
src/Ubuntu/Components/plugin/ucaction.h (+18/-0)
src/Ubuntu/Components/plugin/ucactioncontext.cpp (+138/-9)
src/Ubuntu/Components/plugin/ucactioncontext.h (+45/-3)
src/Ubuntu/Components/plugin/ucactionitem.cpp (+3/-1)
src/Ubuntu/Components/plugin/ucalarm.cpp (+4/-4)
src/Ubuntu/Components/plugin/ucapplication.cpp (+6/-0)
src/Ubuntu/Components/plugin/ucapplication.h (+8/-4)
src/Ubuntu/Components/plugin/ucarguments.cpp (+4/-4)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+7/-3)
src/Ubuntu/Components/plugin/ucbottomedge_p.h (+0/-1)
src/Ubuntu/Components/plugin/ucbottomedgehint.cpp (+8/-8)
src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+29/-16)
src/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+5/-7)
src/Ubuntu/Components/plugin/ucfontutils.cpp (+3/-1)
src/Ubuntu/Components/plugin/ucfontutils.h (+11/-3)
src/Ubuntu/Components/plugin/uclabel.cpp (+47/-7)
src/Ubuntu/Components/plugin/uclabel.h (+11/-0)
src/Ubuntu/Components/plugin/uclistitem.cpp (+41/-28)
src/Ubuntu/Components/plugin/uclistitem_p.h (+1/-1)
src/Ubuntu/Components/plugin/uclistitemlayout.cpp (+80/-4)
src/Ubuntu/Components/plugin/uclistitemstyle.cpp (+2/-2)
src/Ubuntu/Components/plugin/ucmainviewbase.cpp (+328/-0)
src/Ubuntu/Components/plugin/ucmainviewbase.h (+84/-0)
src/Ubuntu/Components/plugin/ucmainviewbase_p.h (+57/-0)
src/Ubuntu/Components/plugin/ucmathutils.cpp (+0/-8)
src/Ubuntu/Components/plugin/ucmathutils.h (+0/-2)
src/Ubuntu/Components/plugin/ucmousefilters.cpp (+2/-3)
src/Ubuntu/Components/plugin/ucpagetreenode.cpp (+1/-1)
src/Ubuntu/Components/plugin/ucperformancemonitor.cpp (+128/-0)
src/Ubuntu/Components/plugin/ucperformancemonitor.h (+54/-0)
src/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+2/-2)
src/Ubuntu/Components/plugin/ucserviceproperties.cpp (+2/-3)
src/Ubuntu/Components/plugin/ucslotslayout.cpp (+17/-17)
src/Ubuntu/Components/plugin/ucstatesaver.cpp (+18/-14)
src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+3/-2)
src/Ubuntu/Components/plugin/uctheme.cpp (+78/-65)
src/Ubuntu/Components/plugin/uctheme.h (+6/-12)
src/Ubuntu/Components/plugin/ucthemingextension.cpp (+32/-8)
src/Ubuntu/Components/plugin/ucthemingextension.h (+3/-3)
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+31/-7)
src/Ubuntu/Components/plugin/ucubuntushape.h (+1/-0)
src/Ubuntu/Components/plugin/ucunits.cpp (+10/-0)
src/Ubuntu/Components/plugin/ucunits.h (+9/-3)
src/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+2/-2)
src/Ubuntu/Components/qmldir (+2/-3)
src/Ubuntu/Components/tools/privates/createprivateshapetextures.cpp (+125/-0)
src/Ubuntu/Components/tools/privates/privates.pro (+5/-0)
src/Ubuntu/UbuntuGestures/UbuntuGestures.pro (+3/-2)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+7/-4)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+20/-0)
src/Ubuntu/UbuntuToolkit/colorutils.cpp (+30/-0)
src/Ubuntu/UbuntuToolkit/colorutils.h (+34/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h (+29/-0)
src/src.pro (+5/-2)
sync.profile (+6/-3)
tests/Gallery/gallery (+1/-1)
tests/Gallery/gallery-logging.config (+3/-0)
tests/api/api.pro (+1/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py (+103/-16)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py (+34/-5)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py (+76/-3)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py (+138/-16)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.py (+308/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listview.QQuickListViewTestCase.Uitk10.vertical.qml (+57/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listview.QQuickListViewTestCase.Uitk13.horizontal.qml (+64/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listview.QQuickListViewTestCase.Uitk13.vertical.qml (+62/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py (+84/-84)
tests/checkresults.sh (+17/-10)
tests/resources/ubuntushape/FrameTest.qml (+71/-0)
tests/tests.pro (+2/-2)
tests/uitk_test_plan.sh (+1/-0)
tests/unit/runtest.sh (+1/-0)
tests/unit/tst_components/tst_action.qml (+14/-6)
tests/unit/tst_components/tst_label13.qml (+64/-0)
tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/LocalizedApp.qml (+1/-1)
tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/tst_i18n_LocalizedApp.cpp (+6/-2)
tests/unit/tst_i18n/tst_i18n_RelativeTime/src/tst_i18n_RelativeTime.cpp (+6/-2)
tests/unit/tst_mainview/Settings.qml (+1/-1)
tests/unit/tst_mainview/tst_mainview.cpp (+8/-6)
tests/unit/tst_quickutils/tst_quickutils.cpp (+1/-1)
tests/unit/tst_units/dpr1/tst_units.cpp (+5/-5)
tests/unit_x11/tst_animator/tst_animator.cpp (+9/-1)
tests/unit_x11/tst_animator/tst_animator.qml (+1/-1)
tests/unit_x11/tst_animator/tst_animator13.qml (+36/-0)
tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml (+1/-1)
tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp (+16/-8)
tests/unit_x11/tst_components/AppTheme/Palette.qml (+1/-1)
tests/unit_x11/tst_components/MockKeyboard.qml (+1/-1)
tests/unit_x11/tst_components/tst_adaptivepagelayout.qml (+3/-0)
tests/unit_x11/tst_components/tst_contextual_actions.qml (+326/-0)
tests/unit_x11/tst_components/tst_focus.qml (+35/-1)
tests/unit_x11/tst_components/tst_icon.qml (+6/-3)
tests/unit_x11/tst_components/tst_listitem.qml (+3/-5)
tests/unit_x11/tst_components/tst_listitem13.qml (+3/-5)
tests/unit_x11/tst_components/tst_pagehead_visible.qml (+8/-0)
tests/unit_x11/tst_components/tst_pagestack.qml (+6/-0)
tests/unit_x11/tst_components/tst_shortcuts.qml (+32/-8)
tests/unit_x11/tst_components/tst_slotslayout.qml (+54/-2)
tests/unit_x11/tst_components/tst_tabs_with_repeater.DEPRECATED_TOOLBAR.qml (+4/-0)
tests/unit_x11/tst_components/tst_textinput_common13.qml (+2/-2)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+24/-16)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+1/-1)
tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml (+2/-2)
tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTop.qml (+2/-2)
tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp (+1/-1)
tests/unit_x11/tst_layouts/tst_layouts.cpp (+20/-20)
tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp (+2/-2)
tests/unit_x11/tst_statesaver/tst_statesaver.cpp (+22/-10)
tests/unit_x11/tst_subtheming/DefaultTheme.qml (+28/-0)
tests/unit_x11/tst_subtheming/themes/BuggyTheme/Palette.qml (+25/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+71/-6)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+3/-0)
Related source package recipes
Branch information
Recent revisions
- 1837. By Gerry Boland
-
Make UbuntuShape delete its textures by appending post-sync render job when Qt calls releaseResources
On context destruction is too late, as Qt SG unsets the current context before context destruction.
- 1836. By Benjamin Zeller
-
- Add Ubuntu toolkit shared library
- Move ColorUtils to UbuntuToolkit.Approved by ubuntu-
sdk-build- bot, Zsombor Egri. - 1835. By Robert Ancell
-
Use new QML package name for qml-module-
qtfeedback, drop old QML package names. Approved by ubuntu-
sdk-build- bot, Timo Jyrinki, PS Jenkins bot. - 1834. By Benjamin Zeller
-
Fix Bug lp:1540642 "When closing a QML app, there are a bunch of invalid disconnects". Fixes: https:/
/bugs.launchpad .net/bugs/ 1540642. Approved by ubuntu-
sdk-build- bot, Tim Peeters. - 1833. By Timo Jyrinki
-
Add s390x to the unit test skipping architectures.
Approved by ubuntu-
sdk-build- bot, Christian Dywan.
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
