mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-10 21:04:32 +00:00
Merge pull request #2836
3f13a5c
QRCodeScanner: don't load webcam on startup (mmbyday/selsta)
This commit is contained in:
commit
376421667a
1 changed files with 4 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (c) 2014-2018, The Monero Project
|
// Copyright (c) 2014-2020, The Monero Project
|
||||||
//
|
//
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
//
|
//
|
||||||
|
@ -53,6 +53,7 @@ Rectangle {
|
||||||
script: {
|
script: {
|
||||||
root.visible = true
|
root.visible = true
|
||||||
camera.captureMode = Camera.CaptureStillImage
|
camera.captureMode = Camera.CaptureStillImage
|
||||||
|
camera.cameraState = Camera.ActiveState
|
||||||
camera.start()
|
camera.start()
|
||||||
finder.enabled = true
|
finder.enabled = true
|
||||||
}
|
}
|
||||||
|
@ -65,6 +66,7 @@ Rectangle {
|
||||||
camera.stop()
|
camera.stop()
|
||||||
root.visible = false
|
root.visible = false
|
||||||
finder.enabled = false
|
finder.enabled = false
|
||||||
|
camera.cameraState = Camera.UnloadedState
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -74,6 +76,7 @@ Rectangle {
|
||||||
id: camera
|
id: camera
|
||||||
objectName: "qrCameraQML"
|
objectName: "qrCameraQML"
|
||||||
captureMode: Camera.CaptureStillImage
|
captureMode: Camera.CaptureStillImage
|
||||||
|
cameraState: Camera.UnloadedState
|
||||||
|
|
||||||
focus {
|
focus {
|
||||||
focusMode: Camera.FocusContinuous
|
focusMode: Camera.FocusContinuous
|
||||||
|
|
Loading…
Reference in a new issue