← Back to branch summary

~lukas-kde/unity8/dashboard

« back to all changes in this revision

Viewing changes to qml/Components/Lockscreen.qml

  • Committer: Lukáš Tinkl
  • Date: 2017-01-26 12:13:17 UTC
  • mfrom: (2749.1.49 unity8)
  • Revision ID: lukas.tinkl@canonical.com-20170126121317-qms39s9pikclidbe
merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Components/Lockscreen.qml
1
1
/*
2
 
 * Copyright (C) 2013 Canonical, Ltd.
 
2
 * Copyright (C) 2013-2017 Canonical, Ltd.
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
5
5
 * it under the terms of the GNU General Public License as published by
240
240
            property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
241
241
 
242
242
            Button {
 
243
                width: parent.width
243
244
                objectName: "infoPopupOkButton"
244
245
                text: i18n.tr("OK")
 
246
                focus: true
245
247
                onClicked: {
246
248
                    PopupUtils.close(dialog)
247
249
                    root.infoPopupConfirmed();