zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix for small screens

QGC4.4
Don Gagne 9 years ago
parent
5a50828671
commit
0c7e970a69
7 changed files with 156 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/QmlControls/QGCLabel.qml
  2. 36
      src/QtLocationPlugin/QMLControl/OfflineMap.qml
  3. 171
      src/ui/MainWindowLeftPanel.qml
  4. 5
      src/ui/preferences/GeneralSettings.qml
  5. 4
      src/ui/preferences/LinkSettings.qml
  6. 6
      src/ui/preferences/MavlinkSettings.qml
  7. 67
      src/ui/preferences/MockLink.qml

1
src/QmlControls/QGCLabel.qml
Unescape View File

@ -11,6 +11,7 @@ Text { @@ -11,6 +11,7 @@ Text {
property bool enabled: true
font.pixelSize: ScreenTools.defaultFontPixelSize
fontSizeMode: Text.HorizontalFit
color: __qgcPal.text
antialiasing: true
}

36
src/QtLocationPlugin/QMLControl/OfflineMap.qml
Unescape View File

@ -156,6 +156,7 @@ Rectangle { @@ -156,6 +156,7 @@ Rectangle {
errorDialog.visible = false
}
}
Rectangle {
id: _offlineMapTopRect
width: parent.width
@ -180,25 +181,29 @@ Rectangle { @@ -180,25 +181,29 @@ Rectangle {
}
}
}
QGCFlickable {
id: _tileSetList
clip: true
anchors.top: _offlineMapTopRect.bottom
width: parent.width
height: parent.height - _offlineMapTopRect.height
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: _optionsButton.top
contentHeight: _cacheList.height
contentWidth: parent.width
flickableDirection: Flickable.VerticalFlick
Column {
id: _cacheList
width: _offlineMapRoot.width
width: Math.min(parent.width, (ScreenTools.defaultFontPixelWidth * 50).toFixed(0))
anchors.margins: ScreenTools.defaultFontPixelWidth
spacing: (ScreenTools.defaultFontPixelHeight * 0.5).toFixed(0)
anchors.horizontalCenter: parent.horizontalCenter
OfflineMapButton {
text: "Add new set"
width: (ScreenTools.defaultFontPixelWidth * 50).toFixed(0)
height: (ScreenTools.defaultFontPixelHeight * 2).toFixed(0)
anchors.horizontalCenter: parent.horizontalCenter
text: "Add new set"
anchors.left: parent.left
anchors.right: parent.right
height: (ScreenTools.defaultFontPixelHeight * 2).toFixed(0)
onClicked: {
_offlineMapRoot._currentSelection = null
showMap()
@ -207,12 +212,12 @@ Rectangle { @@ -207,12 +212,12 @@ Rectangle {
Repeater {
model: QGroundControl.mapEngineManager.tileSets
delegate: OfflineMapButton {
text: object.name
size: object.downloadStatus
complete: object.complete
width: (ScreenTools.defaultFontPixelWidth * 50).toFixed(0)
height: (ScreenTools.defaultFontPixelHeight * 2).toFixed(0)
anchors.horizontalCenter: parent.horizontalCenter
text: object.name
size: object.downloadStatus
complete: object.complete
anchors.left: parent.left
anchors.right: parent.right
height: (ScreenTools.defaultFontPixelHeight * 2).toFixed(0)
onClicked: {
_offlineMapRoot._currentSelection = object
showInfo()
@ -221,16 +226,17 @@ Rectangle { @@ -221,16 +226,17 @@ Rectangle {
}
}
}
QGCButton {
id: _optionsButton
text: "Options"
width: ScreenTools.defaultFontPixelWidth * 10
visible: _tileSetList.visible
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.margins: ScreenTools.defaultFontPixelWidth
onClicked: showOptions()
}
//-- Offline Map Definition
Rectangle {
id: _mapView

171
src/ui/MainWindowLeftPanel.qml
Unescape View File

@ -42,6 +42,7 @@ Item { @@ -42,6 +42,7 @@ Item {
readonly property int __animationDuration: 100
readonly property real __closeButtonSize: ScreenTools.defaultFontPixelHeight * 2
readonly property real _margins: ScreenTools.defaultFontPixelHeight / 2
onVisibleChanged: {
//-- Unselect any selected button
@ -129,103 +130,113 @@ Item { @@ -129,103 +130,113 @@ Item {
// This is the menu dialog panel which is anchored to the left edge
Rectangle {
id: __leftMenu
width: (tbButtonWidth * 2) + (tbSpacing * 4) + 1
width: ScreenTools.defaultFontPixelWidth * 12
anchors.left: parent.left
anchors.top: __topSeparator.bottom
anchors.bottom: parent.bottom
color: __qgcPal.windowShadeDark
ExclusiveGroup { id: panelActionGroup }
QGCFlickable {
anchors.fill: parent
contentHeight: buttonColumn.height + _margins
flickableDirection: Flickable.VerticalFlick
clip: true
Column {
width: parent.width
spacing: ScreenTools.defaultFontPixelHeight
Item {
width: 1
height: ScreenTools.defaultFontPixelHeight * 0.5
}
QGCLabel {
text: "Preferences"
anchors.horizontalCenter: parent.horizontalCenter
}
QGCButton {
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "General"
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "GeneralSettings.qml") {
__rightPanel.source = "GeneralSettings.qml"
ExclusiveGroup { id: panelActionGroup }
Column {
id: buttonColumn
anchors.leftMargin: _margins
anchors.rightMargin: _margins
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: _margins
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
QGCLabel {
text: "Preferences"
anchors.horizontalCenter: parent.horizontalCenter
}
QGCButton {
anchors.left: parent.left
anchors.right: parent.right
text: "General"
exclusiveGroup: panelActionGroup
onClicked: {
if(__rightPanel.source != "GeneralSettings.qml") {
__rightPanel.source = "GeneralSettings.qml"
}
checked = true
}
checked = true
}
}
QGCButton {
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Comm Links"
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "LinkSettings.qml") {
__rightPanel.source = "LinkSettings.qml"
QGCButton {
anchors.left: parent.left
anchors.right: parent.right
text: "Comm Links"
exclusiveGroup: panelActionGroup
onClicked: {
if(__rightPanel.source != "LinkSettings.qml") {
__rightPanel.source = "LinkSettings.qml"
}
checked = true
}
checked = true
}
}
QGCButton {
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Offline Maps"
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "OfflineMap.qml") {
__rightPanel.source = "OfflineMap.qml"
QGCButton {
anchors.left: parent.left
anchors.right: parent.right
text: "Offline Maps"
exclusiveGroup: panelActionGroup
onClicked: {
if(__rightPanel.source != "OfflineMap.qml") {
__rightPanel.source = "OfflineMap.qml"
}
checked = true
}
checked = true
}
}
QGCButton {
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "MavLink"
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "MavlinkSettings.qml") {
__rightPanel.source = "MavlinkSettings.qml"
QGCButton {
anchors.left: parent.left
anchors.right: parent.right
text: "MavLink"
exclusiveGroup: panelActionGroup
onClicked: {
if(__rightPanel.source != "MavlinkSettings.qml") {
__rightPanel.source = "MavlinkSettings.qml"
}
checked = true
}
checked = true
}
}
QGCButton {
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Mock Link"
visible: ScreenTools.isDebug
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "MockLink.qml") {
__rightPanel.source = "MockLink.qml"
QGCButton {
anchors.left: parent.left
anchors.right: parent.right
text: "Mock Link"
visible: ScreenTools.isDebug
exclusiveGroup: panelActionGroup
onClicked: {
if(__rightPanel.source != "MockLink.qml") {
__rightPanel.source = "MockLink.qml"
}
checked = true
}
checked = true
}
}
QGCButton {
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Debug"
visible: ScreenTools.isDebug
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "DebugWindow.qml") {
__rightPanel.source = "DebugWindow.qml"
QGCButton {
anchors.left: parent.left
anchors.right: parent.right
text: "Debug"
visible: ScreenTools.isDebug
exclusiveGroup: panelActionGroup
onClicked: {
if(__rightPanel.source != "DebugWindow.qml") {
__rightPanel.source = "DebugWindow.qml"
}
checked = true
}
checked = true
}
}
}

5
src/ui/preferences/GeneralSettings.qml
Unescape View File

@ -49,14 +49,13 @@ Rectangle { @@ -49,14 +49,13 @@ Rectangle {
clip: true
anchors.fill: parent
contentHeight: settingsColumn.height
contentWidth: _generalRoot.width
flickableDirection: Flickable.VerticalFlick
contentWidth: settingsColumn.width
Column {
id: settingsColumn
width: _generalRoot.width
anchors.margins: ScreenTools.defaultFontPixelWidth
spacing: ScreenTools.defaultFontPixelHeight / 2
QGCLabel {
text: "General Settings"
font.pixelSize: ScreenTools.mediumFontPixelSize

4
src/ui/preferences/LinkSettings.qml
Unescape View File

@ -134,7 +134,6 @@ Rectangle { @@ -134,7 +134,6 @@ Rectangle {
}
}
QGCButton {
width: ScreenTools.defaultFontPixelWidth * 10
text: "Edit"
enabled: _currentSelection && !_currentSelection.link
onClicked: {
@ -142,14 +141,12 @@ Rectangle { @@ -142,14 +141,12 @@ Rectangle {
}
}
QGCButton {
width: ScreenTools.defaultFontPixelWidth * 10
text: "Add"
onClicked: {
_linkRoot.openCommSettings(null)
}
}
QGCButton {
width: ScreenTools.defaultFontPixelWidth * 10
text: "Connect"
enabled: _currentSelection && !_currentSelection.link
onClicked: {
@ -158,7 +155,6 @@ Rectangle { @@ -158,7 +155,6 @@ Rectangle {
}
}
QGCButton {
width: ScreenTools.defaultFontPixelWidth * 10
text: "Disconnect"
enabled: _currentSelection && _currentSelection.link
onClicked: {

6
src/ui/preferences/MavlinkSettings.qml
Unescape View File

@ -48,14 +48,14 @@ Rectangle { @@ -48,14 +48,14 @@ Rectangle {
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
contentHeight: settingsColumn.height
contentWidth: __mavlinkRoot.width
flickableDirection: Flickable.VerticalFlick
contentWidth: settingsColumn.width
Column {
id: settingsColumn
width: __mavlinkRoot.width
spacing: ScreenTools.defaultFontPixelHeight
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.top: parent.top
QGCLabel {
text: "MavLink Settings"
font.pixelSize: ScreenTools.mediumFontPixelSize

67
src/ui/preferences/MockLink.qml
Unescape View File

@ -29,39 +29,48 @@ import QGroundControl.Palette 1.0 @@ -29,39 +29,48 @@ import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
Rectangle {
color: qgcPal.window
color: qgcPal.window
anchors.fill: parent
QGCPalette { id: qgcPal; colorGroupEnabled: true }
Column {
anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
QGCFlickable {
anchors.fill: parent
contentWidth: column.width
contentHeight: column.height
clip: true
QGCButton {
text: "PX4 Vehicle"
onClicked: QGroundControl.startPX4MockLink(sendStatusText.checked)
}
QGCButton {
text: "APM ArduCopter Vehicle"
onClicked: QGroundControl.startAPMArduCopterMockLink(sendStatusText.checked)
}
QGCButton {
text: "APM ArduPlane Vehicle"
onClicked: QGroundControl.startAPMArduPlaneMockLink(sendStatusText.checked)
}
QGCButton {
text: "Generic Vehicle"
onClicked: QGroundControl.startGenericMockLink(sendStatusText.checked)
}
QGCCheckBox {
id: sendStatusText
text: "Send status text + voice"
}
QGCButton {
text: "Stop All MockLinks"
onClicked: QGroundControl.stopAllMockLinks()
Column {
id: column
anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
QGCButton {
text: "PX4 Vehicle"
onClicked: QGroundControl.startPX4MockLink(sendStatusText.checked)
}
QGCButton {
text: "APM ArduCopter Vehicle"
onClicked: QGroundControl.startAPMArduCopterMockLink(sendStatusText.checked)
}
QGCButton {
text: "APM ArduPlane Vehicle"
onClicked: QGroundControl.startAPMArduPlaneMockLink(sendStatusText.checked)
}
QGCButton {
text: "Generic Vehicle"
onClicked: QGroundControl.startGenericMockLink(sendStatusText.checked)
}
QGCCheckBox {
id: sendStatusText
text: "Send status text + voice"
}
QGCButton {
text: "Stop All MockLinks"
onClicked: QGroundControl.stopAllMockLinks()
}
}
}
}

Write Preview
Loading…
Cancel
Save