Merge branch 'qt_migration' into feature/qt6-server-busy-notification

2023-01-16 18:13:07 +00:00 · 2023-01-16 18:13:07 +00:00 · 580975fda1
commit 580975fda1
parent 9f114a1dad 0ae93d0657
28 changed files with 292 additions and 858 deletions
--- a/client/ui/qml/Pages/PageVPN.qml
+++ b/client/ui/qml/Pages/PageVPN.qml
@ -31,6 +31,7 @@ PageBase {
    }

    UrlButtonType {
+        id: button_donate
        y: 10
        anchors.horizontalCenter: parent.horizontalCenter
        height: 21
@ -55,6 +56,21 @@ PageBase {
        }
    }

+    LabelType {
+        id: lb_log_enabled
+        anchors.top: button_donate.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        height: 21
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+
+        text: "Logging enabled!"
+        color: "#D4D4D4"
+
+        visible: VpnLogic.labelLogEnabledVisible
+    }
+
    AnimatedImage {
        id: connect_anim
        source: "qrc:/images/animation.gif"