← Back to branch summary

~jonas-drange/ubuntu-system-settings/hotspots

« back to all changes in this revision

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

  • Committer: jonas-drange
  • Date: 2015-07-31 15:03:10 UTC
  • mfrom: (1312.3.75 hotspots-binding)
  • Revision ID: jonas.drange@canonical.com-20150731150310-21t62nsd2zhd62jm
bzr merge lp:~jonas-drange/ubuntu-system-settings/hotspots-binding

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cellular/Components/MultiSim.qml
23
23
import Ubuntu.Components 0.1
24
24
import Ubuntu.Components.ListItems 0.1 as ListItem
25
25
 
 
26
/* This is a temporary solution to the issue of Hotspots failing on mako. If
 
27
the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
 
28
has been resolved. */
 
29
import Ubuntu.SystemSettings.Update 1.0
 
30
 
26
31
Column {
27
32
    objectName: "multiSim"
28
33
 
50
55
 
51
56
    ListItem.SingleValue {
52
57
        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
53
 
        visible: showAllUI && !hotspotItem.visible
 
58
        visible: !hotspotItem.visible &&
 
59
                 UpdateManager.deviceName !== "mako"
54
60
    }
55
61
 
56
62
    ListItem.SingleValue {
58
64
        text: i18n.tr("Wi-Fi hotspot")
59
65
        progression: true
60
66
        onClicked: {
61
 
            pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
 
67
            pageStack.push(Qt.resolvedUrl("../Hotspot.qml"))
62
68
        }
63
 
        visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
 
69
        visible: (actionGroup.actionObject.valid ?
 
70
                     actionGroup.actionObject.state : false) &&
 
71
                 UpdateManager.deviceName !== "mako"
 
72
 
64
73
    }
65
74
 
66
75
    ListItem.Standard {