zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Custom example theme fixes - Dark theme update 

This is a small experiment into creating a custom theme for QGC.
QGC4.4
Yasen 6 years ago
parent
d7ec437dc2
commit
3e95a8528a
8 changed files with 35 additions and 28 deletions
Split View
  1. 5
      asset_catalog_compiler.Info.plist
  2. 1
      custom
  3. 1
      custom-example/custom-example
  4. 4
      custom-example/res/Custom/Widgets/CustomToolBarButton.qml
  5. 8
      custom-example/res/CustomCameraControl.qml
  6. 6
      custom-example/res/CustomFlyView.qml
  7. 36
      custom-example/src/CustomPlugin.cc
  8. 2
      src/QmlControls/ToolStrip.qml

5
asset_catalog_compiler.Info.plist
Unescape View File

@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

1
custom
Unescape View File

@ -0,0 +1 @@ @@ -0,0 +1 @@
custom-example

1
custom-example/custom-example
Unescape View File

@ -0,0 +1 @@ @@ -0,0 +1 @@
custom-example

4
custom-example/res/Custom/Widgets/CustomToolBarButton.qml
Unescape View File

@ -40,7 +40,7 @@ Button { @@ -40,7 +40,7 @@ Button {
width: height
sourceSize.height: parent.height
fillMode: Image.PreserveAspectFit
color: (mouseArea.pressed || button.checked) ? qgcPal.colorOrange : qgcPal.buttonText
color: (mouseArea.pressed || button.checked) ? qgcPal.primaryButton : qgcPal.buttonText
source: button.icon.source
anchors.verticalCenter: parent.verticalCenter
}
@ -48,7 +48,7 @@ Button { @@ -48,7 +48,7 @@ Button {
id: _label
visible: text !== ""
text: button.text
color: (mouseArea.pressed || button.checked) ? qgcPal.colorOrange : qgcPal.buttonText
color: (mouseArea.pressed || button.checked) ? qgcPal.primaryButton : qgcPal.buttonText
anchors.verticalCenter: parent.verticalCenter
}
}

8
custom-example/res/CustomCameraControl.qml
Unescape View File

@ -88,7 +88,7 @@ Item { @@ -88,7 +88,7 @@ Item {
id: backgroundRect
width: buttonsRow.width + (ScreenTools.defaultFontPixelWidth * 4)
height: buttonsRow.height + (ScreenTools.defaultFontPixelHeight)
color: qgcPal.windowShade
color: qgcPal.window
radius: height * 0.5
visible: _camera && _camera.modelName === "DSC-QX30" && QGroundControl.videoManager.hasThermal
anchors.horizontalCenter: parent.horizontalCenter
@ -198,7 +198,7 @@ Item { @@ -198,7 +198,7 @@ Item {
id: cameraRect
height: cameraCol.height
width: cameraCol.width + (ScreenTools.defaultFontPixelWidth * 4)
color: qgcPal.windowShade
color: qgcPal.window
radius: ScreenTools.defaultFontPixelWidth * 0.5
anchors.horizontalCenter: parent.horizontalCenter
Column {
@ -274,7 +274,7 @@ Item { @@ -274,7 +274,7 @@ Item {
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
color: qgcPal.windowShade
color: qgcPal.window
visible: {
if(_cameraPhotoMode && !_cameraPhotoIdle && !_cameraElapsedMode) {
return true
@ -426,7 +426,7 @@ Item { @@ -426,7 +426,7 @@ Item {
ZoomControl {
id: zoomControl
visible: _hasZoom
mainColor: qgcPal.windowShade
mainColor: qgcPal.window
contentColor: qgcPal.text
fontPointSize: ScreenTools.defaultFontPointSize * 1.25
zoomLevelVisible: false

6
custom-example/res/CustomFlyView.qml
Unescape View File

@ -251,7 +251,7 @@ Item { @@ -251,7 +251,7 @@ Item {
//-- Vehicle Indicator
Rectangle {
id: vehicleIndicator
color: qgcPal.windowShade
color: qgcPal.window
width: vehicleStatusGrid.width + (ScreenTools.defaultFontPixelWidth * 3)
height: vehicleStatusGrid.height + (ScreenTools.defaultFontPixelHeight * 1.5)
radius: 2
@ -460,7 +460,7 @@ Item { @@ -460,7 +460,7 @@ Item {
//-- Attitude Indicator
Rectangle {
color: qgcPal.windowShade
color: qgcPal.window
width: attitudeIndicator.width * 0.5
height: vehicleIndicator.height
visible: _showAttitude
@ -581,7 +581,7 @@ Item { @@ -581,7 +581,7 @@ Item {
}
QGCLabel {
text: qsTr("The vehicle will automatically cancel the flight and return to land. Ensure a clear line of sight between transmitter and vehicle. Ensure the takeoff location is clear.")
width: connectionLostArmed.width * 0.75
width: connectionLostArmed.width * 0.75
wrapMode: Text.WordWrap
color: qgcPal.alertText
font.family: ScreenTools.demiboldFontFamily

36
custom-example/src/CustomPlugin.cc
Unescape View File

@ -233,27 +233,27 @@ CustomPlugin::adjustSettingMetaData(const QString& settingsGroup, FactMetaData& @@ -233,27 +233,27 @@ CustomPlugin::adjustSettingMetaData(const QString& settingsGroup, FactMetaData&
const QColor CustomPlugin::_windowShadeEnabledLightColor("#FFFFFF");
const QColor CustomPlugin::_windowShadeEnabledDarkColor("#0B1420");
const QColor CustomPlugin::_windowShadeEnabledDarkColor("#212529");
//-----------------------------------------------------------------------------
void
CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t& colorInfo)
{
if (colorName == QStringLiteral("window")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#0b1420");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#0b1420");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#212529");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#212529");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#ffffff");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#ffffff");
}
else if (colorName == QStringLiteral("windowShade")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#342926");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#342926");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#343A40");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#343A40");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#d9d9d9");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#d9d9d9");
}
else if (colorName == QStringLiteral("windowShadeDark")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#40332e");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#080f18");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#1A1C1F");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#1A1C1F");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#bdbdbd");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#bdbdbd");
}
@ -270,7 +270,7 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t& @@ -270,7 +270,7 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t&
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#cc0808");
}
else if (colorName == QStringLiteral("button")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#594e4c");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#495057");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#313d4d");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#ffffff");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#ffffff");
@ -282,26 +282,26 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t& @@ -282,26 +282,26 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t&
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#9d9d9d");
}
else if (colorName == QStringLiteral("buttonHighlight")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#F3BC5E");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#222a35");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#07916D");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#313d4d");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#edcfb4");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#e4e4e4");
}
else if (colorName == QStringLiteral("buttonHighlightText")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#1d3c20");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#FFFFFF");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#777c89");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#211b1b");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#2c2c2c");
}
else if (colorName == QStringLiteral("primaryButton")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#24dc09");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#29313a");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#12B886");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#313d4d");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#8e5e54");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#585858");
}
else if (colorName == QStringLiteral("primaryButtonText")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#29313A");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#777c89");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#FFFFFF");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#FFFFFF");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#29313A");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#cad0d0");
}
@ -324,7 +324,7 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t& @@ -324,7 +324,7 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t&
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#585858");
}
else if (colorName == QStringLiteral("mapButtonHighlight")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#84c448");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#07916D");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#585858");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#be781c");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#585858");
@ -396,8 +396,8 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t& @@ -396,8 +396,8 @@ CustomPlugin::paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t&
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#585858");
}
else if (colorName == QStringLiteral("hoverColor")) {
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#746D59");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#746D59");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#07916D");
colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#33C494");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#464f5a");
colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#464f5a");
}

2
src/QmlControls/ToolStrip.qml
Unescape View File

@ -16,7 +16,7 @@ import QGroundControl.Controls 1.0 @@ -16,7 +16,7 @@ import QGroundControl.Controls 1.0
Rectangle {
id: _root
color: qgcPal.windowShade
color: qgcPal.window
width: _idealWidth < repeater.contentWidth ? repeater.contentWidth : _idealWidth
height: toolStripColumn.height + (toolStripColumn.anchors.margins * 2)
radius: ScreenTools.defaultFontPixelWidth / 2

Write Preview
Loading…
Cancel
Save