Browse Source

Merge pull request #3567 from DonLakeFlyer/SettingsRealEstate

Settings real estate
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
3602123230
  1. 2
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  2. 16
      src/ui/preferences/GeneralSettings.qml
  3. 13
      src/ui/preferences/LinkSettings.qml
  4. 9
      src/ui/preferences/MavlinkSettings.qml

2
src/FlightDisplay/FlightDisplayViewWidgets.qml

@ -441,7 +441,7 @@ Item {
QGCLabel { QGCLabel {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
color: qgcPal.button color: _lightWidgetBorders ? qgcPal.mapWidgetBorderDark : qgcPal.mapWidgetBorderLight
text: "Click in map to move vehicle" text: "Click in map to move vehicle"
visible: _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying visible: _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
} }

16
src/ui/preferences/GeneralSettings.qml

@ -43,22 +43,6 @@ Rectangle {
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
spacing: ScreenTools.defaultFontPixelHeight / 2 spacing: ScreenTools.defaultFontPixelHeight / 2
QGCLabel {
text: qsTr("General Settings")
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
width: parent.width
color: qgcPal.text
}
Item {
height: ScreenTools.defaultFontPixelHeight / 2
width: parent.width
}
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Base UI Font Point Size //-- Base UI Font Point Size
Row { Row {

13
src/ui/preferences/LinkSettings.qml

@ -59,19 +59,6 @@ Rectangle {
width: _linkRoot.width width: _linkRoot.width
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
spacing: ScreenTools.defaultFontPixelHeight / 2 spacing: ScreenTools.defaultFontPixelHeight / 2
QGCLabel {
text: qsTr("Comm Link Settings")
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
width: parent.width
color: qgcPal.button
}
Item {
height: ScreenTools.defaultFontPixelHeight / 2
width: parent.width
}
Repeater { Repeater {
model: QGroundControl.linkManager.linkConfigurations model: QGroundControl.linkManager.linkConfigurations
delegate: delegate:

9
src/ui/preferences/MavlinkSettings.qml

@ -40,15 +40,6 @@ Rectangle {
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
QGCLabel {
text: qsTr("MavLink Settings")
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
width: parent.width
color: qgcPal.button
}
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- System ID //-- System ID
Row { Row {

Loading…
Cancel
Save