UIname added

[mardrone] / mardrone / ardrone_harmattan.qml

diff --git a/mardrone/ardrone_harmattan.qml b/mardrone/ardrone_harmattan.qml
index 84490ce..4cd3c8c 100644 (file)
--- a/mardrone/ardrone_harmattan.qml
+++ b/mardrone/ardrone_harmattan.qml
@@ -71,6 +71,7 @@ PageStackWindow {
         Text {
             y:50
  //           visible:drone.confUseAccel
+            visible:drone.confShowDebug
             color: "#00FF00"
             id: droneCtrlValues
             font.pixelSize:25
@@ -156,7 +157,7 @@ PageStackWindow {
             anchors.left:parent.left
             anchors.bottom:parent.bottom
             anchors.margins:10
-  //          joyBackground: ""
+            joyBackground: ""
             onYvChanged:{drone.vVelocity=-1*yv/200.0;}
             onXvChanged:{drone.yaw=xv/200.0;}
             onPressedChanged: { drone.ctrlActive=pressed;}
@@ -166,7 +167,7 @@ PageStackWindow {
              visible: !drone.confUseJoyStick
             id:rj
 
-      //      joyBackground: ""
+            joyBackground: ""
             anchors.right:parent.right
             anchors.bottom:parent.bottom
             width:200;height:200;
@@ -221,10 +222,10 @@ PageStackWindow {
             }
         }
         Button {
-            x:400;y:100
-            width:120
+            x:500
+            width:140
             id:emergencyButton
-            anchors.top:parent.top
+            anchors.bottom:parent.bottom
 
             anchors.margins:15
             text:"Energency";
@@ -252,8 +253,6 @@ PageStackWindow {
 
      Component.onCompleted: {
          if (mainpageComponent.status != Component.Ready)
-             //        pageStack.push(mainpageComponent);
-             //  else
                      console.log("Error loading component:", mainpageComponent.errorString());
          dialogComponent = Qt.createComponent("ConfigDialog.qml");