Merge pull request #14 from akaWolf/master

[Wi-Fi] fix connect/disconnect
nemomobile-ux · Dec 4, 2018 · c6ddfc4 · c6ddfc4
2 parents 0ac46f2 + 2966fbc
commit c6ddfc4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/qml/plugins/wifi/WifiSettings.qml b/qml/plugins/wifi/WifiSettings.qml
@@ -76,15 +76,22 @@ Page {
         networkingModel.networkName.text = modelData.name;
     }
 
-    SettingsColumn{
-        TextField{
+    SettingsColumn {
+        TextField {
             id: passphrase
+            text: modelData.passphrase
         }
 
-        Button{
+        Button {
             id: connectButton
             height: 48
 
+            onClicked: {
+                modelData.passphrase = passphrase.text;
+                modelData.requestConnect();
+                pageStack.pop();
+            }
+
             text: qsTr("Connect")
         }
     }

diff --git a/qml/plugins/wifi/wifi.qml b/qml/plugins/wifi/wifi.qml
@@ -69,7 +69,7 @@ Page {
                     verticalCenter: nameLabel.verticalCenter
                 }
                 onClicked:{
-                    networkingModel.setPowered(columnCheckBox.checked)
+                    networkingModel.powered = !networkingModel.powered;
                 }
             }
         }