← Back to branch summary

~system-settings-touch/ubuntu-system-settings/15.04

« back to all changes in this revision

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

merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cellular/Components/RadioSingleSim.qml
39
39
        // an empty string is not a valid preference, which means
40
40
        // we disregard the interace and disable the selector
41
41
        enabled: parent.enabled
42
 
        model: sim.radioSettings.modemTechnologies
 
42
        model: sim.radioSettings.availableTechnologies
43
43
        delegate: OptionSelectorDelegate {
44
44
            objectName: sim.path + "_radio_" + modelData
45
45
            text: sim.techToString(modelData)
63
63
            target: sim.radioSettings
64
64
 
65
65
            onTechnologyPreferenceChanged: selector.selectedIndex =
66
 
                sim.radioSettings.modemTechnologies.indexOf(preference)
 
66
                sim.radioSettings.availableTechnologies.indexOf(preference)
67
67
 
68
 
            onModemTechnologiesChanged: {
 
68
            onAvailableTechnologiesChanged: {
69
69
                if ((technologies.indexOf('umts') === -1)
70
70
                     && (sim.mtkSettings.has3G === false)) {
71
71
                    selector.model = sim.addUmtsEnableToModel(technologies);
79
79
        }
80
80
 
81
81
        Component.onCompleted: {
82
 
            if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
 
82
            if ((sim.radioSettings.availableTechnologies.indexOf('umts') === -1)
83
83
                 && (sim.mtkSettings.has3G === false)) {
84
84
                selector.model = sim.addUmtsEnableToModel(
85
 
                    sim.radioSettings.modemTechnologies);
 
85
                    sim.radioSettings.availableTechnologies);
86
86
            } else {
87
 
                selector.model = sim.radioSettings.modemTechnologies;
 
87
                selector.model = sim.radioSettings.availableTechnologies;
88
88
            }
89
89
        }
90
90
    }