- some changes to busy indicator

- some changes to timer col

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,
+    property var image: "qrc:/images/SpeedHold.png"
-                            implicitContentWidth + leftPadding + rightPadding)
+
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+    implicitWidth: leftPadding + rightPadding
-                             implicitContentHeight + topPadding + bottomPadding)
+    implicitHeight: topPadding + bottomPadding
 
     contentItem: Item {
         Image {
             id: holdImage
             anchors.fill: parent
-            source: "qrc:/images/SpeedHold.png"
+            source: control.image
             fillMode: Image.PreserveAspectFit
         }
 

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

ScStwStyling/resources/shared/ScStwStylingShared.qrc

@@ -3,7 +3,8 @@
         <file>fonts/fa5solid.woff</file>
         <file>images/BaseStationBlack.png</file>
         <file>images/BaseStationWhite.png</file>
-        <file>images/SpeedHold.png</file>
         <file>fonts/PTMono-Regular.ttf</file>
+        <file>images/SpeedHoldBlack.png</file>
+        <file>images/SpeedHoldWhite.png</file>
     </qresource>
 </RCC>

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"}
                 }
                 );