X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=qml%2Fpages%2FConnectPage.qml;h=c0175f4629ede55857514aec40537f0d98ac45e7;hb=93e2321f381ed34de36c088a4f50a7550e148652;hp=fcc22227b76a83ea3cc9f5fe97854052d308da1b;hpb=47f1326595263559a34d5db5e580fb2d1676e408;p=openvpnui.git

diff --git a/qml/pages/ConnectPage.qml b/qml/pages/ConnectPage.qml
index fcc2222..c0175f4 100644
--- a/qml/pages/ConnectPage.qml
+++ b/qml/pages/ConnectPage.qml
@@ -35,7 +35,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
 
-
 Page {
     id: connectPage
 
@@ -93,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"))
@@ -114,7 +117,7 @@ Page {
             spacing: Theme.paddingLarge
 
             PageHeader {
-                title: "OpenVPN Control"
+                title: "OpenVPN Rig"
             }
             Row {
                 spacing: Theme.paddingLarge
@@ -123,7 +126,10 @@ Page {
                     id: connect
                     text: "Connect"
                     enabled: true
-                    onClicked: VpnControl.vpnConnect()
+                    onClicked: {
+                        VpnControl.logAppend('\n')
+                        VpnControl.vpnConnect()
+                    }
                 }
                 Button {
                     id : disconnect
@@ -132,6 +138,7 @@ Page {
                     onClicked: VpnControl.vpnDisconnect();
                 }
             }
+
             Label {
                 id: statusText
                 text: "No status"
@@ -145,10 +152,42 @@ Page {
                 BusyIndicator {
                     id: busy
                     running: false
-                    size: BusyIndicatorSize.Large
+                    size: BusyIndicatorSize.Medium
                     anchors.verticalCenter: parent.verticalCenter
                 }
             }
+
+            Rectangle {
+                color: "transparent"
+                border {
+                    color: Theme.highlightBackgroundColor
+                    width: 1
+                }
+                //radius: Theme.paddingSmall
+                anchors.horizontalCenter: parent.horizontalCenter
+                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
+                    verticalAlignment: Text.AlignBottom
+                    x: Theme.paddingSmall
+                    y: Theme.paddingSmall
+                    //readOnly: true
+                    clip: true
+                }
+            }
         }
     }
 }