diff --git a/src/qml/QrCodeScannerPage.qml b/src/qml/QrCodeScannerPage.qml index c44811d..8353d9f 100644 --- a/src/qml/QrCodeScannerPage.qml +++ b/src/qml/QrCodeScannerPage.qml @@ -1,85 +1,83 @@ /* * Kaidan - A user-friendly XMPP client for every device! * * Copyright (C) 2016-2019 Kaidan developers and contributors * (see the LICENSE file for a full list of copyright authors) * * Kaidan is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * In addition, as a special exception, the author of Kaidan gives * permission to link the code of its release with the OpenSSL * project's "OpenSSL" library (or with modified versions of it that * use the same license as the "OpenSSL" library), and distribute the * linked executables. You must obey the GNU General Public License in * all respects for all of the code used other than "OpenSSL". If you * modify this file, you may extend this exception to your version of * the file, but you are not obligated to do so. If you do not wish to * do so, delete this exception statement from your version. * * Kaidan is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Kaidan. If not, see . */ import QtQuick 2.0 import QtQuick.Controls 2.3 as Controls import QtMultimedia 5.9 -import org.kde.kirigami 2.2 as Kirigami +import org.kde.kirigami 2.4 as Kirigami import im.kaidan.kaidan 1.0 Kirigami.Page { leftPadding: 0 rightPadding: 0 topPadding: 0 bottomPadding: 0 title: qsTr("Scan QR code") + Kirigami.InlineMessage { + visible: { + camera.availability === Camera.Unavailable || + camera.availability === Camera.ResourceMissing + } + anchors.centerIn: parent + width: 300 + height: 60 + text: qsTr("There is no camera available.") + } + + Kirigami.InlineMessage { + visible: camera.availability === Camera.Busy + anchors.centerIn: parent + width: 300 + height: 60 + text: qsTr("Your camera is busy.\nTry to close other applications using the camera.") + } + VideoOutput { id: viewfinder anchors.fill: parent fillMode: VideoOutput.PreserveAspectCrop source: camera autoOrientation: true } QrCodeScanner { camera: camera onScanningSucceeded: { print(result) passiveNotification(result) } } Camera { id: camera - onAvailabilityChanged: { - kaidan.qrCodeScanner.startScanning(camera.mediaObject) - } } - -// function scanningSucceeded(result) { -// showPassiveNotification(result); -// } - -// function scanningFailed() { -// // rescan -// camera.imageCapture.capture() -// } - -// Component.onCompleted: { -// kaidan.qrCodeScanner.scanningSucceeded.connect(scanningSucceeded) -// kaidan.qrCodeScanner.scanningFailed.connect(scanningFailed) -// } -// Component.onDestruction: { -// kaidan.qrCodeScanner.scanningSucceeded.disconnect(scanningSucceeded) -// kaidan.qrCodeScanner.scanningFailed.disconnect(scanningFailed) -// } }