Skip to content

Q
qgroundcontrol
Unverified Commit b1c90168 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7124 from DonLakeFlyer/MobileCleanup 

Mobile visual cleanup
parents b86d386d 54d10575
Expand all Show whitespace changes
Inline Side-by-side
Showing with 381 additions and 483 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ b1c90168
...@@ -488,13 +488,13 @@ QGCView { ...@@ -488,13 +488,13 @@ QGCView {
exclusiveGroup: multiVehicleSelectorGroup exclusiveGroup: multiVehicleSelectorGroup
text: qsTr("Single") text: qsTr("Single")
checked: true checked: true
color: mapPal.text textColor: mapPal.text
} }
QGCRadioButton { QGCRadioButton {
exclusiveGroup: multiVehicleSelectorGroup exclusiveGroup: multiVehicleSelectorGroup
text: qsTr("Multi-Vehicle") text: qsTr("Multi-Vehicle")
color: mapPal.text textColor: mapPal.text
} }
} }
......
src/MissionManager/QGCMapCircle.Facts.json
View file @ b1c90168
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"name": "Radius", "name": "Radius",
"shortDescription": "Radius for geofence circle.", "shortDescription": "Radius for geofence circle.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 1,
"min": 0.1, "min": 0.1,
"units": "m" "units": "m"
} }
......
src/PlanView/GeoFenceEditor.qml
View file @ b1c90168
...@@ -10,13 +10,9 @@ import QGroundControl.FactControls 1.0 ...@@ -10,13 +10,9 @@ import QGroundControl.FactControls 1.0
QGCFlickable { QGCFlickable {
id: root id: root
width: availableWidth contentHeight: geoFenceEditorRect.height
height: availableHeight
contentHeight: editorColumn.height
clip: true clip: true
property real availableWidth
property real availableHeight
property var myGeoFenceController property var myGeoFenceController
property var flightMap property var flightMap
...@@ -24,14 +20,10 @@ QGCFlickable { ...@@ -24,14 +20,10 @@ QGCFlickable {
readonly property real _margin: ScreenTools.defaultFontPixelWidth / 2 readonly property real _margin: ScreenTools.defaultFontPixelWidth / 2
readonly property real _radius: ScreenTools.defaultFontPixelWidth / 2 readonly property real _radius: ScreenTools.defaultFontPixelWidth / 2
Column {
id: editorColumn
anchors.left: parent.left
anchors.right: parent.right
Rectangle { Rectangle {
id: geoFenceEditorRect id: geoFenceEditorRect
width: parent.width anchors.left: parent.left
anchors.right: parent.right
height: geoFenceItems.y + geoFenceItems.height + (_margin * 2) height: geoFenceItems.y + geoFenceItems.height + (_margin * 2)
radius: _radius radius: _radius
color: qgcPal.missionItemEditor color: qgcPal.missionItemEditor
...@@ -213,21 +205,10 @@ QGCFlickable { ...@@ -213,21 +205,10 @@ QGCFlickable {
Repeater { Repeater {
model: myGeoFenceController.polygons model: myGeoFenceController.polygons
QGCColoredImage { QGCButton {
width: ScreenTools.defaultFontPixelHeight text: qsTr("Del")
height: width
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.text
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: myGeoFenceController.deletePolygon(index)
property int _polygonIndex: index
QGCMouseArea {
fillItem: parent
onClicked: myGeoFenceController.deletePolygon(parent._polygonIndex)
}
} }
} }
} // GridLayout } // GridLayout
...@@ -314,21 +295,10 @@ QGCFlickable { ...@@ -314,21 +295,10 @@ QGCFlickable {
Repeater { Repeater {
model: myGeoFenceController.circles model: myGeoFenceController.circles
QGCColoredImage { QGCButton {
width: ScreenTools.defaultFontPixelHeight text: qsTr("Del")
height: width
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.text
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: myGeoFenceController.deleteCircle(index)
property int _circleIndex: index
QGCMouseArea {
fillItem: parent
onClicked: myGeoFenceController.deleteCircle(parent._polygonIndex)
}
} }
} }
} // GridLayout } // GridLayout
...@@ -336,5 +306,4 @@ QGCFlickable { ...@@ -336,5 +306,4 @@ QGCFlickable {
} }
} }
} // Rectangle } // Rectangle
}
} }
src/PlanView/MissionItemEditor.qml
View file @ b1c90168
...@@ -15,7 +15,7 @@ import QGroundControl.Palette 1.0 ...@@ -15,7 +15,7 @@ import QGroundControl.Palette 1.0
/// Mission item edit control /// Mission item edit control
Rectangle { Rectangle {
id: _root id: _root
height: editorLoader.y + (editorLoader.visible ? editorLoader.height : 0) + (_margin * 2) height: editorLoader.visible ? (editorLoader.y + editorLoader.height + (_margin * 2)) : (commandPicker.y + commandPicker.height + _margin / 2)
color: _currentItem ? qgcPal.missionItemEditor : qgcPal.windowShade color: _currentItem ? qgcPal.missionItemEditor : qgcPal.windowShade
radius: _radius radius: _radius
...@@ -90,8 +90,7 @@ Rectangle { ...@@ -90,8 +90,7 @@ Rectangle {
sourceSize.height: _hamburgerSize sourceSize.height: _hamburgerSize
source: "qrc:/qmlimages/Hamburger.svg" source: "qrc:/qmlimages/Hamburger.svg"
visible: missionItem.isCurrentItem && missionItem.sequenceNumber !== 0 visible: missionItem.isCurrentItem && missionItem.sequenceNumber !== 0
color: qgcPal.windowShade color: qgcPal.text
} }
QGCMouseArea { QGCMouseArea {
......
src/PlanView/PlanView.qml
View file @ b1c90168
...@@ -760,14 +760,6 @@ QGCView { ...@@ -760,14 +760,6 @@ QGCView {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: ScreenTools.defaultFontPixelWidth anchors.leftMargin: ScreenTools.defaultFontPixelWidth
readonly property real _buttonRadius: ScreenTools.defaultFontPixelHeight * 0.75 readonly property real _buttonRadius: ScreenTools.defaultFontPixelHeight * 0.75
QGCColoredImage {
width: height
height: ScreenTools.defaultFontPixelWidth * 2.5
sourceSize.height: height
source: "qrc:/res/waypoint.svg"
color: qgcPal.text
anchors.verticalCenter: parent.verticalCenter
}
QGCLabel { QGCLabel {
text: qsTr("Plan") text: qsTr("Plan")
color: qgcPal.text color: qgcPal.text
...@@ -831,7 +823,7 @@ QGCView { ...@@ -831,7 +823,7 @@ QGCView {
QGCListView { QGCListView {
id: missionItemEditorListView id: missionItemEditorListView
anchors.fill: parent anchors.fill: parent
spacing: ScreenTools.defaultFontPixelHeight * 0.5 spacing: ScreenTools.defaultFontPixelHeight / 4
orientation: ListView.Vertical orientation: ListView.Vertical
model: _missionController.visualItems model: _missionController.visualItems
cacheBuffer: Math.max(height * 2, 0) cacheBuffer: Math.max(height * 2, 0)
...@@ -865,9 +857,9 @@ QGCView { ...@@ -865,9 +857,9 @@ QGCView {
GeoFenceEditor { GeoFenceEditor {
anchors.top: rightControls.bottom anchors.top: rightControls.bottom
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5 anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5
anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
availableHeight: ScreenTools.availableHeight
myGeoFenceController: _geoFenceController myGeoFenceController: _geoFenceController
flightMap: editorMap flightMap: editorMap
visible: _editingLayer == _layerGeoFence visible: _editingLayer == _layerGeoFence
......
src/PlanView/RallyPointItemEditor.qml
View file @ b1c90168
...@@ -50,7 +50,7 @@ Rectangle { ...@@ -50,7 +50,7 @@ Rectangle {
color: _outerTextColor color: _outerTextColor
} }
Image { QGCColoredImage {
id: hamburger id: hamburger
anchors.rightMargin: _margin anchors.rightMargin: _margin
anchors.right: parent.right anchors.right: parent.right
...@@ -59,6 +59,7 @@ Rectangle { ...@@ -59,6 +59,7 @@ Rectangle {
height: width height: width
sourceSize.height: height sourceSize.height: height
source: "qrc:/qmlimages/Hamburger.svg" source: "qrc:/qmlimages/Hamburger.svg"
color: qgcPal.text
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
......
src/PositionManager/PositionManager.cpp
View file @ b1c90168
...@@ -36,7 +36,6 @@ void QGCPositionManager::setToolbox(QGCToolbox *toolbox) ...@@ -36,7 +36,6 @@ void QGCPositionManager::setToolbox(QGCToolbox *toolbox)
if(!_defaultSource) { if(!_defaultSource) {
//-- Otherwise, create a default one //-- Otherwise, create a default one
_defaultSource = QGeoPositionInfoSource::createDefaultSource(this); _defaultSource = QGeoPositionInfoSource::createDefaultSource(this);
qDebug() << _defaultSource;
} }
_simulatedSource = new SimulatedPosition(); _simulatedSource = new SimulatedPosition();
......
src/QmlControls/QGCCheckBox.qml
View file @ b1c90168
...@@ -6,39 +6,31 @@ import QGroundControl.Palette 1.0 ...@@ -6,39 +6,31 @@ import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
CheckBox { CheckBox {
activeFocusOnPress: true property color textColor: _qgcPal.text
property bool textBold: false
property real textFontPointSize: ScreenTools.defaultFontPointSize
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool _noText: text === ""
property real _radius: ScreenTools.defaultFontPixelHeight * 0.16
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } activeFocusOnPress: true
style: CheckBoxStyle { style: CheckBoxStyle {
label: Item { label: Item {
implicitWidth: text.implicitWidth + 2 implicitWidth: _noText ? 0 : text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25
implicitHeight: ScreenTools.implicitCheckBoxHeight implicitHeight: _noText ? 0 : Math.max(text.implicitHeight, ScreenTools.checkBoxIndicatorSize)
baselineOffset: text.baselineOffset baselineOffset: text.baselineOffset
Rectangle {
anchors.margins: -1
anchors.leftMargin: -3
anchors.rightMargin: -3
anchors.fill: text
visible: control.activeFocus
height: 6
radius: 3
color: "#224f9fef"
border.color: "#47b"
opacity: 0.6
}
Text { Text {
id: text id: text
text: control.text text: control.text
antialiasing: true font.pointSize: textFontPointSize
font.pointSize: ScreenTools.defaultFontPointSize font.bold: control.textBold
font.family: ScreenTools.normalFontFamily color: control.textColor
color: control.__qgcPal.text anchors.centerIn: parent
anchors.verticalCenter: parent.verticalCenter }
} }
} // label
indicator: Item { indicator: Item {
implicitWidth: ScreenTools.checkBoxIndicatorSize implicitWidth: ScreenTools.checkBoxIndicatorSize
...@@ -46,56 +38,18 @@ CheckBox { ...@@ -46,56 +38,18 @@ CheckBox {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: -1 radius: _radius
color: "#44ffffff" border.color: "black"
radius: baserect.radius opacity: control.checkedState === Qt.PartiallyChecked ? 0.5 : 1
}
Rectangle { Rectangle {
id: baserect anchors.margins: parent.height / 4
property var enabledGradient: Gradient {
GradientStop {color: "#eee" ; position: 0}
GradientStop {color: control.pressed ? "#eee" : "#fff" ; position: 0.1}
GradientStop {color: "#fff" ; position: 1}
}
property var disabledGradient: Gradient {
GradientStop {color: "#999" ; position: 0}
GradientStop {color: __qgcPal.textField ; position: 0.1}
GradientStop {color: __qgcPal.textField ; position: 0.9}
GradientStop {color: "#999" ; position: 1}
}
gradient: control.enabled ? enabledGradient : disabledGradient
radius: ScreenTools.defaultFontPixelHeight * 0.16
anchors.fill: parent anchors.fill: parent
border.color: control.activeFocus ? "#47b" : "#999" radius: _radius
opacity: control.enabled ? 1 : 0.5 color: "black"
visible: control.checkedState === Qt.Checked
} }
Image {
source: "/qmlimages/check.png"
opacity: control.checkedState === Qt.Checked ? control.enabled ? 1 : 0.5 : 0
anchors.centerIn: parent
anchors.verticalCenterOffset: 1
Behavior on opacity {NumberAnimation {duration: 80}}
} }
Rectangle {
anchors.fill: parent
anchors.margins: Math.round(baserect.radius)
antialiasing: true
gradient: Gradient {
GradientStop {color: control.pressed ? "#555" : "#999" ; position: 0}
GradientStop {color: "#555" ; position: 1}
} }
radius: baserect.radius - 1
anchors.centerIn: parent
anchors.alignWhenCentered: true
border.color: "#222"
Behavior on opacity {NumberAnimation {duration: 80}}
opacity: control.checkedState === Qt.PartiallyChecked ? control.enabled ? 1 : 0.5 : 0
} }
} // indicator
} // style
} }
src/QmlControls/QGCMouseArea.qml
View file @ b1c90168
import QtQuick 2.3 import QtQuick 2.11
import QGroundControl 1.0 import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
......
src/QmlControls/QGCRadioButton.qml
View file @ b1c90168
...@@ -6,41 +6,30 @@ import QGroundControl.Palette 1.0 ...@@ -6,41 +6,30 @@ import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
RadioButton { RadioButton {
property var color: qgcPal.text ///< Text color property color textColor: _qgcPal.text
property int textStyle: Text.Normal
property color textStyleColor: qgcPal.text
property bool textBold: false property bool textBold: false
property var qgcPal: QGCPalette { colorGroupEnabled: enabled } property real textFontPointSize: ScreenTools.defaultFontPointSize
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool _noText: text === ""
activeFocusOnPress: true
style: RadioButtonStyle { style: RadioButtonStyle {
spacing: _noText ? 0 : ScreenTools.defaultFontPixelWidth / 2
label: Item { label: Item {
implicitWidth: text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25 implicitWidth: _noText ? 0 : text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25
implicitHeight: ScreenTools.implicitRadioButtonHeight implicitHeight: _noText ? 0 : Math.max(text.implicitHeight, ScreenTools.radioButtonIndicatorSize)
baselineOffset: text.y + text.baselineOffset baselineOffset: text.y + text.baselineOffset
Rectangle {
anchors.fill: text
anchors.margins: -1
anchors.leftMargin: -3
anchors.rightMargin:-3
visible: control.activeFocus
height: ScreenTools.defaultFontPixelWidth * 0.25
radius: height * 0.5
color: "#224f9fef"
border.color: "#47b"
opacity: 0.6
}
Text { Text {
id: text id: text
text: control.text text: control.text
font.pointSize: ScreenTools.defaultFontPointSize font.pointSize: textFontPointSize
font.family: ScreenTools.normalFontFamily
font.bold: control.textBold font.bold: control.textBold
antialiasing: true color: control.textColor
color: control.color
style: control.textStyle
styleColor: control.textStyleColor
anchors.centerIn: parent anchors.centerIn: parent
} }
} }
...@@ -49,9 +38,9 @@ RadioButton { ...@@ -49,9 +38,9 @@ RadioButton {
width: ScreenTools.radioButtonIndicatorSize width: ScreenTools.radioButtonIndicatorSize
height: width height: width
color: "white" color: "white"
border.color: control.qgcPal.text border.color: "black"
antialiasing: true
radius: height / 2 radius: height / 2
opacity: control.enabled ? 1 : 0.5
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
...@@ -60,7 +49,7 @@ RadioButton { ...@@ -60,7 +49,7 @@ RadioButton {
antialiasing: true antialiasing: true
radius: height / 2 radius: height / 2
color: "black" color: "black"
opacity: control.checked ? (control.enabled ? 1 : 0.5) : 0 visible: control.checked
} }
} }
} }
......
src/QmlControls/ToolStrip.qml
View file @ b1c90168
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment