AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added qr code scanner for ios

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-13 11:28:32 +05:00
parent c1c68cf72d
commit 14fa0b4fd3
19 changed files with 128 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Pages2/PageProtocolCloakSettings.qml
View file

@ -13,12 +13,10 @@ import "../Components"
PageType {
id: root
//todo move to main?
Connections {
target: InstallController
function onUpdateContainerFinished() {
//todo change to notification
PageController.showNotificationMessage(qsTr("Settings updated successfully"))
}
}

1
client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
View file

@ -19,7 +19,6 @@ PageType {
target: InstallController
function onUpdateContainerFinished() {
//todo change to notification
PageController.showNotificationMessage(qsTr("Settings updated successfully"))
}
}

2
client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
View file

@ -13,12 +13,10 @@ import "../Components"
PageType {
id: root
//todo move to main?
Connections {
target: InstallController
function onUpdateContainerFinished() {
//todo change to notification
PageController.showNotificationMessage(qsTr("Settings updated successfully"))
}
}

2
client/ui/qml/Pages2/PageServiceSftpSettings.qml
View file

@ -15,12 +15,10 @@ import "../Components"
PageType {
id: root
//todo move to main?
Connections {
target: InstallController
function onUpdateContainerFinished() {
//todo change to notification
PageController.showNotificationMessage(qsTr("Settings updated successfully"))
}
}

2
client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
View file

@ -16,12 +16,10 @@ import "../Components"
PageType {
id: root
//todo move to main?
Connections {
target: InstallController
function onUpdateContainerFinished() {
//todo change to notification
PageController.showNotificationMessage(qsTr("Settings updated successfully"))
}
}

7
client/ui/qml/Pages2/PageSettingsServerProtocol.qml
View file

@ -55,16 +55,15 @@ PageType {
anchors.topMargin: 32
ListView {
// todo change id naming
id: container
id: protocols
width: parent.width
height: container.contentItem.height
height: protocols.contentItem.height
clip: true
interactive: false
model: ProtocolsModel
delegate: Item {
implicitWidth: container.width
implicitWidth: protocols.width
implicitHeight: delegateContent.implicitHeight
ColumnLayout {

3
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View file

@ -17,6 +17,7 @@ PageType {
target: ImportController
function onQrDecodingFinished() {
closePage()
goToPage(PageEnum.PageSetupWizardViewConfig)
}
}
@ -86,7 +87,7 @@ It's okay if a friend passed the code.")
clickedFunction: function() {
ImportController.startDecodingQr()
// goToPage(PageEnum.PageSetupWizardQrReader)
goToPage(PageEnum.PageSetupWizardQrReader)
}
}

2
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -68,7 +68,6 @@ PageType {
}
FlickableType {
id: fl
anchors.fill: parent
contentHeight: content.height
@ -82,7 +81,6 @@ PageType {
spacing: 16
ListView {
// todo change id naming
id: container
width: parent.width
height: container.contentItem.height

1
client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
View file

@ -233,7 +233,6 @@ PageType {
}
Component.onCompleted: {
//todo move to protocols model?
var defaultContainerProto = ContainerProps.defaultProtocol(dockerContainer)
if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {

87
client/ui/qml/Pages2/PageSetupWizardQrReader.qml
View file

@ -14,39 +14,76 @@ import "../Config"
PageType {
id: root
ColumnLayout {
anchors.fill: parent
BackButtonType {
id: backButton
anchors.left: parent.left
anchors.top: parent.top
spacing: 0
anchors.topMargin: 20
}
BackButtonType {
Layout.topMargin: 20
}
ParagraphTextType {
id: header
ParagraphTextType {
Layout.fillWidth: true
property string progressString
text: qsTr("Point the camera at the QR code and hold for a couple of seconds.")
}
anchors.left: parent.left
anchors.top: backButton.bottom
anchors.right: parent.right
ProgressBarType {
anchors.leftMargin: 16
anchors.rightMargin: 16
}
text: qsTr("Point the camera at the QR code and hold for a couple of seconds. ") + progressString
}
Item {
Layout.fillHeight: true
Layout.fillWidth: true
ProgressBarType {
id: progressBar
QRCodeReader {
id: qrCodeReader
Component.onCompleted: {
qrCodeReader.setCameraSize(Qt.rect(parent.x,
parent.y,
parent.width,
parent.height))
qrCodeReader.startReading()
}
}
anchors.left: parent.left
anchors.top: header.bottom
anchors.right: parent.right
anchors.leftMargin: 16
anchors.rightMargin: 16
}
Rectangle {
id: qrCodeRectange
anchors.right: parent.right
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.top: progressBar.bottom
anchors.topMargin: 34
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.bottomMargin: 34
color: "transparent"
//radius: 16
QRCodeReader {
id: qrCodeReader
onCodeReaded: function(code) {
ImportController.parseQrCodeChunk(code)
progressBar.value = ImportController.getQrCodeScanProgressBarValue()
header.progressString = ImportController.getQrCodeScanProgressString()
}
Component.onCompleted: {
console.log(qrCodeRectange.x)
console.log(qrCodeRectange.y)
console.log(qrCodeRectange.width)
qrCodeReader.setCameraSize(Qt.rect(qrCodeRectange.x,
qrCodeRectange.y,
qrCodeRectange.width,
qrCodeRectange.height))
qrCodeReader.startReading()
}
Component.onDestruction: qrCodeReader.stopReading()
}
}
}