Merge lp:~saviq/ubuntu-system-settings/fix-wizard-sim into lp:ubuntu-system-settings

[Michał Sawicz]

Move wizard welcome page to libqofono SIM backend.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:794
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/972/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/164
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/164
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3010
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3010/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1776
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1776/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/972/rebuild

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Needs Information

[Ken VanDine (ken-vandine)]

This looks good, tested on mako and worked well. We'll deal with multisim along with the rest of the places using it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:794
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/982/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/174
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3055
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3055/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9790
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1826
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1826/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/982/rebuild

review: Approve (continuous-integration)

=== modified file 'wizard/qml/Pages/10-welcome.qml'
--- wizard/qml/Pages/10-welcome.qml	2014-03-20 15:01:23 +0000
+++ wizard/qml/Pages/10-welcome.qml	2014-07-11 23:12:22 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.LanguagePlugin 1.0
-import Ubuntu.SystemSettings.Phone 1.0
+import MeeGo.QOfono 0.2
 import "../Components" as LocalComponents
 
 LocalComponents.Page {
@@ -29,8 +29,13 @@
         id: plugin
     }
 
-    SimManager {
+    OfonoManager {
+        id: manager
+    }
+
+    OfonoSimManager {
         id: simManager
+        modemPath: manager.modems[0]
     }
 
     Item {