lp://staging/~kalikiana/ubuntu-ui-toolkit/appsettings
Created by
Cris Dywan
and last modified
- Get this branch:
- bzr branch lp://staging/~kalikiana/ubuntu-ui-toolkit/appsettings
Only
Cris Dywan
can upload to this branch. If you are
Cris Dywan
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp://staging/ubuntu-ui-toolkit/staging
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Zsombor Egri: Approve
-
Diff: 1104 lines (+938/-8)15 files modifiedcomponents.api (+11/-0)
debian/control (+2/-0)
documentation/overview.qdoc (+2/-0)
documentation/settings.qdoc (+252/-0)
examples/ubuntu-ui-toolkit-gallery/AppSettings.qml (+112/-0)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+4/-0)
modules/Ubuntu/Components/CheckBox.qml (+11/-2)
modules/Ubuntu/Components/Option.qml (+141/-0)
modules/Ubuntu/Components/OptionSelector.qml (+1/-1)
modules/Ubuntu/Components/Settings.qml (+85/-0)
modules/Ubuntu/Components/TextField.qml (+10/-5)
modules/Ubuntu/Components/qmldir (+2/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+1/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_settings.py (+52/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_settings.py (+252/-0)
Superseded
for merging
into
lp://staging/ubuntu-ui-toolkit
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Zsombor Egri: Needs Fixing
-
Diff: 3194 lines (+1869/-290)43 files modifiedCHANGES (+1/-0)
components.api (+20/-1)
debian/control (+2/-0)
documentation/overview.qdoc (+2/-0)
documentation/settings.qdoc (+172/-0)
examples/ubuntu-ui-toolkit-gallery/AppSettings.qml (+112/-0)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+4/-0)
modules/Ubuntu/Components/CheckBox.qml (+11/-2)
modules/Ubuntu/Components/Option.qml (+139/-0)
modules/Ubuntu/Components/OptionSelector.qml (+1/-1)
modules/Ubuntu/Components/Settings.qml (+81/-0)
modules/Ubuntu/Components/Tab.qml (+0/-7)
modules/Ubuntu/Components/Tabs.qml (+292/-20)
modules/Ubuntu/Components/TextField.qml (+2/-0)
modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+9/-2)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+56/-23)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+2/-0)
modules/Ubuntu/Components/plugin/alarmmanager_p.h (+2/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+0/-5)
modules/Ubuntu/Components/plugin/quickutils.cpp (+15/-0)
modules/Ubuntu/Components/plugin/quickutils.h (+1/-0)
modules/Ubuntu/Components/plugin/ucalarm.cpp (+33/-27)
modules/Ubuntu/Components/plugin/ucalarm_p.h (+1/-1)
modules/Ubuntu/Components/qmldir (+2/-0)
modules/Ubuntu/Test/UbuntuTestCase.qml (+69/-1)
modules/Ubuntu/Test/deployment.pri (+6/-1)
modules/Ubuntu/Test/plugin/uctestcase.cpp (+12/-0)
modules/Ubuntu/Test/plugin/uctestcase.h (+1/-1)
tests/autopilot/ubuntuuitoolkit/emulators.py (+23/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+197/-0)
tests/resources/alarm/Alarms.qml (+6/-2)
tests/resources/navigation/Tabs.qml (+90/-1)
tests/unit/runtest.sh (+1/-2)
tests/unit/tst_alarms/tst_alarms.cpp (+171/-20)
tests/unit/tst_mainview/tst_mainview.cpp (+3/-6)
tests/unit/tst_page/tst_page.cpp (+3/-39)
tests/unit_x11/tst_components/ExternalTab.qml (+21/-0)
tests/unit_x11/tst_components/tst_tabs.qml (+151/-0)
tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp (+11/-29)
tests/unit_x11/tst_orientation/tst_orientation.cpp (+9/-47)
tests/unit_x11/tst_statesaver/tst_statesaver.cpp (+29/-37)
tests/unit_x11/tst_test/tst_ubuntutestcase.qml (+103/-15)
tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp (+3/-0)
Related bugs
Bug #1276171: Implement app settings API | Critical | Fix Released |
Related blueprints
SDK: Application Settings
(High)
Storage APIs in the Ubuntu SDK
(Undefined)
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://staging/ubuntu-ui-toolkit