Merge v0.6.0 and v0.6.1 #29
8 changed files with 20 additions and 18 deletions
|
|
@ -214,7 +214,7 @@ ColoredItemDelegate {
|
|||
context.arc(radius + offsetX, radius + offsetY, radius, Math.PI, 1.5 * Math.PI);
|
||||
|
||||
// fill
|
||||
if(resultData[0] !== -1) {
|
||||
if(resultData[0] !== -1 || resultData[2] !== -1) {
|
||||
// if there is a result available -> draw background
|
||||
context.fillStyle = "#b7b7b7";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ Page {
|
|||
id: aboutBluerockDisclaimerDialog
|
||||
Material.theme: root.Material.theme
|
||||
title: "blueROCK v" + APP_VERSION + "<br>By <a href=\"https://itsblue.de\">Itsblue Development</a>"
|
||||
//% "This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>."
|
||||
//% "This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/blueROCK/app'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>."
|
||||
content: qsTrId("#aboutBluerockDisclaimer")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -282,6 +282,7 @@ Page {
|
|||
|
||||
property int delegateHeight: 50
|
||||
spacing: 10
|
||||
clip: true
|
||||
|
||||
implicitHeight: model === 0 ? 0:(delegateHeight + spacing) * model
|
||||
|
||||
|
|
|
|||
|
|
@ -435,7 +435,6 @@ DataListView {
|
|||
|
||||
property int delegateHeight: 50
|
||||
spacing: 10
|
||||
|
||||
clip: true
|
||||
|
||||
implicitHeight: model === 0 ? 0:(delegateHeight + spacing) * model
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -129,8 +129,9 @@
|
|||
</message>
|
||||
<message id="#aboutBluerockDisclaimer">
|
||||
<location filename="../qml/Pages/StartPage.qml" line="175"/>
|
||||
<source>This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.</source>
|
||||
<translation>Diese App wurde unter Verwendung des <a href='https://qt.io'>Qt Frameworks</a> unter der <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 Lizenz</a> erstellt.<br><br>Diese App ist Open-source und lizensiert unter der <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 Lizenz</a>. Der Sourcecode findet sich <a href='https://itsblue.dev/dorian/blueROCK/'>hier</a>.<br><br>Die Ergebnisse und Ranglisten werden von <a href='http://www.digitalROCK.de'>digital ROCK</a> zur Verfügung gestellt.</translation>
|
||||
<source>This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/blueROCK/app'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.</source>
|
||||
<oldsource>This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.</oldsource>
|
||||
<translation>Diese App wurde unter Verwendung des <a href='https://qt.io'>Qt Frameworks</a> unter der <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 Lizenz</a> erstellt.<br><br>Diese App ist Open-source und lizensiert unter der <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 Lizenz</a>. Der Sourcecode findet sich <a href='https://itsblue.dev/blueROCK/app'>hier</a>.<br><br>Die Ergebnisse und Ranglisten werden von <a href='http://www.digitalROCK.de'>digital ROCK</a> zur Verfügung gestellt.</translation>
|
||||
</message>
|
||||
<message id="#calendar">
|
||||
<location filename="../qml/Widgets/CalendarWidget.qml" line="32"/>
|
||||
|
|
@ -174,9 +175,9 @@
|
|||
</message>
|
||||
<message id="#selectCategory">
|
||||
<location filename="../qml/Widgets/CalendarWidget.qml" line="278"/>
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="127"/>
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="169"/>
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="98"/>
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="124"/>
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="159"/>
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="94"/>
|
||||
<source>Select category</source>
|
||||
<translation>Kategorie auswählen</translation>
|
||||
</message>
|
||||
|
|
@ -216,17 +217,17 @@
|
|||
<translation>(Registrierung)</translation>
|
||||
</message>
|
||||
<message id="#showResults">
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="129"/>
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="126"/>
|
||||
<source>Show results</source>
|
||||
<translation>Ergebnisse anzeigen</translation>
|
||||
</message>
|
||||
<message id="#resultsHeadline">
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="136"/>
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="130"/>
|
||||
<source>(Results)</source>
|
||||
<translation>(Ergebnisse)</translation>
|
||||
</message>
|
||||
<message id="#startlistHeadline">
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="72"/>
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="65"/>
|
||||
<source>(Startlist)</source>
|
||||
<translation>(Startliste)</translation>
|
||||
</message>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -125,7 +125,8 @@
|
|||
</message>
|
||||
<message id="#aboutBluerockDisclaimer">
|
||||
<location filename="../qml/Pages/StartPage.qml" line="175"/>
|
||||
<source>This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.</source>
|
||||
<source>This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/blueROCK/app'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.</source>
|
||||
<oldsource>This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/dorian/blueROCK/'>here</a>.<br><br>Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>.</oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message id="#calendar">
|
||||
|
|
@ -170,9 +171,9 @@
|
|||
</message>
|
||||
<message id="#selectCategory">
|
||||
<location filename="../qml/Widgets/CalendarWidget.qml" line="278"/>
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="127"/>
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="169"/>
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="98"/>
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="124"/>
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="159"/>
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="94"/>
|
||||
<source>Select category</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -212,17 +213,17 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message id="#showResults">
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="129"/>
|
||||
<location filename="../qml/Widgets/RegistrationWidget.qml" line="126"/>
|
||||
<source>Show results</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message id="#resultsHeadline">
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="136"/>
|
||||
<location filename="../qml/Widgets/ResultWidget.qml" line="130"/>
|
||||
<source>(Results)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message id="#startlistHeadline">
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="72"/>
|
||||
<location filename="../qml/Widgets/StartlistWidget.qml" line="65"/>
|
||||
<source>(Startlist)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
|
|||
Loading…
Reference in a new issue