From 0a8152489b0a11e1c0785f7132c20ca9e433713b Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Wed, 20 Jul 2016 17:51:44 -0400
Subject: [PATCH] Removing CW/CCW Legend

---
 qgroundcontrol.qrc                            |  1 -
 .../Common/MotorComponent.qml                 |  5 --
 .../MultiRotorMotorDisplayLegend.qml          | 71 -------------------
 .../QGroundControl.Controls.qmldir            |  1 -
 4 files changed, 78 deletions(-)
 delete mode 100644 src/QmlControls/MultiRotorMotorDisplayLegend.qml

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 0f6a054fd..1c2b00782 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -57,7 +57,6 @@
         <file alias="QGroundControl/Controls/MissionItemStatus.qml">src/MissionEditor/MissionItemStatus.qml</file>
         <file alias="QGroundControl/Controls/MissionCommandDialog.qml">src/QmlControls/MissionCommandDialog.qml</file>
         <file alias="QGroundControl/Controls/MultiRotorMotorDisplay.qml">src/QmlControls/MultiRotorMotorDisplay.qml</file>
-        <file alias="QGroundControl/Controls/MultiRotorMotorDisplayLegend.qml">src/QmlControls/MultiRotorMotorDisplayLegend.qml</file>
         <file alias="QGroundControl/Controls/ModeSwitchDisplay.qml">src/QmlControls/ModeSwitchDisplay.qml</file>
         <file alias="QGroundControl/Controls/ParameterEditor.qml">src/QmlControls/ParameterEditor.qml</file>
         <file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
diff --git a/src/AutoPilotPlugins/Common/MotorComponent.qml b/src/AutoPilotPlugins/Common/MotorComponent.qml
index 60a5304b9..fd41c08a3 100644
--- a/src/AutoPilotPlugins/Common/MotorComponent.qml
+++ b/src/AutoPilotPlugins/Common/MotorComponent.qml
@@ -106,11 +106,6 @@ SetupPage {
                     coaxial:        controller.vehicle.coaxialMotors
                 }
 
-                MultiRotorMotorDisplayLegend {
-                    anchors.top:    parent.top
-                    anchors.bottom: parent.bottom
-                    width:          height
-                }
             } // Row
 
             QGCLabel {
diff --git a/src/QmlControls/MultiRotorMotorDisplayLegend.qml b/src/QmlControls/MultiRotorMotorDisplayLegend.qml
deleted file mode 100644
index 6b11ec3b2..000000000
--- a/src/QmlControls/MultiRotorMotorDisplayLegend.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-import QtQuick 2.2
-
-import QGroundControl.Palette       1.0
-import QGroundControl.ScreenTools   1.0
-
-Item {
-    id: legendRoot
-
-    property var    _qgcPal:            QGCPalette { colorGroupEnabled: enabled }
-    property real   _rotorRadius:       legendRoot.height / 16
-
-    readonly property string    _cwColor:               "#15ce15"   // Green
-    readonly property string    _ccwColor:              "#1283e0"   // Blue
-
-    Item {
-        id:             cwItem
-        anchors.left:   parent.left
-        anchors.right:  parent.right
-        height:         legendRoot.height / 2
-
-        Rectangle {
-            id:                     cwRotor
-            anchors.left:           parent.left
-            anchors.verticalCenter: parent.verticalCenter
-            width:                  _rotorRadius * 2
-            height:                 _rotorRadius * 2
-            radius:                 _rotorRadius
-            color:                  _cwColor
-        }
-
-        QGCLabel {
-            anchors.leftMargin: ScreenTools.defaultFontPixelWidth
-            anchors.left:       cwRotor.right
-            anchors.right:      parent.right
-            anchors.top:        parent.top
-            anchors.bottom:     parent.bottom
-            verticalAlignment:  Text.AlignVCenter
-            wrapMode:           Text.WordWrap
-            text:               qsTr("Clockwise rotation, use pusher propeller")
-        }
-    }
-
-    Item {
-        id:             ccwItem
-        anchors.top:    cwItem.bottom
-        anchors.bottom: parent.bottom
-        anchors.left:   parent.left
-        anchors.right:  parent.right
-
-        Rectangle {
-            id:                     ccwRotor
-            anchors.left:           parent.left
-            anchors.verticalCenter: parent.verticalCenter
-            width:                  _rotorRadius * 2
-            height:                 _rotorRadius * 2
-            radius:                 _rotorRadius
-            color:                  _ccwColor
-        }
-
-        QGCLabel {
-            anchors.leftMargin: ScreenTools.defaultFontPixelWidth
-            anchors.left:       ccwRotor.right
-            anchors.right:      parent.right
-            anchors.top:        parent.top
-            anchors.bottom:     parent.bottom
-            verticalAlignment:  Text.AlignVCenter
-            wrapMode:           Text.WordWrap
-            text:               qsTr("Counter Clockwise rotation, use normal propeller")
-        }
-    }
-} // Item
diff --git a/src/QmlControls/QGroundControl.Controls.qmldir b/src/QmlControls/QGroundControl.Controls.qmldir
index 6a9a1170c..472abd579 100644
--- a/src/QmlControls/QGroundControl.Controls.qmldir
+++ b/src/QmlControls/QGroundControl.Controls.qmldir
@@ -14,7 +14,6 @@ MissionItemIndexLabel   1.0 MissionItemIndexLabel.qml
 MissionItemStatus       1.0 MissionItemStatus.qml
 ModeSwitchDisplay       1.0 ModeSwitchDisplay.qml
 MultiRotorMotorDisplay  1.0 MultiRotorMotorDisplay.qml
-MultiRotorMotorDisplayLegend  1.0 MultiRotorMotorDisplayLegend.qml
 ParameterEditor         1.0 ParameterEditor.qml
 ParameterEditorDialog   1.0 ParameterEditorDialog.qml
 RCChannelMonitor        1.0 RCChannelMonitor.qml
-- 
2.22.0