lp:~bzoltan/ubuntu-ui-toolkit/DONOTLANDIT
- Get this branch:
- bzr branch lp:~bzoltan/ubuntu-ui-toolkit/DONOTLANDIT
Branch merges
- PS Jenkins bot: Approve (continuous-integration)
- Ubuntu SDK team: Pending requested
-
Diff: 13 lines (+6/-0)1 file modifieddebian/changelog (+6/-0)
- Ubuntu SDK team: Pending requested
-
Diff: 20164 lines (+11670/-2792) (has conflicts)276 files modified.bazaar/Makefile (+0/-3)
.bzrignore (+1/-0)
components.api (+70/-7)
debian/changelog (+238/-0)
debian/control (+7/-1)
documentation/docs.sh (+1/-1)
documentation/overview.qdoc (+5/-0)
examples/customtheme/customtheme.apparmor (+8/-0)
examples/customtheme/customtheme.desktop (+8/-0)
examples/customtheme/customtheme.qmlproject (+59/-0)
examples/customtheme/main.qml (+103/-0)
examples/customtheme/manifest.json (+15/-0)
examples/customtheme/theme/Palette.qml (+24/-0)
examples/customtheme/theme/parent_theme (+1/-0)
examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+30/-0)
examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+144/-0)
examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+5/-0)
examples/ubuntu-ui-toolkit-gallery/po/es.po (+412/-0)
examples/ubuntu-ui-toolkit-gallery/po/ubuntu-ui-toolkit-gallery.pot (+391/-249)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop (+1/-1)
modules/Ubuntu/Components/AbstractButton.qml (+1/-3)
modules/Ubuntu/Components/ActivityIndicator.qml (+0/-3)
modules/Ubuntu/Components/AnimatedItem.qml (+0/-1)
modules/Ubuntu/Components/AppHeader.qml (+10/-2)
modules/Ubuntu/Components/CheckBox.qml (+0/-3)
modules/Ubuntu/Components/InputHandler.qml (+7/-7)
modules/Ubuntu/Components/ListItems/Base.qml (+0/-4)
modules/Ubuntu/Components/ListItems/Caption.qml (+0/-2)
modules/Ubuntu/Components/ListItems/Divider.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Empty.qml (+0/-12)
modules/Ubuntu/Components/ListItems/Expandable.qml (+0/-2)
modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml (+0/-5)
modules/Ubuntu/Components/ListItems/Header.qml (+0/-2)
modules/Ubuntu/Components/ListItems/ItemSelector.qml (+0/-8)
modules/Ubuntu/Components/ListItems/MultiValue.qml (+0/-2)
modules/Ubuntu/Components/ListItems/SingleControl.qml (+1/-4)
modules/Ubuntu/Components/ListItems/SingleValue.qml (+0/-5)
modules/Ubuntu/Components/ListItems/Standard.qml (+2/-22)
modules/Ubuntu/Components/ListItems/Subtitled.qml (+0/-2)
modules/Ubuntu/Components/ListItems/ThinDivider.qml (+0/-1)
modules/Ubuntu/Components/ListItems/ValueSelector.qml (+1/-10)
modules/Ubuntu/Components/MainView.qml (+18/-3)
modules/Ubuntu/Components/OptionSelector.qml (+0/-8)
modules/Ubuntu/Components/OptionSelectorDelegate.qml (+0/-8)
modules/Ubuntu/Components/OrientationHelper.qml (+61/-102)
modules/Ubuntu/Components/Page.qdoc (+1/-1)
modules/Ubuntu/Components/PageHeadConfiguration.qml (+16/-1)
modules/Ubuntu/Components/PageStack.qml (+0/-5)
modules/Ubuntu/Components/PageWrapper.qml (+0/-6)
modules/Ubuntu/Components/Pickers/DatePicker.qml (+3/-3)
modules/Ubuntu/Components/Popups/ComposerSheet.qml (+0/-2)
modules/Ubuntu/Components/Popups/DefaultSheet.qml (+0/-4)
modules/Ubuntu/Components/Popups/Dialog.qml (+0/-4)
modules/Ubuntu/Components/Popups/Popover.qml (+0/-2)
modules/Ubuntu/Components/Popups/PopupBase.qml (+14/-5)
modules/Ubuntu/Components/Popups/SheetBase.qml (+0/-3)
modules/Ubuntu/Components/ProgressBar10.qml (+0/-6)
modules/Ubuntu/Components/Scrollbar.qml (+0/-2)
modules/Ubuntu/Components/Slider.qml (+0/-8)
modules/Ubuntu/Components/Styles/PageHeadStyle.qml (+6/-2)
modules/Ubuntu/Components/Switch.qml (+0/-2)
modules/Ubuntu/Components/Tab.qml (+0/-1)
modules/Ubuntu/Components/Tabs.qml (+0/-2)
modules/Ubuntu/Components/TextArea.qml (+2/-3)
modules/Ubuntu/Components/TextCursor.qml (+3/-3)
modules/Ubuntu/Components/TextField.qml (+2/-4)
modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml (+12/-5)
modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml (+122/-90)
modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml (+53/-0)
modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+188/-0)
modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml (+36/-0)
modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+0/-17)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+97/-38)
modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+3/-3)
modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml (+12/-7)
modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml (+5/-2)
modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml (+132/-43)
modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+2/-0)
modules/Ubuntu/Components/Themes/Ambiance/qmldir (+9/-2)
modules/Ubuntu/Components/Themes/SuruDark/ListItemOptionSelectorStyle.qml (+0/-23)
modules/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml (+0/-27)
modules/Ubuntu/Components/Toolbar.qml (+0/-1)
modules/Ubuntu/Components/ToolbarItems.qml (+3/-0)
modules/Ubuntu/Components/UbuntuListView.qml (+0/-3)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+540/-478)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+115/-33)
modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp (+226/-0)
modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h (+55/-0)
modules/Ubuntu/Components/plugin/alarmmanager_p.cpp (+36/-19)
modules/Ubuntu/Components/plugin/alarmmanager_p.h (+55/-107)
modules/Ubuntu/Components/plugin/alarmmanager_p_p.h (+13/-6)
modules/Ubuntu/Components/plugin/alarmrequest_p.cpp (+0/-84)
modules/Ubuntu/Components/plugin/alarmrequest_p.h (+0/-64)
modules/Ubuntu/Components/plugin/alarmrequest_p_p.h (+0/-50)
modules/Ubuntu/Components/plugin/i18n.cpp (+26/-0)
modules/Ubuntu/Components/plugin/i18n.h (+2/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+13/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+14/-5)
modules/Ubuntu/Components/plugin/propertychange_p.cpp (+76/-0)
modules/Ubuntu/Components/plugin/propertychange_p.h (+39/-0)
modules/Ubuntu/Components/plugin/quickutils.cpp (+27/-1)
modules/Ubuntu/Components/plugin/quickutils.h (+2/-0)
modules/Ubuntu/Components/plugin/shapeitem.cpp (+9/-5)
modules/Ubuntu/Components/plugin/sortfiltermodel.cpp (+2/-0)
modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp (+1/-1)
modules/Ubuntu/Components/plugin/ucaction.cpp (+2/-2)
modules/Ubuntu/Components/plugin/ucaction.h (+2/-0)
modules/Ubuntu/Components/plugin/ucalarm.cpp (+128/-173)
modules/Ubuntu/Components/plugin/ucalarm.h (+6/-2)
modules/Ubuntu/Components/plugin/ucalarm_p.h (+28/-8)
modules/Ubuntu/Components/plugin/ucalarmmodel.cpp (+122/-86)
modules/Ubuntu/Components/plugin/ucalarmmodel.h (+19/-10)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+1324/-0)
modules/Ubuntu/Components/plugin/uclistitem.h (+126/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+203/-0)
modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+541/-0)
modules/Ubuntu/Components/plugin/uclistitemactions.h (+113/-0)
modules/Ubuntu/Components/plugin/uclistitemactions_p.h (+61/-0)
modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+247/-0)
modules/Ubuntu/Components/plugin/uclistitemattached.cpp (+207/-0)
modules/Ubuntu/Components/plugin/uclistitemstyle.cpp (+70/-0)
modules/Ubuntu/Components/plugin/uclistitemstyle.h (+53/-0)
modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+3/-1)
modules/Ubuntu/Components/plugin/ucqquickimageextension.h (+2/-2)
modules/Ubuntu/Components/plugin/ucserviceproperties.cpp (+317/-0)
modules/Ubuntu/Components/plugin/ucserviceproperties.h (+83/-0)
modules/Ubuntu/Components/plugin/ucserviceproperties_p.h (+53/-0)
modules/Ubuntu/Components/plugin/ucstyleditembase.cpp (+2/-4)
modules/Ubuntu/Components/plugin/uctheme.cpp (+12/-5)
modules/Ubuntu/Components/plugin/uctheme.h (+1/-1)
modules/Ubuntu/Components/plugin/ucthemesettings.cpp (+7/-0)
modules/Ubuntu/Layouts/plugin/ullayouts.cpp (+1/-1)
modules/Ubuntu/Test/UbuntuTestCase.qml (+74/-78)
modules/Ubuntu/Test/plugin/uctestcase.cpp (+14/-2)
modules/Ubuntu/Test/plugin/uctestcase.h (+2/-0)
po/am.po (+2/-2)
po/ar.po (+2/-2)
po/ast.po (+2/-2)
po/az.po (+2/-2)
po/be.po (+2/-2)
po/bs.po (+2/-2)
po/ca.po (+2/-2)
po/ca@valencia.po (+140/-0)
po/ce.po (+2/-2)
po/cs.po (+2/-2)
po/da.po (+2/-2)
po/de.po (+4/-4)
po/el.po (+143/-0)
po/en_AU.po (+2/-2)
po/en_GB.po (+4/-4)
po/es.po (+6/-6)
po/eu.po (+2/-2)
po/fa.po (+144/-0)
po/fi.po (+6/-6)
po/fr.po (+2/-2)
po/fr_CA.po (+2/-2)
po/ga.po (+140/-0)
po/gd.po (+2/-2)
po/gl.po (+2/-2)
po/he.po (+2/-2)
po/hr.po (+140/-0)
po/hu.po (+2/-2)
po/id.po (+4/-4)
po/it.po (+2/-2)
po/ja.po (+4/-4)
po/km.po (+4/-4)
po/kn.po (+2/-2)
po/ko.po (+2/-2)
po/lv.po (+2/-2)
po/ms.po (+2/-2)
po/my.po (+2/-2)
po/nb.po (+2/-2)
po/nl.po (+2/-2)
po/oc.po (+14/-10)
po/pa.po (+2/-2)
po/pl.po (+2/-2)
po/pt.po (+2/-2)
po/pt_BR.po (+2/-2)
po/ro.po (+2/-2)
po/ru.po (+4/-4)
po/sq.po (+2/-2)
po/sr.po (+142/-0)
po/sv.po (+4/-4)
po/tr.po (+2/-2)
po/ug.po (+6/-6)
po/uk.po (+2/-2)
po/zh_CN.po (+2/-2)
po/zh_TW.po (+2/-2)
push_to_phone.sh (+40/-18)
tests/autopilot/ubuntuuitoolkit/__init__.py (+4/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+10/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py (+11/-9)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+7/-7)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py (+88/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py (+42/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+4/-0)
tests/autopilot/ubuntuuitoolkit/emulators.py (+4/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+11/-10)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml (+69/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py (+43/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py (+53/-3)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HideShowTestCase.qml (+44/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+28/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListItemTestCase.qml (+68/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py (+86/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml (+66/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py (+65/-16)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py (+3/-2)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py (+55/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml (+46/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.touch.qml (+36/-0)
tests/launcher/launcher.cpp (+19/-3)
tests/qmlapicheck.sh (+4/-5)
tests/resources/alarm/AlarmDays.qml (+15/-24)
tests/resources/alarm/Alarms.qml (+174/-148)
tests/resources/header/header.qml (+66/-2)
tests/resources/listitems/Dividers.qml (+46/-0)
tests/resources/listitems/ListItemTest.qml (+210/-0)
tests/tests.pro (+4/-0)
tests/uitk_test_plan.sh (+24/-11)
tests/unit/add_qmlmakecheck.pri (+0/-3)
tests/unit/runtest.sh (+9/-30)
tests/unit/tst_alarms/tst_alarms.cpp (+130/-167)
tests/unit/tst_arguments/tst_arguments.cpp (+71/-32)
tests/unit/tst_components/tst_CrossFadeImage.qml (+0/-3)
tests/unit/tst_components/tst_action.qml (+13/-2)
tests/unit/tst_components/tst_checkbox.qml (+1/-1)
tests/unit/tst_components/tst_label.qml (+34/-35)
tests/unit/tst_components/tst_listitems_base.qml (+2/-5)
tests/unit/tst_components/tst_listitems_valueselector.qml (+2/-5)
tests/unit/tst_i18n/po/en_US.po (+8/-0)
tests/unit/tst_i18n/src/LocalizedApp.qml (+15/-0)
tests/unit/tst_i18n/src/tst_i18n.cpp (+24/-4)
tests/unit/tst_performance/ButtonStyleGrid.qml (+3/-1)
tests/unit/tst_performance/ItemList.qml (+30/-0)
tests/unit/tst_performance/ListItemList.qml (+30/-0)
tests/unit/tst_performance/ListItemWithActionsList.qml (+43/-0)
tests/unit/tst_performance/ListItemWithInlineActionsList.qml (+41/-0)
tests/unit/tst_performance/ListItemsBaseList.qml (+29/-0)
tests/unit/tst_performance/ListItemsEmptyList.qml (+29/-0)
tests/unit/tst_performance/SliderStyleGrid.qml (+5/-1)
tests/unit/tst_performance/tst_performance.cpp (+7/-8)
tests/unit/tst_performance/tst_performance.pro (+7/-1)
tests/unit/tst_quickutils/tst_quickutils.cpp (+60/-0)
tests/unit/tst_quickutils/tst_quickutils.pro (+2/-0)
tests/unit/unit.pro (+2/-1)
tests/unit_x11/tst_components/tst_alarms.qml (+44/-25)
tests/unit_x11/tst_components/tst_datepicker.qml (+5/-0)
tests/unit_x11/tst_components/tst_focus.qml (+2/-1)
tests/unit_x11/tst_components/tst_imageprovider.qml (+69/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+607/-0)
tests/unit_x11/tst_components/tst_listitems_itemselector.qml (+4/-1)
tests/unit_x11/tst_components/tst_listitems_standard.qml (+3/-8)
tests/unit_x11/tst_components/tst_optionselector.qml (+4/-1)
tests/unit_x11/tst_components/tst_picker.qml (+1/-1)
tests/unit_x11/tst_components/tst_pickerpanel.qml (+4/-0)
tests/unit_x11/tst_components/tst_textarea.qml (+5/-1)
tests/unit_x11/tst_components/tst_textarea_in_flickable.qml (+0/-2)
tests/unit_x11/tst_components/tst_textfield.qml (+2/-1)
tests/unit_x11/tst_components/tst_theming.qml (+60/-0)
tests/unit_x11/tst_layouts/tst_layouts.cpp (+17/-0)
tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp (+3/-0)
tests/unit_x11/tst_serviceproperties/IncomingCallVibrateWatcher.qml (+31/-0)
tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher.qml (+31/-0)
tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher2.qml (+32/-0)
tests/unit_x11/tst_serviceproperties/tst_serviceproperties.cpp (+146/-0)
tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro (+8/-0)
tests/unit_x11/tst_statesaver/NormalAppClose.qml (+4/-1)
tests/unit_x11/tst_statesaver/SimpleApp.qml (+2/-0)
tests/unit_x11/tst_statesaver/tst_statesaver.cpp (+19/-20)
tests/unit_x11/tst_theme_engine/AppTheme/Palette.qml (+24/-0)
tests/unit_x11/tst_theme_engine/AppTheme/parent_theme (+1/-0)
tests/unit_x11/tst_theme_engine/TestApp.qml (+29/-0)
tests/unit_x11/tst_theme_engine/tst_theme_engine.pro (+3/-1)
tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp (+66/-1)
Branch information
Recent revisions
- 1376. By Tim Peeters
-
Add a preview of the new list items to the UITK component gallery.
Approved by PS Jenkins bot, Zsombor Egri.
- 1375. By Zoltan Balogh
-
Update the test plan and fix the PPA string in case it contains backslash.
Approved by Tim Peeters, PS Jenkins bot.
- 1374. By Zsombor Egri
-
ListItem highlight is driven also by the connection of a slot to the clicked() signal. This will also be applied when pressAndHold signal will be introduced. Fixes: https:/
/bugs.launchpad .net/bugs/ 1399025. Approved by Tim Peeters, PS Jenkins bot.
- 1373. By Giulio Collura
-
This is a bugfix for bug #1341814 and bug #1400297. Essentially we have to force the removal of the previous 'contents' item by removing its parent. This way we ensure that the contents are correctly hidden, focused and removed, without destroying them.
Approved by PS Jenkins bot, Tim Peeters.
- 1372. By Zoltan Balogh
-
Added Dialog CPO to test if OSK pushes up the the dialog.
Approved by PS Jenkins bot, Zsombor Egri.
- 1370. By Zoltan Balogh
-
fixing gles dependency for ubuntu-
ui-toolkit- autopilot, so we can have functional tests on x86 emulator
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