wimaMenu edited

src/FlightDisplay/FlightDisplayView.qml

@@ -551,8 +551,8 @@ QGCView {
             z:                      _panel.z + 4
             anchors.left:           parent.left
             anchors.bottom:         parent.bottom
-            anchors.leftMargin:     ScreenTools.defaultFontPixelHeight * 0.25
-            anchors.bottomMargin:   ScreenTools.defaultFontPixelHeight * 0.25
+            anchors.leftMargin:     ScreenTools.defaultFontPixelWidth
+            anchors.bottomMargin:   ScreenTools.defaultFontPixelWidth
 
 
             wimaController: wimaController

src/FlightDisplay/FlightDisplayWimaMenu.qml

 import QtQuick                  2.3
-import QtQuick.Controls         1.2
 import QtQuick.Controls.Styles  1.4
 import QtQuick.Dialogs          1.2
 import QtLocation               5.3
 import QtPositioning            5.3
+import QtQuick.Controls         2.4
 import QtQuick.Layouts          1.2
 
 import QGroundControl               1.0
@@ -19,7 +19,7 @@ import QGroundControl.FactControls  1.0
 
 Item {
     id:     _root
-    height: 700
+    height: 600
     width:  300
 
     property var wimaController // must be provided by the user
@@ -50,8 +50,12 @@ Item {
         return Qt.formatTime(t, 'hh:mm:ss')
     }
 
+
+    QGCPalette { id: qgcPal }
+
     // box containing all items
-    Rectangle {
+    Rectangle { // maybe replace with column and remove anchors => dynamic height:
+        id:             mainFrame
         anchors.left:   parent.left
         anchors.bottom: parent.bottom
         height:         enableWima.enableWimaBoolean ? parent.height : enableWima.height
@@ -83,27 +87,31 @@ Item {
             }
         }
 
-        Column {
-            id: mainColumn
+        Rectangle {
+            id: controllerFrame
             anchors.top: enableWima.bottom
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
-            anchors.margins:    ScreenTools.defaultFontPixelHeight * 0.4
-            spacing:            ScreenTools.defaultFontPixelHeight * 0.25
+            anchors.margins: ScreenTools.defaultFontPixelHeight *0.25
+            color: qgcPal.window
+            clip: true
+
 
+            ScrollView {
+                id:     scrollView
+                anchors.fill: parent
 
-            SectionHeader {
+                Column {
+                    /*SectionHeader {
                         id: settingsHeader
                         text: qsTr("Settings")
-            }
+                    }*/
+
                     GridLayout {
                         columns: 2
                         rowSpacing:         ScreenTools.defaultFontPixelHeight * 0.5
                         columnSpacing:      ScreenTools.defaultFontPixelHeight * 0.5
-                anchors.topMargin:  ScreenTools.defaultFontPixelHeight * 0.5
-                anchors.left:       parent.left
-                anchors.right:      parent.right
                         visible:            settingsHeader.checked
 
                         // Settings
@@ -137,17 +145,14 @@ Item {
 
                     }
 
-            SectionHeader{
+                    /*SectionHeader{
                         id: missionHeader
                         text: qsTr("Mission")
-            }
+                    }*/
                     GridLayout {
                         columns:            2
                         rowSpacing:         ScreenTools.defaultFontPixelHeight * 0.5
                         columnSpacing:      ScreenTools.defaultFontPixelHeight * 0.5
-                anchors.topMargin:  ScreenTools.defaultFontPixelHeight * 0.5
-                anchors.left:       parent.left
-                anchors.right:      parent.right
                         visible:            missionHeader.checked
 
                         QGCLabel { text: qsTr("Speed") }
@@ -186,7 +191,7 @@ Item {
                         }
 
 
-            }
+                    /*}
 
                     SectionHeader{
                         id: vehicleHeader
@@ -196,10 +201,7 @@ Item {
                         columns: 2
                         rowSpacing:         ScreenTools.defaultFontPixelHeight * 0.5
                         columnSpacing:      ScreenTools.defaultFontPixelHeight * 0.5
-                anchors.topMargin:  ScreenTools.defaultFontPixelHeight * 0.5
-                anchors.left:       parent.left
-                anchors.right:      parent.right
-                visible:            vehicleHeader.checked
+                        visible:            vehicleHeader.checked*/
 
                         QGCButton {
                             id: buttonUpload
@@ -246,10 +248,10 @@ Item {
 
                     }
 
-            SectionHeader {
+                    /*SectionHeader {
                         id: statsHeader
                         text: qsTr("Statistics")
-            }
+                    }*/
                     GridLayout {
                         columns: 2
                         rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5
@@ -278,6 +280,8 @@ Item {
                             font.pointSize: ScreenTools.smallFontPointSize
                         }
                     }
-        }
+                } // mainColumn
+            } // item
+        } // Rectangle
     }
 }