Update for new controls usage

src/PlanView/SurveyItemEditor.qml

@@ -54,7 +54,25 @@ Rectangle {
         anchors.top:        parent.top
         anchors.left:       parent.left
         anchors.right:      parent.right
+
+        ColumnLayout {
+            anchors.left:   parent.left
+            anchors.right:  parent.right
+            spacing:        _margin
+            visible:        !missionItem.surveyAreaPolygon.isValid
+
+            QGCLabel {
+                Layout.fillWidth:   true
+                wrapMode:           Text.WordWrap
+                text:               qsTr("Use the Polygon Tools to create the polygon which outlines your survey area.")
+            }
+        }
+
+        Column {
+            anchors.left:   parent.left
+            anchors.right:  parent.right
             spacing:        _margin
+            visible:        missionItem.surveyAreaPolygon.isValid
 
             QGCTabBar {
                 id:             tabBar
@@ -382,7 +400,8 @@ Rectangle {
                     Layout.fillWidth:   true
                     visible:            presetsStatsHeader.checked
                 }
-        } // Camera Column
+            } // Main editing column
+        } // Top level  Column
 
         Component {
             id: savePresetDialog
@@ -418,4 +437,17 @@ Rectangle {
             }
         }
     }
+
+    KMLOrSHPFileDialog {
+        id:             kmlOrSHPLoadDialog
+        title:          qsTr("Select Polygon File")
+        selectExisting: true
+
+        onAcceptedForLoad: {
+            missionItem.surveyAreaPolygon.loadKMLOrSHPFile(file)
+            missionItem.resetState = false
+            //editorMap.mapFitFunctions.fitMapViewportToMissionItems()
+            close()
+        }
+    }
 } // Rectangle