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

1
client/3rd/qzxing Submodule

@ -0,0 +1 @@
Subproject commit 2fd4dd60c04a29c6d1271fdd9ae25378b8f61ec8

2
client/ui/qml/Config/GlobalConfig.qml
View file

@ -1,5 +1,5 @@
pragma Singleton pragma Singleton
import QtQuick 2.12 import QtQuick
Item { Item {
readonly property string screenHome: "qrc:/ScreenHome.qml" readonly property string screenHome: "qrc:/ScreenHome.qml"

4
client/ui/qml/Controls/BackButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
Button { Button {
id: root id: root

4
client/ui/qml/Controls/BasicButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
Button { Button {
id: root id: root

4
client/ui/qml/Controls/BlueButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
BasicButtonType { BasicButtonType {

4
client/ui/qml/Controls/Caption.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
Text { Text {
font.family: "Lato" font.family: "Lato"

4
client/ui/qml/Controls/CheckBoxType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
CheckBox { CheckBox {
id: root id: root

4
client/ui/qml/Controls/ComboBoxType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
ComboBox { ComboBox {
id: root id: root

6
client/ui/qml/Controls/ContextMenu.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import Qt.labs.platform 1.0 import Qt.labs.platform
Menu { Menu {
property var textObj property var textObj

6
client/ui/qml/Controls/FadeBehavior.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtQml 2.15 import QtQml
Behavior { Behavior {
id: root id: root
@ -32,4 +32,4 @@ Behavior {
} }
} }
} }

4
client/ui/qml/Controls/ImageButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
BasicButtonType { BasicButtonType {
id: root id: root

2
client/ui/qml/Controls/LabelType.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.12 import QtQuick
Text { Text {
id: root id: root

4
client/ui/qml/Controls/Logo.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
Image { Image {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter

4
client/ui/qml/Controls/RadioButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
RadioButton { RadioButton {
id: root id: root

2
client/ui/qml/Controls/RichLabelType.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.12 import QtQuick
LabelType { LabelType {
id: label_connection_code id: label_connection_code

4
client/ui/qml/Controls/SettingButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
BasicButtonType { BasicButtonType {
id: root id: root

4
client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
ShareConnectionButtonType { ShareConnectionButtonType {
property string start_text: qsTr("Copy") property string start_text: qsTr("Copy")

4
client/ui/qml/Controls/ShareConnectionButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
BasicButtonType { BasicButtonType {

24
client/ui/qml/Controls/ShareConnectionContent.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtGraphicalEffects 1.12 //import QtGraphicalEffects 1.12
import QtQuick.Shapes 1.4
Item { Item {
id: root id: root
@ -17,16 +18,15 @@ Item {
color: "transparent" color: "transparent"
clip: true clip: true
radius: 2 radius: 2
LinearGradient { gradient: LinearGradient {
anchors.fill: parent x1: 0 ; y1: 0
start: Qt.point(0, 0) x2: 0 ; y2: height
end: Qt.point(0, height) stops: [
gradient: Gradient { GradientStop { position: 0.0; color: "#E1E1E1" },
GradientStop { position: 0.0; color: "#E1E1E1" } GradientStop { position: 0.4; color: "#DDDDDD" },
GradientStop { position: 0.4; color: "#DDDDDD" } GradientStop { position: 0.5; color: "#D8D8D8" },
GradientStop { position: 0.5; color: "#D8D8D8" }
GradientStop { position: 1.0; color: "#D3D3D3" } GradientStop { position: 1.0; color: "#D3D3D3" }
} ]
} }
Image { Image {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

4
client/ui/qml/Controls/SvgButtonType.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import "." import "."
BasicButtonType { BasicButtonType {

6
client/ui/qml/Controls/SvgImageType.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtGraphicalEffects 1.15 import Qt5Compat.GraphicalEffects
Item { Item {
id: root id: root

6
client/ui/qml/Controls/TextAreaType.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import Qt.labs.platform 1.0 import Qt.labs.platform
import "../Config" import "../Config"

6
client/ui/qml/Controls/TextFieldType.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import Qt.labs.platform 1.0 import Qt.labs.platform
TextField { TextField {
id: root id: root

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtQuick.Layouts 1.3 import QtQuick.Layouts
import ContainerProps 1.0 import ContainerProps 1.0
import ProtocolProps 1.0 import ProtocolProps 1.0
import PageEnum 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
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtMultimedia
import PageEnum 1.0 import PageEnum 1.0
import QtMultimedia 5.5
import QZXing 3.2 import QZXing 3.2
import "./" import "./"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,8 +1,7 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtGraphicalEffects 1.12
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
import ContainerProps 1.0 import ContainerProps 1.0
import ProtocolProps 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
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQml.Models 2.15 import QtQml.Models
import Qt.labs.platform 1.0 import Qt.labs.platform
import QtQuick.Dialogs 1.0 import QtQuick.Dialogs
import PageEnum 1.0 import PageEnum 1.0
import "./" import "./"
import "../Controls" import "../Controls"
@ -101,7 +101,7 @@ PageBase {
id: fileDialog id: fileDialog
title: qsTr("Import IP addresses") title: qsTr("Import IP addresses")
visible: false visible: false
folder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation) currentFolder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
onAccepted: { onAccepted: {
SitesLogic.onPushButtonSitesImportClicked(fileUrl) SitesLogic.onPushButtonSitesImportClicked(fileUrl)
} }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
client/ui/qml/TitleBar.qml
View file

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

18
client/ui/qml/main.qml
View file

@ -1,12 +1,12 @@
import QtQuick 2.14 import QtQuick
import QtQuick.Window 2.14 import QtQuick.Window
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Controls.Material 2.12 import QtQuick.Controls.Material
import PageEnum 1.0 import PageEnum 1.0
import PageType 1.0 import PageType 1.0
import Qt.labs.platform 1.1 import Qt.labs.platform
import Qt.labs.folderlistmodel 2.12 import Qt.labs.folderlistmodel
import QtQuick.Dialogs import QtQuick.Dialogs
import "./" import "./"
import "Controls" import "Controls"
@ -199,7 +199,7 @@ Window {
sharePages[obj.protocol] = obj sharePages[obj.protocol] = obj
} }
//console.debug("Created compenent " + component.url + " for " + type); // console.debug("Created compenent " + component.url + " for " + type);
} }
} else if (component.status === Component.Error) { } else if (component.status === Component.Error) {
console.debug("Error loading component:", component.errorString()); console.debug("Error loading component:", component.errorString());
@ -209,7 +209,7 @@ Window {
if (c.status === Component.Ready) if (c.status === Component.Ready)
finishCreation(c); finishCreation(c);
else { else {
console.debug("Warning: Pages components are not ready"); console.debug("Warning: " + file + " page components are not ready " + c.errorString());
} }
} }