From f7eb2306f261b812b4c4359420943c65e716cd47 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 7 Feb 2015 12:23:44 -0800
Subject: [PATCH] Moved qml controls closer to c++ source in tree

---
 qml/QGroundControl/Controls/qmldir                             | 2 --
 .../FactSystem}/FactControls/FactCheckBox.qml                  | 2 ++
 .../FactSystem}/FactControls/FactLabel.qml                     | 2 ++
 .../FactSystem}/FactControls/FactTextField.qml                 | 2 ++
 {qml/QGroundControl => src/FactSystem}/FactControls/qmldir     | 0
 .../Controls => src/QmlControls}/SetupButton.qml               | 3 ++-
 6 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 qml/QGroundControl/Controls/qmldir
 rename {qml/QGroundControl => src/FactSystem}/FactControls/FactCheckBox.qml (95%)
 rename {qml/QGroundControl => src/FactSystem}/FactControls/FactLabel.qml (90%)
 rename {qml/QGroundControl => src/FactSystem}/FactControls/FactTextField.qml (97%)
 rename {qml/QGroundControl => src/FactSystem}/FactControls/qmldir (100%)
 rename {qml/QGroundControl/Controls => src/QmlControls}/SetupButton.qml (98%)

diff --git a/qml/QGroundControl/Controls/qmldir b/qml/QGroundControl/Controls/qmldir
deleted file mode 100644
index 48c30e1a2..000000000
--- a/qml/QGroundControl/Controls/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-Module QGroundControl.Controls
-SetupButton 1.0 SetupButton.qml
\ No newline at end of file
diff --git a/qml/QGroundControl/FactControls/FactCheckBox.qml b/src/FactSystem/FactControls/FactCheckBox.qml
similarity index 95%
rename from qml/QGroundControl/FactControls/FactCheckBox.qml
rename to src/FactSystem/FactControls/FactCheckBox.qml
index 82a29a713..84d0834f3 100644
--- a/qml/QGroundControl/FactControls/FactCheckBox.qml
+++ b/src/FactSystem/FactControls/FactCheckBox.qml
@@ -1,7 +1,9 @@
 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
 
 CheckBox {
     property Fact fact: Fact { value: 0 }
diff --git a/qml/QGroundControl/FactControls/FactLabel.qml b/src/FactSystem/FactControls/FactLabel.qml
similarity index 90%
rename from qml/QGroundControl/FactControls/FactLabel.qml
rename to src/FactSystem/FactControls/FactLabel.qml
index 25bcf8099..b9fe43c8a 100644
--- a/qml/QGroundControl/FactControls/FactLabel.qml
+++ b/src/FactSystem/FactControls/FactLabel.qml
@@ -1,7 +1,9 @@
 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
 
 Label {
     property Fact fact: Fact { value: "FactLabel" }
diff --git a/qml/QGroundControl/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml
similarity index 97%
rename from qml/QGroundControl/FactControls/FactTextField.qml
rename to src/FactSystem/FactControls/FactTextField.qml
index be0e68e66..6ff1b484f 100644
--- a/qml/QGroundControl/FactControls/FactTextField.qml
+++ b/src/FactSystem/FactControls/FactTextField.qml
@@ -1,7 +1,9 @@
 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
 
 TextField {
     property Fact fact: Fact { value: 0 }
diff --git a/qml/QGroundControl/FactControls/qmldir b/src/FactSystem/FactControls/qmldir
similarity index 100%
rename from qml/QGroundControl/FactControls/qmldir
rename to src/FactSystem/FactControls/qmldir
diff --git a/qml/QGroundControl/Controls/SetupButton.qml b/src/QmlControls/SetupButton.qml
similarity index 98%
rename from qml/QGroundControl/Controls/SetupButton.qml
rename to src/QmlControls/SetupButton.qml
index 64b720663..cefc33421 100644
--- a/qml/QGroundControl/Controls/SetupButton.qml
+++ b/src/QmlControls/SetupButton.qml
@@ -2,7 +2,8 @@ import QtQuick 2.2
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2
 import QtGraphicalEffects 1.0
-import QGroundControl.FactSystem 1.0
+
+import QGroundControl.Palette 1.0
 
 Button {
     checkable: true
-- 
2.22.0