bluerock/app
bluerock/app
2
0
Fork 0
Code Issues 8 Pull requests Projects Releases 9 Packages 1 Wiki Activity

Compare commits

base: bluerock:38bdf15f4005b04ba95e30afe15c504b58bcffad
Branches Tags
bluerock:main
bluerock:internal_makeover
bluerock:v0.8.0
bluerock:v0.7.3
bluerock:v0.7.1-1
bluerock:v0.7.1
bluerock:v0.7.0
bluerock:v0.6.1
bluerock:v0.6.0
bluerock:v0.5.1
bluerock:v0.5.0
..
compare: bluerock:766da23e26c6fa383ce912e725138817e53d0faa
Branches Tags
bluerock:main
bluerock:internal_makeover
bluerock:v0.8.0
bluerock:v0.7.3
bluerock:v0.7.1-1
bluerock:v0.7.1
bluerock:v0.7.0
bluerock:v0.6.1
bluerock:v0.6.0
bluerock:v0.5.1
bluerock:v0.5.0

No commits in common. "38bdf15f4005b04ba95e30afe15c504b58bcffad" and "766da23e26c6fa383ce912e725138817e53d0faa" have entirely different histories.
38bdf15f40 ... 766da23e26

2 changed files with 8 additions and 47 deletions
Show stats Expand all files Collapse all files

54
resources/qml/Components/SpeedFlowChart.qml
View file

@ -222,7 +222,7 @@ Item {
ListView {
id: roundListView
property int columnWidth: height * 0.4
property int columnWidth: height * 0.3
property int columnHeight: height
anchors {
@ -386,6 +386,8 @@ Item {
height: roundItem.tileSize
//scale: 0.9
color: Material.dialogColor
border.color: "lightgrey"
border.width: 0
radius: height * 0.2
Column {
@ -407,15 +409,13 @@ Item {
Label {
Layout.preferredHeight: parent.height
Layout.preferredWidth: parent.width * 0.08
height: parent.height
Layout.preferredWidth: parent.width * 0.15
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
font.pixelSize: height * 0.4
font.bold: true
opacity: 0.7
font.pixelSize: height * 0.7
fontSizeMode: Text.Fit
minimumPixelSize: 1
text: matchItm.thisMatchData[index] !== undefined ?
(
@ -428,8 +428,7 @@ Item {
Label {
Layout.preferredHeight: parent.height
Layout.maximumWidth: parent.width * 0.6
Layout.fillWidth: true
height: parent.height
@ -444,50 +443,13 @@ Item {
text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]['firstname'] + " " + matchItm.thisMatchData[index]['lastname'] :"-"
}
Rectangle {
Layout.preferredHeight: parent.height * 0.8
Layout.preferredWidth: parent.width * 0.13
radius: height / 2
border.width: 1
border.color: Material.frameColor
color: "transparent"
Label {
anchors.fill: parent
padding: parent.parent.height * 0.1
leftPadding: padding * 2
rightPadding: leftPadding
font.pixelSize: parent.height * 0.5
font.bold: true
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]["start_number"]:""
}
}
Item {
Layout.fillHeight: true
Layout.fillWidth: true
}
Label {
Layout.preferredHeight: parent.height
Layout.preferredWidth: parent.width * 0.15
height: parent.height
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight
font.pixelSize: height * 0.5
font.bold: matchItm.winnerIndex === index
color: matchItm.winnerIndex === index ? Material.color(Material.Green):Material.primaryTextColor
text: matchItm.thisMatchData[index] !== undefined && matchItm.thisMatchData[index]['result'+matchItm.thisRound] !== undefined ?
( parseFloat(matchItm.thisMatchData[index]['result'+matchItm.thisRound]) ?

1
resources/qml/main.qml
View file

@ -199,7 +199,6 @@ Window {
//openWidget({person: 6623})
//console.log(JSON.stringify(serverConn.getParamsFromUrl("")))
//openWidgetFromUrl("https://l.bluerock.dev/?comp=11501&cat=GER_M")
//openWidgetFromUrl("https://www.digitalrock.de/egroupware/ranking/json.php?cat=12&comp=12171&type=")
}
FontLoader {