ScStw/shared-libraries
ScStw/shared-libraries
2
0
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

- some changes to busy indicator

Browse source 
- some changes to timer col
This commit is contained in:
Dorian Zedler 2020-06-13 15:57:51 +02:00
parent 190a231a7b
commit ac0d1a4616
Signed by: dorian
GPG key ID: 989DE36109AFA354
6 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
View file

@ -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
}

9
ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
View file

@ -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

3
ScStwStyling/resources/shared/ScStwStylingShared.qrc
View file

@ -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>

0
ScStwStyling/resources/shared/images/SpeedHold.png → ScStwStyling/resources/shared/images/SpeedHoldBlack.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
ScStwStyling/resources/shared/images/SpeedHoldWhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

6
ScStwStyling/sources/scstwappthememanager.cpp
View file

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