Skip to content

Q
qgroundcontrol
Commit 2b28400e authored by Gus Grubba's avatar Gus Grubba Committed by Lorenz Meier
Browse files
Options

UI cleanup (WIP)

parent f63c1ee6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 146 deletions
src/AnalyzeView/MAVLinkInspectorPage.qml
View file @ 2b28400e
This diff is collapsed.
src/QmlControls/MAVLinkChart.qml
View file @ 2b28400e
...@@ -80,6 +80,7 @@ ChartView { ...@@ -80,6 +80,7 @@ ChartView {
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 1.5 anchors.topMargin: ScreenTools.defaultFontPixelHeight * 1.5
spacing: ScreenTools.defaultFontPixelWidth * 2 spacing: ScreenTools.defaultFontPixelWidth * 2
visible: chartController !== null
GridLayout { GridLayout {
columns: 2 columns: 2
columnSpacing: ScreenTools.defaultFontPixelWidth columnSpacing: ScreenTools.defaultFontPixelWidth
......
src/QmlControls/MAVLinkMessageButton.qml
View file @ 2b28400e
...@@ -21,8 +21,8 @@ Button { ...@@ -21,8 +21,8 @@ Button {
leftPadding: ScreenTools.defaultFontPixelWidth leftPadding: ScreenTools.defaultFontPixelWidth
rightPadding: leftPadding rightPadding: leftPadding
property real _compIDWidth: ScreenTools.defaultFontPixelWidth * 3 property real _compIDWidth: ScreenTools.defaultFontPixelWidth * 2.5
property real _hzWidth: ScreenTools.defaultFontPixelWidth * 7 property real _hzWidth: ScreenTools.defaultFontPixelWidth * 5
property real _nameWidth: nameLabel.contentWidth property real _nameWidth: nameLabel.contentWidth
background: Rectangle { background: Rectangle {
...@@ -40,17 +40,20 @@ Button { ...@@ -40,17 +40,20 @@ Button {
QGCLabel { QGCLabel {
text: control.compID text: control.compID
color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
font.pointSize: ScreenTools.smallFontPointSize
Layout.minimumWidth: _compIDWidth Layout.minimumWidth: _compIDWidth
} }
QGCLabel { QGCLabel {
id: nameLabel id: nameLabel
text: control.text text: control.text
color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
Layout.fillWidth: true font.pointSize: ScreenTools.smallFontPointSize
Layout.fillWidth: true
} }
QGCLabel { QGCLabel {
color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
text: messageHz.toFixed(1) + 'Hz' text: messageHz.toFixed(1) + 'Hz'
font.pointSize: ScreenTools.smallFontPointSize
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
Layout.minimumWidth: _hzWidth Layout.minimumWidth: _hzWidth
} }
......
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