Move HDMI and resolution switch up

Author: julianoes

src/FlightMap/Widgets/PhotoVideoControl.qml

@@ -374,15 +374,6 @@ Rectangle {
                             onVisibleChanged:   gridLayout.dynamicRows += visible ? 1 : -1
                         }
 
-                        // Mavlink Camera Protocol active settings
-                        Repeater {
-                            model: _camera.activeSettings
-
-                            QGCLabel {
-                                text: _camera.getFact(modelData).shortDescription
-                            }
-                        }
-
                         QGCLabel {
                             text:               qsTr("HDMI Input")
                             visible:            QGroundControl.corePlugin.isHerelink
@@ -395,6 +386,15 @@ Rectangle {
                             onVisibleChanged:   gridLayout.dynamicRows += visible ? 1 : -1
                         }
 
+                        // Mavlink Camera Protocol active settings
+                        Repeater {
+                            model: _camera.activeSettings
+
+                            QGCLabel {
+                                text: _camera.getFact(modelData).shortDescription
+                            }
+                        }
+
                         QGCLabel {
                             text:               qsTr("Photo Mode")
                             visible:            _camera.capturesPhotos
@@ -468,6 +468,39 @@ Rectangle {
                             onValueChanged:     _camera.thermalOpacity = value
                         }
 
+                        Row {
+                            spacing: ScreenTools.defaultFontPixelWidth / 2
+                            visible: QGroundControl.corePlugin.isHerelink
+
+                            QGCButton {
+                                text: qsTr("HDMI 1")
+                                enabled: QGroundControl.videoManager.videoStreamControl.cameraInfoReceived && !QGroundControl.videoManager.videoStreamControl.settingInProgress && QGroundControl.videoManager.videoStreamControl.currentHdmiInput !== 0
+                                onClicked: {
+                                    console.log("HDMI 1 button clicked")
+                                    _videoStreamSettings.cameraId.rawValue = 0
+                                }
+                            }
+
+                            QGCButton {
+                                text: qsTr("HDMI 2")
+                                enabled: QGroundControl.videoManager.videoStreamControl.cameraInfoReceived && !QGroundControl.videoManager.videoStreamControl.settingInProgress && QGroundControl.videoManager.videoStreamControl.currentHdmiInput !== 1
+                                onClicked: {
+                                    _videoStreamSettings.cameraId.rawValue = 1
+                                }
+                            }
+                        }
+
+                        Row {
+                            spacing: ScreenTools.defaultFontPixelWidth / 2
+                            visible: QGroundControl.corePlugin.isHerelink
+
+                            QGCComboBox {
+                                model:              [ qsTr("720p"), qsTr("1080p") ]
+                                currentIndex:       _videoStreamSettings.resolution.rawValue
+                                onActivated:        (index) => { _videoStreamSettings.resolution.rawValue = index }
+                            }
+                        }
+
                         // Mavlink Camera Protocol active settings
                         Repeater {
                             model: _camera.activeSettings
@@ -523,39 +556,6 @@ Rectangle {
                             }
                         }
 
-                        Row {
-                            spacing: ScreenTools.defaultFontPixelWidth / 2
-                            visible: QGroundControl.corePlugin.isHerelink
-
-                            QGCButton {
-                                text: qsTr("HDMI 1")
-                                enabled: QGroundControl.videoManager.videoStreamControl.cameraInfoReceived && !QGroundControl.videoManager.videoStreamControl.settingInProgress && QGroundControl.videoManager.videoStreamControl.currentHdmiInput !== 0
-                                onClicked: {
-                                    console.log("HDMI 1 button clicked")
-                                    _videoStreamSettings.cameraId.rawValue = 0
-                                }
-                            }
-
-                            QGCButton {
-                                text: qsTr("HDMI 2")
-                                enabled: QGroundControl.videoManager.videoStreamControl.cameraInfoReceived && !QGroundControl.videoManager.videoStreamControl.settingInProgress && QGroundControl.videoManager.videoStreamControl.currentHdmiInput !== 1
-                                onClicked: {
-                                    _videoStreamSettings.cameraId.rawValue = 1
-                                }
-                            }
-                        }
-
-                        Row {
-                            spacing: ScreenTools.defaultFontPixelWidth / 2
-                            visible: QGroundControl.corePlugin.isHerelink
-
-                            QGCComboBox {
-                                model:              [ qsTr("720p"), qsTr("1080p") ]
-                                currentIndex:       _videoStreamSettings.resolution.rawValue
-                                onActivated:        (index) => { _videoStreamSettings.resolution.rawValue = index }
-                            }
-                        }
-
                         QGCComboBox {
                             Layout.fillWidth:   true
                             sizeToContents:     true