Merge lp:~jonas-drange/ubuntu-system-settings/rtm-1378812-fix-tech-pref into lp:ubuntu-system-settings/rtm-14.09

[Jonas G. Drange]

[cellular] Use a repeater to lay out two separate ItemSelectors for modems, making sure it works well between connMan power cycles

[cellular] Use a repeater to lay out two separate ItemSelectors for modems, making sure it works well between connMan power cycles

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:945
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/11/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

QA has signed this off, but code-wise there is no approval so can't publish yet. Please top-approve.

=== modified file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	2014-12-08 16:06:48 +0000
+++ plugins/cellular/Components/MultiSim.qml	2014-12-08 16:06:48 +0000
@@ -102,33 +102,36 @@
         }[tech]
     }
 
-    ListItem.ItemSelector {
-        id: radio
-        expanded: true
-        text: i18n.tr("Connection type:")
-        model: poweredSim ? poweredSim.radioSettings.modemTechnologies : []
-        delegate: OptionSelectorDelegate {
-            objectName: poweredSim.path + "_radio_" + modelData
-            text: techToString(modelData)
-        }
-        enabled: poweredSim ?
-            (poweredSim.radioSettings.technologyPreference !== "") : false
-        visible: poweredSim
-        selectedIndex: poweredSim ?
-            model.indexOf(poweredSim.radioSettings.technologyPreference) : -1
-        onDelegateClicked: {
-            poweredSim.radioSettings.technologyPreference = model[index];
-        }
-    }
-
-    Connections {
-        target: poweredSim ? poweredSim.radioSettings : null
-        onTechnologyPreferenceChanged: {
-            radio.selectedIndex =
-                poweredSim.radioSettings.modemTechnologies.indexOf(preference)
-        }
-        ignoreUnknownSignals: true
-    }
+    Repeater {
+        model: sims
+
+        ListItem.ItemSelector {
+            id: radio
+            property var sim: modelData
+            property var rSettings: sim.radioSettings
+            property string techPref: rSettings.technologyPreference
+            property var modemTechs: rSettings.modemTechnologies
+            expanded: true
+            text: i18n.tr("Connection type:")
+            model: modemTechs || []
+            delegate: OptionSelectorDelegate {
+                objectName: sim.path + "_radio_" + modelData
+                text: techToString(modelData)
+            }
+            enabled: techPref !== ""
+            visible: sim.connMan.powered
+            selectedIndex: techPref !== "" ? model.indexOf(techPref) : -1
+            onDelegateClicked: rSettings.technologyPreference = model[index];
+            Connections {
+                target: rSettings
+                onTechnologyPreferenceChanged: {
+                    radio.selectedIndex = modemTechs.indexOf(preference)
+                }
+                ignoreUnknownSignals: true
+            }
+        }
+    }
+
 
     GSettings {
         id: phoneSettings