2 files changed, 21 insertions, 27 deletions

diff --git a/app/bluetooth/Bluetooth.qml b/app/bluetooth/Bluetooth.qml
index ded2c36..e8cca1a 100644
--- a/app/bluetooth/Bluetooth.qml
+++ b/app/bluetooth/Bluetooth.qml
@@ -189,10 +189,28 @@ SettingPage {
 
          }
          Button {
+             id: removeButton
+             anchors.top:parent.top
+             anchors.topMargin: 15
+             anchors.right: parent.right
+             text: "Unpair"
+             MouseArea {
+                 anchors.fill: parent
+                 onClicked: {
+                     request(btAPIpath + 'remove_device?value=' + btAddr.text, function (o) {
+                         console.log(o.responseText)
+                     })
+                     btDeviceList.remove(findDevice(btAddr.text))
+                 }
+             }
+
+         }
+
+         Button {
           id: connectButton
           anchors.top:parent.top
           anchors.topMargin: 15
-          anchors.right: parent.right
+          anchors.right: removeButton.left
           anchors.rightMargin: 10
 
           text:(btConnectstatus.text == "True")? "Disconnect":((btPairable.text == "True")? "Connect":"Pair")
@@ -231,26 +249,6 @@ SettingPage {
               }
             }
           }
-          /*Image{
-             id: removeDevice
-             anchors.top:parent.top
-             anchors.topMargin: 15
-             anchors.right: parent.right
-             anchors.rightMargin: 5
-             width: 25
-             height: 25
-             source: "component/images/trash.png"
-
-             MouseArea {
-                       anchors.fill: parent
-                       onClicked: {
-                                  request(btAPIpath + 'remove_device?value=' + btAddr.text, function (o) {
-                                      console.log(o.responseText)
-                                  })
-                                  btDeviceList.remove(findDevice(btAddr.text))
-                       }
-             }
-           }*/
         }
       }
 
diff --git a/app/wifi/Wifi.qml b/app/wifi/Wifi.qml
index 7851967..eac27cb 100644
--- a/app/wifi/Wifi.qml
+++ b/app/wifi/Wifi.qml
@@ -321,8 +321,6 @@ SettingPage {
                         connectButton.visible = false
                         passwordValidateButton.visible = true
 
-                        System.showKeyboard = visible
-
                         //passwordInputText.o
                         periodicRefresh.stop()
 
@@ -355,7 +353,6 @@ SettingPage {
                         //passwordInputText = ""
                         var passkey = passwordInputText.text.valueOf()
                         console.log("Validating", passkey)
-                        System.showKeyboard = false
 
                         console.log("Passkey is", passkey)
                         request(wifiAPIpath + 'security?passkey=' + passkey,
@@ -368,8 +365,6 @@ SettingPage {
                         passwordInputText.visible = false
                         connectButton.visible = true
 
-                        keyboard.currentString = ""
-
                         periodicRefresh.start()
                     }
                 }
@@ -386,7 +381,8 @@ SettingPage {
 
                 width: connectButton.width
                 visible: false
-                text: keyboard.currentString
+                text: "password"
+                /*hardcore until virtual keyboard works*/
             }
         }
     }