lp:~unity-team/unity8/scope-settings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 1214

PS Jenkins bot (community): Approve (continuous-integration) on 2014-08-27

Michał Sawicz: Approve on 2014-08-27

Diff: 1676 lines (+1093/-74)

28 files modified

qml/Dash/Dash.qml (+1/-1)
qml/Dash/DashContent.qml (+4/-4)
qml/Dash/GenericScopeView.qml (+67/-26)
qml/Dash/PageHeader.qml (+9/-3)
qml/Dash/PreviewListView.qml (+11/-1)
qml/Dash/ScopeSettings/ScopeSetting.qml (+37/-0)
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml (+61/-0)
qml/Dash/ScopeSettings/ScopeSettingList.qml (+50/-0)
qml/Dash/ScopeSettings/ScopeSettingNumber.qml (+21/-0)
qml/Dash/ScopeSettings/ScopeSettingString.qml (+83/-0)
qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml (+57/-0)
qml/Dash/ScopeSettingsPage.qml (+62/-0)
qml/Dash/ScopesOverview.qml (+2/-0)
tests/autopilot/unity8/shell/emulators/dash.py (+5/-5)
tests/mocks/Unity/CMakeLists.txt (+2/-0)
tests/mocks/Unity/fake_scope.cpp (+3/-1)
tests/mocks/Unity/fake_scope.h (+1/-0)
tests/mocks/Unity/fake_settingsmodel.cpp (+95/-0)
tests/mocks/Unity/fake_settingsmodel.h (+54/-0)
tests/mocks/Unity/fake_unity_plugin.cpp (+2/-0)
tests/qmltests/CMakeLists.txt (+5/-0)
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+1/-1)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml (+62/-0)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml (+84/-0)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml (+98/-0)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml (+88/-0)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml (+65/-0)
tests/qmltests/Dash/tst_GenericScopeView.qml (+63/-32)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1151. By Andrea Cimitan on 2014-08-27

Fixed indent

1150. By Andrea Cimitan on 2014-08-27

Add link to bug

1149. By Michał Sawicz on 2014-08-26

Merge lp:~unity-team/unity8/alt_nav_support

1148. By Andrea Cimitan on 2014-08-26

New approach to test

1147. By Andrea Cimitan on 2014-08-26

Other approach to test

1146. By Andrea Cimitan on 2014-08-26

Test initialValue

1145. By Andrea Cimitan on 2014-08-26

Fixed tests

1144. By Andrea Cimitan on 2014-08-26

More changes

1143. By Andrea Cimitan on 2014-08-26

merged trunk

1142. By Andrea Cimitan on 2014-08-26

Changes according to review