Commit 95e3c1b5 authored by Don Gagne's avatar Don Gagne

Fact control now use QGC controls as base

parent ad5cde3b
...@@ -4,13 +4,14 @@ import QtQuick.Controls.Styles 1.2 ...@@ -4,13 +4,14 @@ import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
CheckBox { QGCCheckBox {
property Fact fact: Fact { value: 0 } property Fact fact: Fact { value: 0 }
property variant checkedValue: 1 property variant checkedValue: 1
property variant uncheckedValue: 0 property variant uncheckedValue: 0
property var __qgcpal: QGCPalette { colorGroup: QGCPalette.Active } property var __qgcpal: QGCPalette { colorGroupEnabled: true }
partiallyCheckedEnabled: fact.value != checkedValue && fact.value != uncheckedValue partiallyCheckedEnabled: fact.value != checkedValue && fact.value != uncheckedValue
checkedState: fact.value == checkedValue ? Qt.Checked : (fact.value == uncheckedValue ? Qt.Unchecked : Qt.PartiallyChecked) checkedState: fact.value == checkedValue ? Qt.Checked : (fact.value == uncheckedValue ? Qt.Unchecked : Qt.PartiallyChecked)
...@@ -20,11 +21,4 @@ CheckBox { ...@@ -20,11 +21,4 @@ CheckBox {
onClicked: { onClicked: {
fact.value = checked ? checkedValue : uncheckedValue fact.value = checked ? checkedValue : uncheckedValue
} }
style: CheckBoxStyle {
label: Text {
color: __qgcpal.windowText
text: control.text
}
}
} }
...@@ -4,13 +4,9 @@ import QtQuick.Controls.Styles 1.2 ...@@ -4,13 +4,9 @@ import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
Label { QGCLabel {
property Fact fact: Fact { value: "FactLabel" } property Fact fact: Fact { value: "FactLabel" }
property var __qgcpal: QGCPalette { colorGroup: QGCPalette.Active }
color: __qgcpal.windowText
text: fact.valueString text: fact.valueString
} }
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
QGCTextField {
property Fact fact: Fact { value: 0 }
text: fact.valueString
unitsLabel: fact.units
onEditingFinished: fact.value = text
}
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