← Back to branch summary

~ken-vandine/ubuntu-system-settings/lp1501428

« back to all changes in this revision

Viewing changes to plugins/cellular/Components/MultiSim.qml

  • Committer: CI Train Bot
  • Author(s): Ken VanDine
  • Date: 2015-09-15 00:23:08 UTC
  • mfrom: (1525.1.1 uss-ofono-1.16)
  • Revision ID: ci-train-bot@canonical.com-20150915002308-d1mm9lf7gr6vd5lt
ported to libqofono 0.82 (modemTechnologies now availableTechnologies)
Approved by: Jonas G. Drange

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cellular/Components/MultiSim.qml
100
100
 
101
101
            expanded: true
102
102
            text: sim.title
103
 
            model: sim.radioSettings.modemTechnologies
 
103
            model: sim.radioSettings.availableTechnologies
104
104
            delegate: OptionSelectorDelegate {
105
105
                objectName: sim.path + "_radio_" + modelData
106
106
                text: sim.techToString(modelData)
122
122
            Connections {
123
123
                target: sim.radioSettings
124
124
                onTechnologyPreferenceChanged: radio.selectedIndex =
125
 
                    sim.radioSettings.modemTechnologies.indexOf(preference)
 
125
                    sim.radioSettings.availableTechnologies.indexOf(preference)
126
126
 
127
 
                onModemTechnologiesChanged: {
 
127
                onAvailableTechnologiesChanged: {
128
128
                    if ((technologies.indexOf('umts') === -1)
129
129
                         && (sim.mtkSettings.has3G === false)) {
130
130
                        radio.model = sim.addUmtsEnableToModel(technologies);
138
138
            }
139
139
 
140
140
            Component.onCompleted: {
141
 
                if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
 
141
                if ((sim.radioSettings.availableTechnologies.indexOf('umts') === -1)
142
142
                     && (sim.mtkSettings.has3G === false)) {
143
 
                    radio.model = sim.addUmtsEnableToModel(sim.radioSettings.modemTechnologies);
 
143
                    radio.model = sim.addUmtsEnableToModel(sim.radioSettings.availableTechnologies);
144
144
                } else {
145
 
                    radio.model = sim.radioSettings.modemTechnologies;
 
145
                    radio.model = sim.radioSettings.availableTechnologies;
146
146
                }
147
147
            }
148
148
        }