From 95e3c1b5f99d3ebeb850ab37518afc4576bcf891 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 20 Feb 2015 14:28:55 -0800
Subject: [PATCH] Fact control now use QGC controls as base

---
 src/FactSystem/FactControls/FactCheckBox.qml  | 12 +++---------
 src/FactSystem/FactControls/FactLabel.qml     |  8 ++------
 src/FactSystem/FactControls/FactTextField.qml | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 src/FactSystem/FactControls/FactTextField.qml

diff --git a/src/FactSystem/FactControls/FactCheckBox.qml b/src/FactSystem/FactControls/FactCheckBox.qml
index 84d0834f3..bf43fb18f 100644
--- a/src/FactSystem/FactControls/FactCheckBox.qml
+++ b/src/FactSystem/FactControls/FactCheckBox.qml
@@ -4,13 +4,14 @@ import QtQuick.Controls.Styles 1.2
 
 import QGroundControl.FactSystem 1.0
 import QGroundControl.Palette 1.0
+import QGroundControl.Controls 1.0
 
-CheckBox {
+QGCCheckBox {
     property Fact fact: Fact { value: 0 }
     property variant checkedValue: 1
     property variant uncheckedValue: 0
 
-    property var __qgcpal: QGCPalette { colorGroup: QGCPalette.Active }
+    property var __qgcpal: QGCPalette { colorGroupEnabled: true }
 
     partiallyCheckedEnabled: fact.value != checkedValue && fact.value != uncheckedValue
     checkedState: fact.value == checkedValue ? Qt.Checked : (fact.value == uncheckedValue ? Qt.Unchecked : Qt.PartiallyChecked)
@@ -20,11 +21,4 @@ CheckBox {
     onClicked: {
         fact.value = checked ? checkedValue : uncheckedValue
     }
-
-    style: CheckBoxStyle {
-        label: Text {
-            color: __qgcpal.windowText
-            text: control.text
-        }
-    }
 }
diff --git a/src/FactSystem/FactControls/FactLabel.qml b/src/FactSystem/FactControls/FactLabel.qml
index b9fe43c8a..77afd07e0 100644
--- a/src/FactSystem/FactControls/FactLabel.qml
+++ b/src/FactSystem/FactControls/FactLabel.qml
@@ -4,13 +4,9 @@ import QtQuick.Controls.Styles 1.2
 
 import QGroundControl.FactSystem 1.0
 import QGroundControl.Palette 1.0
+import QGroundControl.Controls 1.0
 
-Label {
+QGCLabel {
     property Fact fact: Fact { value: "FactLabel" }
-
-    property var __qgcpal: QGCPalette { colorGroup: QGCPalette.Active }
-
-    color: __qgcpal.windowText
-
     text: fact.valueString
 }
diff --git a/src/FactSystem/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml
new file mode 100644
index 000000000..3a7f9818d
--- /dev/null
+++ b/src/FactSystem/FactControls/FactTextField.qml
@@ -0,0 +1,14 @@
+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
+}
-- 
2.22.0