← Back to branch summary

~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview

« back to all changes in this revision

Viewing changes to plugins/security-privacy/PhoneLocking.qml

  • Committer: Bileto Bot
  • Author(s): Jonas G. Drange
  • Date: 2017-01-12 12:48:46 UTC
  • mfrom: (1741.1.28 apl)
  • Revision ID: ci-train-bot@canonical.com-20170112124846-0rsokgs0jy7j9rqv
migrates uss to apl

Approved by: Ken VanDine, system-apps-ci-bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/security-privacy/PhoneLocking.qml
30
30
    id: root
31
31
    objectName: "phoneLockingPage"
32
32
    title: i18n.tr("Locking and unlocking")
 
33
    flickable: scrollWidget
33
34
 
34
35
    property bool usePowerd
35
36
    property var powerSettings
39
40
    }
40
41
 
41
42
    Flickable {
 
43
        id: scrollWidget
42
44
        anchors.fill: parent
43
45
        contentHeight: contentItem.childrenRect.height
44
46
        boundsBehavior: (contentHeight > root.height) ?
75
77
                            return fingerprint
76
78
                    }
77
79
                }
78
 
                onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml"))
 
80
                onClicked: pageStack.addPageToNextColumn(
 
81
                    root, Qt.resolvedUrl("LockSecurity.qml"))
79
82
            }
80
83
 
81
84
            SettingsListItems.SingleValueProgression {
110
113
                    }
111
114
                }
112
115
                onClicked:
113
 
                    pageStack.push(
 
116
                    pageStack.addPageToNextColumn(root,
114
117
                        Qt.resolvedUrl("../battery/SleepValues.qml"),
115
118
                        { title: text, lockOnSuspend: lockOnSuspend } )
116
119
            }