Commit fc01014c authored by Don Gagne's avatar Don Gagne

Modify UI to fit latest designer sketches

parent d84e7c94
...@@ -269,6 +269,12 @@ ...@@ -269,6 +269,12 @@
<file alias="AirframeComponentSummary.qml">src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml</file> <file alias="AirframeComponentSummary.qml">src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml</file>
<file alias="QGroundControl/Controls/setupButtonImage.png">files/Setup/cogwheels.png</file> <file alias="QGroundControl/Controls/setupButtonImage.png">files/Setup/cogwheels.png</file>
<file alias="QGroundControl/Controls/SensorsComponentIcon.png">src/AutoPilotPlugins/PX4/SensorsComponentIcon.png</file>
<file alias="QGroundControl/Controls/RadioComponentIcon.png">src/AutoPilotPlugins/PX4/RadioComponentIcon.png</file>
<file alias="QGroundControl/Controls/FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/FlightModesComponentIcon.png</file>
<file alias="QGroundControl/Controls/AirframeComponentIcon.png">src/AutoPilotPlugins/PX4/AirframeComponentIcon.png</file>
<file alias="QGroundControl/Controls/FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
<file alias="QGroundControl/Controls/VehicleSummaryIcon.png">src/VehicleSetup/VehicleSummaryIcon.png</file>
</qresource> </qresource>
......
...@@ -133,9 +133,9 @@ QString AirframeComponent::description(void) const ...@@ -133,9 +133,9 @@ QString AirframeComponent::description(void) const
"This will in turn set up the various tuning values for flight paramters."); "This will in turn set up the various tuning values for flight paramters.");
} }
QString AirframeComponent::icon(void) const QString AirframeComponent::iconResource(void) const
{ {
return ":/files/images/px4/menu/plane.png"; return "AirframeComponentIcon.png";
} }
bool AirframeComponent::requiresSetup(void) const bool AirframeComponent::requiresSetup(void) const
......
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
virtual QString name(void) const; virtual QString name(void) const;
virtual QString description(void) const; virtual QString description(void) const;
virtual QString icon(void) const; virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const; virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const; virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const; virtual QString setupStateDescription(void) const;
......
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.Controls 1.0
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -11,8 +12,8 @@ Column { ...@@ -11,8 +12,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: systemId; text: "System ID:" } QGCLabel { id: systemId; text: "System ID:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - systemId.contentWidth width: parent.width - systemId.contentWidth
text: autopilot.parameters["MAV_SYS_ID"].value text: autopilot.parameters["MAV_SYS_ID"].value
...@@ -22,8 +23,8 @@ Column { ...@@ -22,8 +23,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: airframe; text: "Airframe:" } QGCLabel { id: airframe; text: "Airframe:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - airframe.contentWidth width: parent.width - airframe.contentWidth
text: autopilot.parameters["SYS_AUTOSTART"].value == 0 ? "Setup required" : autopilot.parameters["SYS_AUTOSTART"].value text: autopilot.parameters["SYS_AUTOSTART"].value == 0 ? "Setup required" : autopilot.parameters["SYS_AUTOSTART"].value
......
...@@ -63,9 +63,9 @@ QString FlightModesComponent::description(void) const ...@@ -63,9 +63,9 @@ QString FlightModesComponent::description(void) const
"At a minimum the Main Mode Switch must be assigned prior to flight."); "At a minimum the Main Mode Switch must be assigned prior to flight.");
} }
QString FlightModesComponent::icon(void) const QString FlightModesComponent::iconResource(void) const
{ {
return ":/files/images/px4/menu/toggle_switch.png"; return "FlightModesComponentIcon.png";
} }
bool FlightModesComponent::requiresSetup(void) const bool FlightModesComponent::requiresSetup(void) const
......
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
virtual QString name(void) const; virtual QString name(void) const;
virtual QString description(void) const; virtual QString description(void) const;
virtual QString icon(void) const; virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const; virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const; virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const; virtual QString setupStateDescription(void) const;
......
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.Controls 1.0
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -11,8 +12,8 @@ Column { ...@@ -11,8 +12,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: mode; text: "Mode switch:" } QGCLabel { id: mode; text: "Mode switch:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - mode.contentWidth width: parent.width - mode.contentWidth
text: autopilot.parameters["RC_MAP_MODE_SW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_MODE_SW"].value text: autopilot.parameters["RC_MAP_MODE_SW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_MODE_SW"].value
...@@ -22,8 +23,8 @@ Column { ...@@ -22,8 +23,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: posctl; text: "Position Ctl switch:" } QGCLabel { id: posctl; text: "Position Ctl switch:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - posctl.contentWidth width: parent.width - posctl.contentWidth
text: autopilot.parameters["RC_MAP_POSCTL_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_POSCTL_SW"].value text: autopilot.parameters["RC_MAP_POSCTL_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_POSCTL_SW"].value
...@@ -33,8 +34,8 @@ Column { ...@@ -33,8 +34,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: loiter; text: "Loiter switch:" } QGCLabel { id: loiter; text: "Loiter switch:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - loiter.contentWidth width: parent.width - loiter.contentWidth
text: autopilot.parameters["RC_MAP_LOITER_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_LOITER_SW"].value text: autopilot.parameters["RC_MAP_LOITER_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_LOITER_SW"].value
...@@ -44,8 +45,8 @@ Column { ...@@ -44,8 +45,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: rtl; text: "Return switch:" } QGCLabel { id: rtl; text: "Return switch:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - rtl.contentWidth width: parent.width - rtl.contentWidth
text: autopilot.parameters["RC_MAP_RETURN_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_RETURN_SW"].value text: autopilot.parameters["RC_MAP_RETURN_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_RETURN_SW"].value
......
...@@ -49,9 +49,9 @@ QString RadioComponent::description(void) const ...@@ -49,9 +49,9 @@ QString RadioComponent::description(void) const
"Prior to flight you must also calibrate the extents for all of your channels."); "Prior to flight you must also calibrate the extents for all of your channels.");
} }
QString RadioComponent::icon(void) const QString RadioComponent::iconResource(void) const
{ {
return ":/files/images/px4/menu/remote.png"; return "RadioComponentIcon.png";
} }
bool RadioComponent::requiresSetup(void) const bool RadioComponent::requiresSetup(void) const
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
virtual QString name(void) const; virtual QString name(void) const;
virtual QString description(void) const; virtual QString description(void) const;
virtual QString icon(void) const; virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const; virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const; virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const; virtual QString setupStateDescription(void) const;
......
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.Controls 1.0
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -11,8 +12,8 @@ Column { ...@@ -11,8 +12,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: roll; text: "Roll:" } QGCLabel { id: roll; text: "Roll:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - roll.contentWidth width: parent.width - roll.contentWidth
text: autopilot.parameters["RC_MAP_ROLL"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_ROLL"].value text: autopilot.parameters["RC_MAP_ROLL"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_ROLL"].value
...@@ -22,8 +23,8 @@ Column { ...@@ -22,8 +23,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: pitch; text: "Pitch:" } QGCLabel { id: pitch; text: "Pitch:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - pitch.contentWidth width: parent.width - pitch.contentWidth
text: autopilot.parameters["RC_MAP_PITCH"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_PITCH"].value text: autopilot.parameters["RC_MAP_PITCH"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_PITCH"].value
...@@ -33,8 +34,8 @@ Column { ...@@ -33,8 +34,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: yaw; text: "Yaw:" } QGCLabel { id: yaw; text: "Yaw:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - yaw.contentWidth width: parent.width - yaw.contentWidth
text: autopilot.parameters["RC_MAP_YAW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_YAW"].value text: autopilot.parameters["RC_MAP_YAW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_YAW"].value
...@@ -44,8 +45,8 @@ Column { ...@@ -44,8 +45,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: throttle; text: "Throttle:" } QGCLabel { id: throttle; text: "Throttle:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - throttle.contentWidth width: parent.width - throttle.contentWidth
text: autopilot.parameters["RC_MAP_THROTTLE"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_THROTTLE"].value text: autopilot.parameters["RC_MAP_THROTTLE"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_THROTTLE"].value
...@@ -55,8 +56,8 @@ Column { ...@@ -55,8 +56,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: mode; text: "Mode switch:" } QGCLabel { id: mode; text: "Mode switch:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
width: parent.width - mode.contentWidth width: parent.width - mode.contentWidth
text: autopilot.parameters["RC_MAP_MODE_SW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_MODE_SW"].value text: autopilot.parameters["RC_MAP_MODE_SW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_MODE_SW"].value
......
...@@ -48,9 +48,10 @@ QString SafetyComponent::description(void) const ...@@ -48,9 +48,10 @@ QString SafetyComponent::description(void) const
return tr("The Safety Component is used to setup triggers for Return to Land as well as the settings for Return to Land itself."); return tr("The Safety Component is used to setup triggers for Return to Land as well as the settings for Return to Land itself.");
} }
QString SafetyComponent::icon(void) const QString SafetyComponent::iconResource(void) const
{ {
return ":/files/images/px4/menu/remote.png"; // FIXME: Need real icon
return "setupButtonImage.png";
} }
bool SafetyComponent::requiresSetup(void) const bool SafetyComponent::requiresSetup(void) const
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
virtual QString name(void) const; virtual QString name(void) const;
virtual QString description(void) const; virtual QString description(void) const;
virtual QString icon(void) const; virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const; virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const; virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const; virtual QString setupStateDescription(void) const;
......
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.Controls 1.0
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -11,8 +12,8 @@ Column { ...@@ -11,8 +12,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: rtlMinAlt; text: "RTL min alt:" } QGCLabel { id: rtlMinAlt; text: "RTL min alt:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - rtlMinAlt.contentWidth; width: parent.width - rtlMinAlt.contentWidth;
text: autopilot.parameters["RTL_RETURN_ALT"].valueString text: autopilot.parameters["RTL_RETURN_ALT"].valueString
...@@ -22,8 +23,8 @@ Column { ...@@ -22,8 +23,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: rtlHomeAlt; text: "RTL home alt:" } QGCLabel { id: rtlHomeAlt; text: "RTL home alt:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - rtlHomeAlt.contentWidth; width: parent.width - rtlHomeAlt.contentWidth;
text: autopilot.parameters["RTL_DESCEND_ALT"].valueString text: autopilot.parameters["RTL_DESCEND_ALT"].valueString
...@@ -33,8 +34,8 @@ Column { ...@@ -33,8 +34,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: rtlLoiter; text: "RTL loiter delay:" } QGCLabel { id: rtlLoiter; text: "RTL loiter delay:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - rtlLoiter.contentWidth; width: parent.width - rtlLoiter.contentWidth;
text: autopilot.parameters["RTL_LAND_DELAY"].value < 0 ? "Disabled" : autopilot.parameters["RTL_LAND_DELAY"].valueString text: autopilot.parameters["RTL_LAND_DELAY"].value < 0 ? "Disabled" : autopilot.parameters["RTL_LAND_DELAY"].valueString
...@@ -44,19 +45,19 @@ Column { ...@@ -44,19 +45,19 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: commLoss; text: "Telemetry loss RTL:" } QGCLabel { id: commLoss; text: "Telemetry loss RTL:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - commLoss.contentWidth; width: parent.width - commLoss.contentWidth;
text: autopilot.parameters["COM_DL_LOSS_EN"].value != 1 ? "Disabled" : autopilot.parameters["NAV_DLL_N"].valueString text: autopilot.parameters["COM_DL_LOSS_EN"].value != 1 ? "Disabled" : autopilot.parameters["COM_DL_LOSS_T"].valueString
} }
} }
Row { Row {
width: parent.width width: parent.width
Text { id: rcLoss; text: "RC loss RTL (seconds):" } QGCLabel { id: rcLoss; text: "RC loss RTL (seconds):" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - rcLoss.contentWidth; width: parent.width - rcLoss.contentWidth;
text: autopilot.parameters["COM_RC_LOSS_T"].valueString text: autopilot.parameters["COM_RC_LOSS_T"].valueString
......
...@@ -55,9 +55,9 @@ QString SensorsComponent::description(void) const ...@@ -55,9 +55,9 @@ QString SensorsComponent::description(void) const
"Prior to flight you must calibrate the Magnetometer, Gyroscope and Accelerometer."); "Prior to flight you must calibrate the Magnetometer, Gyroscope and Accelerometer.");
} }
QString SensorsComponent::icon(void) const QString SensorsComponent::iconResource(void) const
{ {
return ":/files/images/px4/menu/sensors.png"; return "SensorsComponentIcon.png";
} }
bool SensorsComponent::requiresSetup(void) const bool SensorsComponent::requiresSetup(void) const
......
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
virtual QString name(void) const; virtual QString name(void) const;
virtual QString description(void) const; virtual QString description(void) const;
virtual QString icon(void) const; virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const; virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const; virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const; virtual QString setupStateDescription(void) const;
......
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.Controls 1.0
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -11,8 +12,8 @@ Column { ...@@ -11,8 +12,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: compass; text: "Compass:" } QGCLabel { id: compass; text: "Compass:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - compass.contentWidth; width: parent.width - compass.contentWidth;
property bool setupRequiredValue: autopilot.parameters["SENS_MAG_XOFF"] ? autopilot.parameters["SENS_MAG_XOFF"].value : autopilot.parameters["CAL_MAG0_ID"].value property bool setupRequiredValue: autopilot.parameters["SENS_MAG_XOFF"] ? autopilot.parameters["SENS_MAG_XOFF"].value : autopilot.parameters["CAL_MAG0_ID"].value
...@@ -23,8 +24,8 @@ Column { ...@@ -23,8 +24,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: gyro; text: "Gyro:" } QGCLabel { id: gyro; text: "Gyro:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - gyro.contentWidth; width: parent.width - gyro.contentWidth;
property bool setupRequiredValue: autopilot.parameters["SENS_GYRO_XOFF"] ? autopilot.parameters["SENS_GYRO_XOFF"].value : autopilot.parameters["CAL_GYRO0_ID"].value property bool setupRequiredValue: autopilot.parameters["SENS_GYRO_XOFF"] ? autopilot.parameters["SENS_GYRO_XOFF"].value : autopilot.parameters["CAL_GYRO0_ID"].value
...@@ -35,8 +36,8 @@ Column { ...@@ -35,8 +36,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: accel; text: "Accelerometer:" } QGCLabel { id: accel; text: "Accelerometer:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - accel.contentWidth; width: parent.width - accel.contentWidth;
property bool setupRequiredValue: autopilot.parameters["SENS_ACC_XOFF"] ? autopilot.parameters["SENS_ACC_XOFF"].value : autopilot.parameters["CAL_ACC0_ID"].value property bool setupRequiredValue: autopilot.parameters["SENS_ACC_XOFF"] ? autopilot.parameters["SENS_ACC_XOFF"].value : autopilot.parameters["CAL_ACC0_ID"].value
...@@ -47,8 +48,8 @@ Column { ...@@ -47,8 +48,8 @@ Column {
Row { Row {
width: parent.width width: parent.width
Text { id: airspeed; text: "Airspeed:" } QGCLabel { id: airspeed; text: "Airspeed:" }
Text { QGCLabel {
horizontalAlignment: Text.AlignRight; horizontalAlignment: Text.AlignRight;
width: parent.width - airspeed.contentWidth; width: parent.width - airspeed.contentWidth;
text: autopilot.parameters["SENS_DPRES_OFF"].value == 0.0 ? "Setup required" : "Ready" text: autopilot.parameters["SENS_DPRES_OFF"].value == 0.0 ? "Setup required" : "Ready"
......
...@@ -63,14 +63,24 @@ QColor QGCPalette::_window[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = { ...@@ -63,14 +63,24 @@ QColor QGCPalette::_window[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor(0x22, 0x22, 0x22), QColor(0x22, 0x22, 0x22), QColor(0x22, 0x22, 0x22) } { QColor(0x22, 0x22, 0x22), QColor(0x22, 0x22, 0x22), QColor(0x22, 0x22, 0x22) }
}; };
QColor QGCPalette::_windowShade[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor(255, 235, 211), QColor(255, 235, 211), QColor(255, 235, 211) },
{ QColor(51, 51, 51), QColor(51, 51, 51), QColor(51, 51, 51) }
};
QColor QGCPalette::_windowShadeDark[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor(216, 216, 216), QColor(216, 216, 216), QColor(216, 216, 216) },
{ QColor(40, 40, 40), QColor(40, 40, 40), QColor(40, 40, 40) }
};
QColor QGCPalette::_windowText[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = { QColor QGCPalette::_windowText[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor(0x58, 0x58, 0x58), QColor(0, 0, 0), QColor(0, 0, 0) }, { QColor(0x58, 0x58, 0x58), QColor(0, 0, 0), QColor(0, 0, 0) },
{ QColor(0x58, 0x58, 0x58), QColor(0xFF, 0xFF, 0xFF), QColor(0xFF, 0xFF, 0xFF) } { QColor(0x58, 0x58, 0x58), QColor(0xFF, 0xFF, 0xFF), QColor(0xFF, 0xFF, 0xFF) }
}; };
QColor QGCPalette::_buttonHighlight[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = { QColor QGCPalette::_buttonHighlight[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor(0x58, 0x58, 0x58), QColor(0xee, 0xe3, 0x33), QColor(0xee, 0xe3, 0x33) }, { QColor(0x58, 0x58, 0x58), QColor(238, 227, 51), QColor(238, 227, 51) },
{ QColor(0x58, 0x58, 0x58), QColor(0xee, 0xe3, 0x33), QColor(0xee, 0xe3, 0x33) }, { QColor(0x58, 0x58, 0x58), QColor(238, 227, 51), QColor(238, 227, 51) },
}; };
QGCPalette::QGCPalette(QObject* parent) : QGCPalette::QGCPalette(QObject* parent) :
......
...@@ -54,6 +54,14 @@ class QGCPalette : public QObject ...@@ -54,6 +54,14 @@ class QGCPalette : public QObject
/// The buttonHighlight color identifies the button background color when hovered or selected. /// The buttonHighlight color identifies the button background color when hovered or selected.
Q_PROPERTY(QColor buttonHighlight READ buttonHighlight NOTIFY paletteChanged) Q_PROPERTY(QColor buttonHighlight READ buttonHighlight NOTIFY paletteChanged)
/// The windowShade color should be a color somewhere between window and button. It is used to shade window
/// areas.
Q_PROPERTY(QColor windowShade READ windowShade NOTIFY paletteChanged)
/// The windowShadeDark color should be a color somewhere between window and windowShade. It is used to shade window
/// darker areas.
Q_PROPERTY(QColor windowShadeDark READ windowShadeDark NOTIFY paletteChanged)
public: public:
enum ColorGroup { enum ColorGroup {
Disabled = 0, Disabled = 0,
...@@ -78,6 +86,8 @@ public: ...@@ -78,6 +86,8 @@ public:
QColor buttonText(void) const { return _buttonText[_theme][_colorGroup]; } QColor buttonText(void) const { return _buttonText[_theme][_colorGroup]; }
QColor text(void) const { return _text[_theme][_colorGroup]; } QColor text(void) const { return _text[_theme][_colorGroup]; }
QColor window(void) const { return _window[_theme][_colorGroup]; } QColor window(void) const { return _window[_theme][_colorGroup]; }
QColor windowShade(void) const { return _windowShade[_theme][_colorGroup]; }
QColor windowShadeDark(void) const { return _windowShadeDark[_theme][_colorGroup]; }
QColor windowText(void) const { return _windowText[_theme][_colorGroup]; } QColor windowText(void) const { return _windowText[_theme][_colorGroup]; }
QColor buttonHighlight(void) const { return _buttonHighlight[_theme][_colorGroup]; } QColor buttonHighlight(void) const { return _buttonHighlight[_theme][_colorGroup]; }
...@@ -100,6 +110,8 @@ private: ...@@ -100,6 +110,8 @@ private:
static QColor _buttonText[_cThemes][_cColorGroups]; static QColor _buttonText[_cThemes][_cColorGroups];
static QColor _text[_cThemes][_cColorGroups]; static QColor _text[_cThemes][_cColorGroups];
static QColor _window[_cThemes][_cColorGroups]; static QColor _window[_cThemes][_cColorGroups];
static QColor _windowShade[_cThemes][_cColorGroups];
static QColor _windowShadeDark[_cThemes][_cColorGroups];
static QColor _windowText[_cThemes][_cColorGroups]; static QColor _windowText[_cThemes][_cColorGroups];
static QColor _buttonHighlight[_cThemes][_cColorGroups]; static QColor _buttonHighlight[_cThemes][_cColorGroups];
......
...@@ -11,7 +11,7 @@ Button { ...@@ -11,7 +11,7 @@ Button {
background: Rectangle { background: Rectangle {
implicitWidth: 100 implicitWidth: 100
implicitHeight: 25 implicitHeight: 25
color: control.hovered ? control.__qgcPal.buttonHighlight : control.__qgcPal.button color: control.pressed ? control.__qgcPal.buttonHighlight : control.__qgcPal.button
} }
label: Text { label: Text {
......