Added configurable path to extra configuration file.

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

diff --git a/qml/pages/ConfigurePage.qml b/qml/pages/ConfigurePage.qml
index 1615c97..7d21761 100644 (file)
--- a/qml/pages/ConfigurePage.qml
+++ b/qml/pages/ConfigurePage.qml
@@ -64,6 +64,9 @@ Dialog {
                 case 4:
                     tlsKeyFilename.value = engine.selectedFilename
                     break;
+                case 5:
+                    configFilename.value = engine.selectedFilename
+                    break;
             }
             _fileDialogue = 0;
         }
@@ -140,7 +143,8 @@ Dialog {
             ValueButtonAlignRight {
                 id: caCertFilename
                 label: "CA cert"
-                value: "Select"
+                value: VpnControl.caCertFile
+                placeholderText: "Select"
                 width: parent.width
                 onClicked: {
                     _fileDialogue = 1
@@ -150,8 +154,9 @@ Dialog {
 
             ValueButtonAlignRight {
                 id: clientCertFilename
-                value: "Select"
                 label: "Client cert"
+                value: VpnControl.clientCertFile
+                placeholderText: "Select"
                 width: parent.width
                 onClicked: {
                     _fileDialogue = 2;
@@ -161,8 +166,9 @@ Dialog {
 
             ValueButtonAlignRight {
                 id: clientKeyFilename
-                value: "Select"
                 label: "Client key"
+                value: VpnControl.clientKeyFile
+                placeholderText: "Select"
                 width: parent.width
                 onClicked: {
                     _fileDialogue = 3;
@@ -172,8 +178,9 @@ Dialog {
 
             ValueButtonAlignRight {
                 id: tlsKeyFilename
-                value: "Select"
                 label: "TLS key"
+                value: VpnControl.tlsKeyFile
+                placeholderText: "Select"
                 width: parent.width
                 enabled: configureTLS.checked
                 onClicked: {
@@ -181,6 +188,18 @@ Dialog {
                     Functions.goToInitial(Functions.folderFromFile(value), "key")
                 }
             }
+
+            ValueButtonAlignRight {
+                id: configFilename
+                label: "Extra options"
+                value: VpnControl.configFile
+                placeholderText: "Select"
+                width: parent.width
+                onClicked: {
+                    _fileDialogue = 5;
+                    Functions.goToInitial(Functions.folderFromFile(value), "ovpn")
+                }
+            }
         }
     }
 
@@ -191,11 +210,10 @@ Dialog {
         VpnControl.setUseTLS(configureTLS.checked)
         VpnControl.setTlsDirection(configureTLSdirection.currentIndex)
         VpnControl.updateConfiguration()
+        VpnControl.setCaCertFile(caCertFilename.value)
+        VpnControl.setClientCertFile(clientCertFilename.value)
+        VpnControl.setClientKeyFile(clientKeyFilename.value)
+        VpnControl.setTlsKeyFile(tlsKeyFilename.value)
+        VpnControl.setConfigFile(configFilename.value)
     }
-
 }
-
-
-
-
-