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

Fix all QML headers and change the deprecated QML components

Browse source 
* QZXing : Error while integrating it
This commit is contained in:
Hamza ARBI 2022-10-20 20:09:17 +01:00
parent 442e7eb015
commit cc3d9e0d2d
65 changed files with 208 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import "./"
import "../../Controls"
import "../../Config"

4
client/ui/qml/Pages/InstallSettings/SelectContainer.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import SortFilterProxyModel 0.2
import ProtocolEnum 1.0
import "./"

4
client/ui/qml/Pages/PageAbout.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageAppSetting.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

4
client/ui/qml/Pages/PageBase.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"

9
client/ui/qml/Pages/PageGeneralSettings.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"
@ -163,6 +162,4 @@ PageBase {
}
}
}
}

12
client/ui/qml/Pages/PageNetworkSetting.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"
@ -62,8 +62,8 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
NetworkSettingsLogic.onLineEditDns1EditFinished(text)
UiLogic.onUpdateAllPages()
}
validator: RegExpValidator {
regExp: NetworkSettingsLogic.ipAddressRegex
validator: RegularExpressionValidator {
regularExpression: NetworkSettingsLogic.ipAddressRegex
}
}
SvgButtonType {
@ -101,8 +101,8 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
NetworkSettingsLogic.onLineEditDns2EditFinished(text)
UiLogic.onUpdateAllPages()
}
validator: RegExpValidator {
regExp: NetworkSettingsLogic.ipAddressRegex
validator: RegularExpressionValidator {
regularExpression: NetworkSettingsLogic.ipAddressRegex
}
}
SvgButtonType {

4
client/ui/qml/Pages/PageNewServer.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageNewServerProtocols.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ContainerProps 1.0
import ProtocolProps 1.0
import PageEnum 1.0

6
client/ui/qml/Pages/PageQrDecoder.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import QtMultimedia
import PageEnum 1.0
import QtMultimedia 5.5
import QZXing 3.2
import "./"

6
client/ui/qml/Pages/PageQrDecoderIos.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import QRCodeReader 1.0
@ -25,7 +25,7 @@ PageBase {
}
Connections {
target: Qt.platform.os == "ios" ? QrDecoderLogic : nil
target: Qt.platform.os == "ios" ? QrDecoderLogic : null
function onStartDecode() {
console.debug("Starting QR decoder")
loader.sourceComponent = component

4
client/ui/qml/Pages/PageServerConfiguringProgress.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"

10
client/ui/qml/Pages/PageServerContainers.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import Qt.labs.platform
import QtQuick.Layouts
import SortFilterProxyModel 0.2
import ContainerProps 1.0
import ProtocolProps 1.0
@ -304,7 +304,7 @@ PageBase {
MessageDialog {
id: dialogRemove
standardButtons: StandardButton.Yes | StandardButton.Cancel
buttons: StandardButton.Yes | StandardButton.Cancel
title: "AmneziaVPN"
text: qsTr("Remove container") + " " + name_role + "?" + "\n" + qsTr("This action will erase all data of this container on the server.")
onAccepted: {

43
client/ui/qml/Pages/PageServerList.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.12
import QtQuick
import QtQuick.Controls
import QtQuick.Shapes 1.4
import PageEnum 1.0
import "../Controls"
import "./"
@ -70,26 +70,29 @@ PageBase {
mouseExitAni.start()
}
}
LinearGradient {
visible: !ms.containsMouse
Rectangle {
anchors.fill: parent
start: Qt.point(0, 0)
end: Qt.point(0, height)
gradient: Gradient {
GradientStop { position: 0.0; color: "#FAFBFE" }
GradientStop { position: 1.0; color: "#ECEEFF" }
}
}
LinearGradient {
visible: ms.containsMouse
anchors.fill: parent
start: Qt.point(0, 0)
end: Qt.point(0, height)
gradient: Gradient {
GradientStop { position: 0.0; color: "#FAFBFE" }
GradientStop { position: 1.0; color: "#DCDEDF" }
gradient: ms.containsMouse ? gradient_containsMouse : gradient_notContainsMouse
LinearGradient {
id: gradient_notContainsMouse
x1: 0 ; y1:0
x2: 0 ; y2: height
stops: [
GradientStop { position: 0.0; color: "#FAFBFE" },
GradientStop { position: 1.0; color: "#ECEEFF" }
]
}
LinearGradient {
id: gradient_containsMouse
x1: 0 ; y1:0
x2: 0 ; y2: height
stops: [
GradientStop { position: 0.0; color: "#FAFBFE" },
GradientStop { position: 1.0; color: "#DCDEDF" }
]
}
}
LabelType {
id: label_address
x: 20

4
client/ui/qml/Pages/PageServerSettings.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageSetupWizard.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageSetupWizardHighLevel.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageSetupWizardLowLevel.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageSetupWizardVPNMode.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

9
client/ui/qml/Pages/PageShareConnection.qml
View file

@ -1,8 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.12
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import SortFilterProxyModel 0.2
import ContainerProps 1.0
import ProtocolProps 1.0

12
client/ui/qml/Pages/PageSites.qml
View file

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQml.Models 2.15
import Qt.labs.platform 1.0
import QtQuick.Dialogs 1.0
import QtQuick
import QtQuick.Controls
import QtQml.Models
import Qt.labs.platform
import QtQuick.Dialogs
import PageEnum 1.0
import "./"
import "../Controls"
@ -101,7 +101,7 @@ PageBase {
id: fileDialog
title: qsTr("Import IP addresses")
visible: false
folder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
currentFolder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
onAccepted: {
SitesLogic.onPushButtonSitesImportClicked(fileUrl)
}

12
client/ui/qml/Pages/PageStart.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import "./"
import "../Controls"
@ -134,7 +134,7 @@ PageBase {
text: qsTr("Scan QR code")
onClicked: {
if (Qt.platform.os == "ios") {
if (Qt.platform.os === "ios") {
UiLogic.goToPage(PageEnum.QrDecoderIos)
} else {
UiLogic.goToPage(PageEnum.QrDecoder)
@ -148,7 +148,7 @@ PageBase {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: qr_code_import.bottom
anchors.topMargin: 30
visible: UiLogic.pagesStackDepth == 1
visible: UiLogic.pagesStackDepth === 1
enabled: StartPageLogic.pushButtonConnectEnabled
text: qsTr("Restore app config")
@ -212,8 +212,8 @@ PageBase {
StartPageLogic.lineEditIpText = text
}
validator: RegExpValidator {
regExp: StartPageLogic.ipAddressPortRegex
validator: RegularExpressionValidator {
regularExpression: StartPageLogic.ipAddressPortRegex
}
}

6
client/ui/qml/Pages/PageVPN.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/PageViewConfig.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import PageEnum 1.0
import "./"
import "../Controls"

6
client/ui/qml/Pages/Protocols/PageProtoCloak.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

4
client/ui/qml/Pages/Protocols/PageProtoSftp.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

4
client/ui/qml/Pages/Protocols/PageProtocolBase.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import ProtocolEnum 1.0
import "./.."

6
client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Share/PageShareProtoCloak.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

4
client/ui/qml/Pages/Share/PageShareProtoSftp.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

4
client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import ProtocolEnum 1.0
import "../"
import "../../Controls"

6
client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ProtocolEnum 1.0
import "../"
import "../../Controls"

4
client/ui/qml/Pages/Share/PageShareProtocolBase.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import PageEnum 1.0
import ProtocolEnum 1.0
import "./.."