Added About page.

[openvpnui.git] / qml / pages / ConnectPage.qml

diff --git a/qml/pages/ConnectPage.qml b/qml/pages/ConnectPage.qml
index 3d6c296..c0175f4 100644 (file)
--- a/qml/pages/ConnectPage.qml
+++ b/qml/pages/ConnectPage.qml
@@ -92,6 +92,10 @@ Page {
 
         // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
         PullDownMenu {
+            MenuItem {
+                text: "About"
+                onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+            }
             MenuItem {
                 text: "Configure"
                 onClicked: pageStack.push(Qt.resolvedUrl("ConfigurePage.qml"))
@@ -113,7 +117,7 @@ Page {
             spacing: Theme.paddingLarge
 
             PageHeader {
-                title: "OpenVPN Control"
+                title: "OpenVPN Rig"
             }
             Row {
                 spacing: Theme.paddingLarge
@@ -122,7 +126,10 @@ Page {
                     id: connect
                     text: "Connect"
                     enabled: true
-                    onClicked: VpnControl.vpnConnect()
+                    onClicked: {
+                        VpnControl.logAppend('\n')
+                        VpnControl.vpnConnect()
+                    }
                 }
                 Button {
                     id : disconnect
@@ -131,6 +138,7 @@ Page {
                     onClicked: VpnControl.vpnDisconnect();
                 }
             }
+
             Label {
                 id: statusText
                 text: "No status"
@@ -144,7 +152,7 @@ Page {
                 BusyIndicator {
                     id: busy
                     running: false
-                    size: BusyIndicatorSize.Large
+                    size: BusyIndicatorSize.Medium
                     anchors.verticalCenter: parent.verticalCenter
                 }
             }
@@ -157,24 +165,27 @@ Page {
                 }
                 //radius: Theme.paddingSmall
                 anchors.horizontalCenter: parent.horizontalCenter
-                height: (20 * Theme.fontSizeTiny) + (2 * Theme.paddingLarge)
+                height: (24 * Theme.fontSizeTiny) + (2 * Theme.paddingLarge)
                 width: parent.width - 2 * Theme.paddingLarge
                 x: Theme.paddingLarge
 
+                //TextEdit {
                 Label {
                     id: logOutput
                     textFormat: Text.PlainText
                     width: parent.width - 2 * Theme.paddingSmall
+                    height: parent.height - 0 * Theme.paddingSmall
                     wrapMode: Text.WrapAnywhere
                     font.pixelSize: Theme.fontSizeTiny * 0.6
                     font.family: "Monospace"
                     color: Theme.highlightColor
                     visible: true
                     text: VpnControl.logText
-                    maximumLineCount: Math.floor(18 / 0.6)
                     verticalAlignment: Text.AlignBottom
                     x: Theme.paddingSmall
                     y: Theme.paddingSmall
+                    //readOnly: true
+                    clip: true
                 }
             }
         }