Commit c9907913 authored by Dorian Zedler's avatar Dorian Zedler

- removed redundant files

- improved the look of switches in dark mode
- added 'What is this for?' button to the BaseStation settings
parent 5340398f
This diff is collapsed.
......@@ -7,6 +7,8 @@ ItemDelegate {
property color textColor: appTheme.style.textColor
property alias backgroundRect: backgroundRect
font.pixelSize: height * 0.4
opacity: enabled ? 1 : 0.2
contentItem: Text {
......@@ -31,7 +33,7 @@ ItemDelegate {
fontSizeMode: Text.Fit
font.pixelSize: control.height * 0.4
font.pixelSize: control.font.pixelSize
minimumPixelSize: 1
}
......
......@@ -60,7 +60,7 @@ SwitchDelegate {
width: parent.height
height: parent.height
radius: height * 0.5
color: parent.down ? "#cccccc" : "#ffffff"
color: parent.down ? appTheme.style.buttonPressedColor:appTheme.style.backgroundColor
border.color: parent.checked ? (parent.down ? "#17a81a" : "#21be2b") : "#999999"
Behavior on x{
NumberAnimation {
......
......@@ -188,8 +188,8 @@ Window {
height: parent.height
elide: "ElideRight"
color: speedBackend.timers[index]["state"] === "WON" ? appTheme.style.successColor :
speedBackend.timers[index]["state"] === "LOST" ? appTheme.style.errorColor:
color: ["WON"].includes(speedBackend.timers[index]["state"]) ? appTheme.style.successColor :
["LOST", "FAILED"].includes(speedBackend.timers[index]["state"]) ? appTheme.style.errorColor:
appTheme.style.textColor
enabled: speedBackend.timers[index]["state"] !== "DISABLED"
......@@ -205,12 +205,12 @@ Window {
minimumPixelSize: 1
Behavior on text {
enabled: app.state !== "RUNNING" && app.state !== "STOPPED"
/*Behavior on text {
enabled: !["RUNNING", "STOPPED", "WON", "LOST", "FAILED", "CANCELLED"].includes(app.state)
FadeAnimation {
target: timerTextLa
}
}
}*/
}
Label {
......
......@@ -24,8 +24,6 @@
<file>graphics/icons/startpad.png</file>
<file>graphics/icons/user_black.png</file>
<file>graphics/icons/ok.png</file>
<file>sounds/IFSC_STARTSIGNAL_SAWTOOTH.wav</file>
<file>sounds/IFSC_STARTSIGNAL_SINE.wav</file>
<file>sounds/IFSC_STARTSIGNAL_SQUARE.wav</file>
</qresource>
</RCC>
......@@ -7,7 +7,7 @@ AppTheme::AppTheme(QObject *parent) : QObject(parent)
{"backgroundColor", "#2d3037"},
{"buttonColor", "#202227"},
{"buttonPressedColor", "#6ccaf2"},
{"buttonPressedColor", "#41454f"},
{"buttonBorderColor", "grey"},
{"disabledButtonColor", "#555555"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment