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

Merge branch 'dev' into qt_migration

Browse source
This commit is contained in:
pokamest 2022-12-13 15:09:05 +01:00
commit 1de143362c
42 changed files with 794 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,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
@ -71,7 +71,7 @@ PageBase {
anchors.right: parent.right
autoOrientation: true
fillMode: VideoOutput.PreserveAspectFit
filters: [ zxingFilter ]
// filters: [ zxingFilter ]
Rectangle {

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

@ -40,11 +40,29 @@ PageBase {
id: loader
anchors.top: caption.bottom
anchors.bottom: parent.bottom
anchors.bottom: progressColumn.top
anchors.left: parent.left
anchors.right: parent.right
}
Column{
height: 40
id: progressColumn
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
ProgressBar {
id: progress
anchors.left: parent.left
anchors.right: parent.right
value: QrDecoderLogic.totalChunksCount === 0? 0 : (QrDecoderLogic.receivedChunksCount/QrDecoderLogic.totalChunksCount)
}
Text {
id: chunksCount
text: "Progress: " + QrDecoderLogic.receivedChunksCount +"/"+QrDecoderLogic.totalChunksCount
}
}
Component {
id: component

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

@ -42,6 +42,9 @@ PageBase {
anchors.bottom: parent.bottom
anchors.bottomMargin: 20
model: ServerListLogic.serverListModel
highlightRangeMode: ListView.ApplyRange
highlightMoveVelocity: -1
currentIndex: ServerListLogic.currServerIdx
spacing: 5
clip: true
delegate: Item {
@ -55,10 +58,6 @@ PageBase {
if (GC.isMobile()) {
ServerListLogic.onServerListPushbuttonSettingsClicked(index)
}
else {
listWidget_servers.currentIndex = index
}
mouse.accepted = false
}
onEntered: {

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

@ -27,7 +27,6 @@ PageProtocolBase {
anchors.top: caption.bottom
anchors.left: root.left
anchors.right: root.right
anchors.bottom: pb_save.top
anchors.margins: 20
anchors.topMargin: 10

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

@ -112,7 +112,7 @@ New encryption keys pair will be generated.")
Layout.bottomMargin: 10
Layout.fillWidth: true
Layout.preferredHeight: 40
text: qsTr("Save to file")
text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
enabled: tfShareCode.textArea.length > 0
visible: tfShareCode.textArea.length > 0

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

@ -94,7 +94,7 @@ PageShareProtocolBase {
Layout.fillWidth: true
Layout.preferredHeight: 40
text: qsTr("Save to file")
text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
enabled: tfShareCode.textArea.length > 0
visible: tfShareCode.textArea.length > 0

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

@ -93,7 +93,7 @@ PageShareProtocolBase {
Layout.preferredHeight: 40
width: parent.width - 60
text: qsTr("Save to file")
text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
enabled: tfShareCode.textArea.length > 0
visible: tfShareCode.textArea.length > 0

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

@ -91,7 +91,7 @@ PageShareProtocolBase {
Layout.preferredHeight: 40
Layout.fillWidth: true
text: qsTr("Save to file")
text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
enabled: tfShareCode.textArea.length > 0
visible: tfShareCode.textArea.length > 0