diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
index 3e3fafc..14494e0 100644
--- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
+++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
@@ -23,16 +23,16 @@ import QtQuick.Controls 2.0
T.BusyIndicator {
id: control
- implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
- implicitContentWidth + leftPadding + rightPadding)
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- implicitContentHeight + topPadding + bottomPadding)
+ property var image: "qrc:/images/SpeedHold.png"
+
+ implicitWidth: leftPadding + rightPadding
+ implicitHeight: topPadding + bottomPadding
contentItem: Item {
Image {
id: holdImage
anchors.fill: parent
- source: "qrc:/images/SpeedHold.png"
+ source: control.image
fillMode: Image.PreserveAspectFit
}
diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
index 109d450..c7fefe4 100644
--- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
+++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
@@ -19,7 +19,6 @@
import QtQuick 2.0
import QtQuick.Controls 2.0
import de.itsblue.ScStw 2.0
-import de.itsblue.ScStwMonitor 2.0
Column {
id: control
@@ -27,6 +26,8 @@ Column {
property var timers
property var colors
property var fontName
+ property bool showSecLabel: false
+ property bool showTimerLetter: true
opacity: backend.scStwClient.state === ScStwClient.CONNECTED ? 1:0
@@ -57,6 +58,8 @@ Column {
Label {
id: laneNameLa
+ visible: control.showTimerLetter
+
anchors {
left: parent.left
}
@@ -71,9 +74,9 @@ Column {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
- text: ""//index === 0 ? "A":"B"
+ text: timerRep.clearedTimers[index]["letter"]
- color: control.colors.text
+ color: control.colors.accent
font.pixelSize: height
font.styleName: control.fontName
diff --git a/ScStwStyling/resources/shared/ScStwStylingShared.qrc b/ScStwStyling/resources/shared/ScStwStylingShared.qrc
index 875e9cb..cce3696 100644
--- a/ScStwStyling/resources/shared/ScStwStylingShared.qrc
+++ b/ScStwStyling/resources/shared/ScStwStylingShared.qrc
@@ -3,7 +3,8 @@
fonts/fa5solid.woff
images/BaseStationBlack.png
images/BaseStationWhite.png
- images/SpeedHold.png
fonts/PTMono-Regular.ttf
+ images/SpeedHoldBlack.png
+ images/SpeedHoldWhite.png
diff --git a/ScStwStyling/resources/shared/images/SpeedHold.png b/ScStwStyling/resources/shared/images/SpeedHoldBlack.png
similarity index 100%
rename from ScStwStyling/resources/shared/images/SpeedHold.png
rename to ScStwStyling/resources/shared/images/SpeedHoldBlack.png
diff --git a/ScStwStyling/resources/shared/images/SpeedHoldWhite.png b/ScStwStyling/resources/shared/images/SpeedHoldWhite.png
new file mode 100644
index 0000000..11dd41b
Binary files /dev/null and b/ScStwStyling/resources/shared/images/SpeedHoldWhite.png differ
diff --git a/ScStwStyling/sources/scstwappthememanager.cpp b/ScStwStyling/sources/scstwappthememanager.cpp
index a924dac..00fef82 100644
--- a/ScStwStyling/sources/scstwappthememanager.cpp
+++ b/ScStwStyling/sources/scstwappthememanager.cpp
@@ -82,7 +82,8 @@ ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent)
{"startpadIcon", "qrc:/graphics/icons/startpad_black.png"},
{"baseStationIcon", "qrc:/images/BaseStationBlack.png"},
{"profilesIcon", "qrc:/graphics/icons/user_black.png"},
- {"confirmIcon", "qrc:/graphics/icons/ok_black.png"}
+ {"confirmIcon", "qrc:/graphics/icons/ok_black.png"},
+ {"SpeedHold", "qrc:/images/SpeedHoldBlack.png"}
});
ScStwAppTheme *darkTheme = new ScStwAppTheme(
@@ -130,7 +131,8 @@ ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent)
{"startpadIcon", "qrc:/graphics/icons/startpad.png"},
{"baseStationIcon", "qrc:/images/BaseStationWhite.png"},
{"profilesIcon", "qrc:/graphics/icons/user.png"},
- {"confirmIcon", "qrc:/graphics/icons/ok.png"}
+ {"confirmIcon", "qrc:/graphics/icons/ok.png"},
+ {"SpeedHold", "qrc:/images/SpeedHoldWhite.png"}
}
);