diff --git a/qml/QGroundControl/FactControls/SetupButton.qml b/qml/QGroundControl/FactControls/SetupButton.qml deleted file mode 100644 index 867537a3114715b217fb191e0b675624ebbfe82e..0000000000000000000000000000000000000000 --- a/qml/QGroundControl/FactControls/SetupButton.qml +++ /dev/null @@ -1,163 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 - -Button { - text: "Button" - property bool setupComplete: false - - property var summaryModel: ListModel { - ListElement { name: "Row 1"; state: "State 1" } - ListElement { name: "Row 2"; state: "State 2" } - ListElement { name: "Row 3"; state: "State 3" } - } - - style: ButtonStyle { - id: buttonStyle - background: Rectangle { - id: innerRect - readonly property real titleHeight: 30 - - //property alias summaryModel: summaryList.model - - border.color: "#888" - radius: 10 - - color: control.activeFocus ? "#47b" : "white" - opacity: control.hovered || control.activeFocus ? 1 : 0.75 - Behavior on opacity {NumberAnimation{ duration: 100 }} - - Text { - id: titleBar - - width: parent.width - height: parent.titleHeight - - verticalAlignment: TextEdit.AlignVCenter - horizontalAlignment: TextEdit.AlignHCenter - - text: control.text - font.pixelSize: 12 - - Rectangle { - id: setupIndicator - - property bool setupComplete: true - readonly property real indicatorRadius: 6 - - x: parent.width - (indicatorRadius * 2) - 5 - y: (parent.height - (indicatorRadius * 2)) / 2 - width: indicatorRadius * 2 - height: indicatorRadius * 2 - - radius: indicatorRadius - color: control.setupComplete ? "green" : "red" - } - } - - Rectangle { - width: parent.width - height: parent.height - parent.titleHeight - - y: parent.titleHeight - - border.color: "#888" - - gradient: Gradient { - GradientStop { position: 0; color: "#ffffff" } - GradientStop { position: 1; color: "#000000" } - } - - ListView { - id: summaryList - anchors.fill: parent - model: control.summaryModel - delegate: Row { - Text { text: modelData.name } - Text { text: modelData.state } - } - } - } - } - - label: Item {} - } -} - -/* -Rectangle { - readonly property real titleHeight: 30 - - property alias title: titleBar.text - property alias setupComplete: setupIndicator.setupComplete - //property alias summaryModel: summaryList.model - - border.color: "#888" - radius: 10 - - gradient: Gradient { - GradientStop { position: 0 ; color: "#cccccc" } - GradientStop { position: 1 ; color: "#aaa" } - } - - Text { - id: titleBar - - width: parent.width - height: parent.titleHeight - - verticalAlignment: TextEdit.AlignVCenter - horizontalAlignment: TextEdit.AlignHCenter - - text: qsTr("TITLE") - font.pixelSize: 12 - - Rectangle { - id: setupIndicator - - property bool setupComplete: true - readonly property real indicatorRadius: 6 - - x: parent.width - (indicatorRadius * 2) - 5 - y: (parent.height - (indicatorRadius * 2)) / 2 - width: indicatorRadius * 2 - height: indicatorRadius * 2 - - radius: indicatorRadius - color: setupComplete ? "green" : "red" - } - } - - Rectangle { - width: parent.width - height: parent.height - parent.titleHeight - - y: parent.titleHeight - - border.color: "#888" - - gradient: Gradient { - GradientStop { - position: 0 - color: "#ffffff" - } - - GradientStop { - position: 1 - color: "#000000" - } - } - - ListView { - id: summaryList - anchors.fill: parent - model: ListModel { - ListElement { name: "Row 1"; state: "State 1" } - ListElement { name: "Row 2"; state: "State 2" } - ListElement { name: "Row 3"; state: "State 3" } - } - delegate: Row { Text { text: modelData.name } Text { text: modelData.state } } - } - } -} -*/ \ No newline at end of file diff --git a/src/VehicleSetup/SetupPane.qml b/src/VehicleSetup/SetupPane.qml deleted file mode 100644 index 4c53fa7161b24e0d04e15efb76c3b6d02664613c..0000000000000000000000000000000000000000 --- a/src/VehicleSetup/SetupPane.qml +++ /dev/null @@ -1,51 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -//import QGroundControl.FactControls 1.0 - -Item { - id: item1 - width: 500 - height: 500 - - Rectangle { - id: innerRect - color: "#d298d2" - z: 1 - anchors.rightMargin: 15 - anchors.leftMargin: 15 - anchors.bottomMargin: 15 - anchors.topMargin: 40 - anchors.fill: parent - - Rectangle { - id: close - x: parent.width - (width / 2) - y: 0 - (height / 2) - width: 30 - height: 30 - color: "#ffffff" - radius: 15 - z: 2 - border.color: "#000000" - } - - } - - Rectangle { - id: outerRect - color: "#ffffff" - opacity: 0.8 - anchors.fill: parent - - Text { - id: title - x: 237 - y: 8 - text: qsTr("Setup Pane") - anchors.horizontalCenter: parent.horizontalCenter - font.pointSize: 20 - } - } - -} diff --git a/src/VehicleSetup/SetupViewDisconnected.qml b/src/VehicleSetup/SetupViewDisconnected.qml deleted file mode 100644 index 5ab982909fee39c8c03aff4a9e1a56c092d6fefb..0000000000000000000000000000000000000000 --- a/src/VehicleSetup/SetupViewDisconnected.qml +++ /dev/null @@ -1,34 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QGroundControl.FactSystem 1.0 - -Rectangle { - QGCPalette { id: palette; colorGroup: QGCPalette.Active } - - color: palette.window - - Item { - anchors.margins: 20 - anchors.fill: parent - - Rectangle { id: header; color: "lightblue"; radius: 10.0; width: parent.width; height: titleText.height + 20; opacity: 0.8; - Text { id: titleText; anchors.centerIn: parent; font.pointSize: 24; text: "Vehicle Setup" } - } - - Text { width: parent.width; height: parent.height - header.height - footer.height; - anchors.top: header.bottom - color: palette.windowText - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - text: "Vehicle Setup is only available while vehicle is connected." } - - Rectangle { id: footer; anchors.bottom: parent.bottom; color: "lightblue"; radius: 10.0; width: parent.width; height: titleText.height + 20; opacity: 0.8; - - Button { id: firmwareButton; objectName: "firmwareButton"; - anchors.horizontalCenter: parent.horizontalCenter; anchors.verticalCenter: parent.verticalCenter; - text: "Firmware Upgrade" - } - } - } -} diff --git a/src/VehicleSetup/SetupWidgetHolder.cc b/src/VehicleSetup/SetupWidgetHolder.cc deleted file mode 100644 index 4e7e58c0e0cdc6ee6d54dfb34b5fa4beeeb6ce4a..0000000000000000000000000000000000000000 --- a/src/VehicleSetup/SetupWidgetHolder.cc +++ /dev/null @@ -1,19 +0,0 @@ -#include "SetupWidgetHolder.h" -#include "ui_SetupWidgetHolder.h" - -SetupWidgetHolder::SetupWidgetHolder(QWidget *parent) : - QDialog(parent), - ui(new Ui::SetupWidgetHolder) -{ - ui->setupUi(this); -} - -SetupWidgetHolder::~SetupWidgetHolder() -{ - delete ui; -} - -void SetupWidgetHolder::setInnerWidget(QWidget* widget) -{ - ui->setupWidgetLayout->addWidget(widget); -} diff --git a/src/VehicleSetup/SetupWidgetHolder.h b/src/VehicleSetup/SetupWidgetHolder.h deleted file mode 100644 index be2f3f2d102fd6a0d324e58c8a6ca6214a33da6b..0000000000000000000000000000000000000000 --- a/src/VehicleSetup/SetupWidgetHolder.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef SETUPWIDGETHOLDER_H -#define SETUPWIDGETHOLDER_H - -#include - -namespace Ui { -class SetupWidgetHolder; -} - -class SetupWidgetHolder : public QDialog -{ - Q_OBJECT - -public: - explicit SetupWidgetHolder(QWidget *parent = 0); - ~SetupWidgetHolder(); - - void setInnerWidget(QWidget* widget); - -private: - Ui::SetupWidgetHolder *ui; -}; - -#endif // SETUPWIDGETHOLDER_H diff --git a/src/VehicleSetup/VehicleComponentSummaryItem.cc b/src/VehicleSetup/VehicleComponentSummaryItem.cc deleted file mode 100644 index 753d6de207e522deb458e390036971f4bffe8967..0000000000000000000000000000000000000000 --- a/src/VehicleSetup/VehicleComponentSummaryItem.cc +++ /dev/null @@ -1,35 +0,0 @@ -/*===================================================================== - - QGroundControl Open Source Ground Control Station - - (c) 2009 - 2014 QGROUNDCONTROL PROJECT - - This file is part of the QGROUNDCONTROL project - - QGROUNDCONTROL is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - QGROUNDCONTROL is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with QGROUNDCONTROL. If not, see . - - ======================================================================*/ - -/// @file -/// @author Don Gagne - -#include "VehicleComponentSummaryItem.h" - -VehicleComponentSummaryItem::VehicleComponentSummaryItem(const QString& name, const QString& state, QObject* parent) : - QObject(parent), - _name(name), - _state(state) -{ - -} diff --git a/src/VehicleSetup/VehicleComponentSummaryItem.h b/src/VehicleSetup/VehicleComponentSummaryItem.h deleted file mode 100644 index c9f1bed877a565c9ecc5f9ad82f954b7d60e48d1..0000000000000000000000000000000000000000 --- a/src/VehicleSetup/VehicleComponentSummaryItem.h +++ /dev/null @@ -1,57 +0,0 @@ -/*===================================================================== - - QGroundControl Open Source Ground Control Station - - (c) 2009 - 2014 QGROUNDCONTROL PROJECT - - This file is part of the QGROUNDCONTROL project - - QGROUNDCONTROL is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - QGROUNDCONTROL is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with QGROUNDCONTROL. If not, see . - - ======================================================================*/ - -#ifndef VehicleComponentSummaryItem_H -#define VehicleComponentSummaryItem_H - -#include -#include -#include - -#include "UASInterface.h" - -/// @file -/// @brief Vehicle Component class. A vehicle component is an object which -/// abstracts the physical portion of a vehicle into a set of -/// configurable values and user interface. -/// @author Don Gagne - -class VehicleComponentSummaryItem : public QObject -{ - Q_OBJECT - - Q_PROPERTY(QString name READ name CONSTANT) - Q_PROPERTY(QString state READ state CONSTANT) - -public: - VehicleComponentSummaryItem(const QString& name, const QString& state, QObject* parent = NULL); - - QString name(void) const { return _name; } - QString state(void) const { return _state; } - -protected: - QString _name; - QString _state; -}; - -#endif