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

Merge v0.6.0 and v0.6.1 #29

Merged
dorian merged 30 commits from version/0.5.1 into master 2024-10-17 17:52:37 +02:00
Conversation 1 Commits 30 Files changed 136 +20 -20
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 45fd7add57 - Show all commits

2
README.md
View file

@ -17,4 +17,4 @@ The poster offsets are (always top left of the element):
- Size: 1100x1100 - Size: 1100x1100
### Comp name ### Comp name
- Cooridnates: x: 216, y: 1670 - Cooridnates: x: 216, y: 1670
- Size: 44 - Size: 44 per line; 1220 width

BIN
resources/translations/de.qm
View file

Binary file not shown.

20
resources/translations/de.ts
View file

@ -62,13 +62,13 @@
<translation>Poster</translation> <translation>Poster</translation>
</message> </message>
<message id="#purchaseFailed"> <message id="#purchaseFailed">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="20"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="17"/>
<source>Purchase failed</source> <source>Purchase failed</source>
<translation>Kauf fehlgeschlagen</translation> <translation>Kauf fehlgeschlagen</translation>
</message> </message>
<message id="#buyNowFor"> <message id="#buyNowFor">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="34"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="31"/>
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="90"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="86"/>
<source>Buy now for</source> <source>Buy now for</source>
<translation>Jetzt kaufen für</translation> <translation>Jetzt kaufen für</translation>
</message> </message>
@ -77,23 +77,23 @@
<translation type="vanished">Diese Produkt ist nicht verfügbar</translation> <translation type="vanished">Diese Produkt ist nicht verfügbar</translation>
</message> </message>
<message id="#thisIsAPremiumFeature"> <message id="#thisIsAPremiumFeature">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="60"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="56"/>
<source>This is a premium feature.</source> <source>This is a premium feature.</source>
<translation>Das ist eine premium Funktion.</translation> <translation>Das ist eine premium Funktion.</translation>
</message> </message>
<message id="#itemIsUnavailable"> <message id="#itemIsUnavailable">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="36"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="33"/>
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="91"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="87"/>
<source>This item is currently unavailable</source> <source>This item is currently unavailable</source>
<translation>Dieses Produkt ist nicht verfügbar</translation> <translation>Dieses Produkt ist nicht verfügbar</translation>
</message> </message>
<message id="#restorePurchase"> <message id="#restorePurchase">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="107"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="110"/>
<source>Restore purchase</source> <source>Restore purchase</source>
<translation>Kauf wiederherstellen</translation> <translation>Kauf wiederherstellen</translation>
</message> </message>
<message id="#contact support"> <message id="#contact support">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="118"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="124"/>
<source>contact support</source> <source>contact support</source>
<translation>Support kontaktieren</translation> <translation>Support kontaktieren</translation>
</message> </message>
@ -125,12 +125,12 @@
<message id="#ifscDisclaimer"> <message id="#ifscDisclaimer">
<location filename="../qml/Pages/StartPage.qml" line="167"/> <location filename="../qml/Pages/StartPage.qml" line="167"/>
<source>Unfortunately, the IFSC has restricted the access to their data and &lt;b&gt;is not willing to share results with blueROCK anymore&lt;/b&gt;. Because of this, blueROCK is no longer able to access and display IFSC results.&lt;br&gt;&lt;br&gt;You can find current IFSC results &lt;a href=&quot;https://ifsc.results.info&quot;&gt;over here&lt;/a&gt; and on &lt;a href=&quot;https://ifsc-climbing.org&quot;&gt;their website&lt;/a&gt;.</source> <source>Unfortunately, the IFSC has restricted the access to their data and &lt;b&gt;is not willing to share results with blueROCK anymore&lt;/b&gt;. Because of this, blueROCK is no longer able to access and display IFSC results.&lt;br&gt;&lt;br&gt;You can find current IFSC results &lt;a href=&quot;https://ifsc.results.info&quot;&gt;over here&lt;/a&gt; and on &lt;a href=&quot;https://ifsc-climbing.org&quot;&gt;their website&lt;/a&gt;.</source>
<translation>Leider hat die IFSC den Zugang zu ihren Ergebnissen eingeschränkt&lt;b&gt;und ist nicht mehr bereit, Ergebnisse mit blueROCK zu teilen&lt;/b&gt;. Daher ist blueROCK nicht länger in der Lage auf IFSC Ergebnisse zuzugriefen und diese anzuzeigen.&lt;br&gt;&lt;br&gt;Aktuelle IFSC Ergebnisse finden sich &lt;a href=&quot;https://ifsc.results.info&quot;&gt;hier&lt;/a&gt; und auf der &lt;a href=&quot;https://ifsc-climbing.org&quot;&gt;IFSC Webseite&lt;/a&gt;.</translation> <translation>Leider hat die IFSC den Zugang zu ihren Ergebnissen eingeschränkt &lt;b&gt;und ist nicht mehr bereit, Ergebnisse mit blueROCK zu teilen&lt;/b&gt;. Daher ist blueROCK nicht länger in der Lage auf IFSC Ergebnisse zuzugriefen und diese anzuzeigen.&lt;br&gt;&lt;br&gt;Aktuelle IFSC Ergebnisse finden sich &lt;a href=&quot;https://ifsc.results.info&quot;&gt;hier&lt;/a&gt; und auf der &lt;a href=&quot;https://ifsc-climbing.org&quot;&gt;IFSC Webseite&lt;/a&gt;.</translation>
</message> </message>
<message id="#aboutBluerockDisclaimer"> <message id="#aboutBluerockDisclaimer">
<location filename="../qml/Pages/StartPage.qml" line="175"/> <location filename="../qml/Pages/StartPage.qml" line="175"/>
<source>This app was built using the &lt;a href=&apos;https://qt.io&apos;&gt;Qt Framework&lt;/a&gt; licensed under the &lt;a href=&apos;https://www.gnu.org/licenses/lgpl-3.0.en.html&apos;&gt;GNU lgplV3 license&lt;/a&gt;.&lt;br&gt;&lt;br&gt;This app is open source and licensed under the &lt;a href=&apos;https://www.gnu.org/licenses/agpl-3.0.en.html&apos;&gt;GNU agplV3 license&lt;/a&gt;, the source code can be found &lt;a href=&apos;https://itsblue.dev/dorian/blueROCK/&apos;&gt;here&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Resultservice and rankings provided by &lt;a href=&apos;http://www.digitalROCK.de&apos;&gt;digital ROCK&lt;/a&gt;.</source> <source>This app was built using the &lt;a href=&apos;https://qt.io&apos;&gt;Qt Framework&lt;/a&gt; licensed under the &lt;a href=&apos;https://www.gnu.org/licenses/lgpl-3.0.en.html&apos;&gt;GNU lgplV3 license&lt;/a&gt;.&lt;br&gt;&lt;br&gt;This app is open source and licensed under the &lt;a href=&apos;https://www.gnu.org/licenses/agpl-3.0.en.html&apos;&gt;GNU agplV3 license&lt;/a&gt;, the source code can be found &lt;a href=&apos;https://itsblue.dev/dorian/blueROCK/&apos;&gt;here&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Resultservice and rankings provided by &lt;a href=&apos;http://www.digitalROCK.de&apos;&gt;digital ROCK&lt;/a&gt;.</source>
<translation>Diese App wurde unter Verwendung des &lt;a href=&apos;https://qt.io&apos;&gt;Qt Frameworks&lt;/a&gt; unter der &lt;a href=&apos;https://www.gnu.org/licenses/lgpl-3.0.en.html&apos;&gt;GNU lgplV3 Lizenz&lt;/a&gt; erstellt.&lt;br&gt;&lt;br&gt;Diese App ist Open-source und lizensiert unter der &lt;a href=&apos;https://www.gnu.org/licenses/agpl-3.0.en.html&apos;&gt;GNU agplV3 Lizenz&lt;/a&gt;. Der Sourcecode findet sich &lt;a href=&apos;https://itsblue.dev/dorian/blueROCK/&apos;&gt;hier&lt;/a&gt;.Die Ergebnisse und Ranglisten werden von &lt;a href=&apos;http://www.digitalROCK.de&apos;&gt;digital ROCK&lt;/a&gt; zur Verfügung gestellt.</translation> <translation>Diese App wurde unter Verwendung des &lt;a href=&apos;https://qt.io&apos;&gt;Qt Frameworks&lt;/a&gt; unter der &lt;a href=&apos;https://www.gnu.org/licenses/lgpl-3.0.en.html&apos;&gt;GNU lgplV3 Lizenz&lt;/a&gt; erstellt.&lt;br&gt;&lt;br&gt;Diese App ist Open-source und lizensiert unter der &lt;a href=&apos;https://www.gnu.org/licenses/agpl-3.0.en.html&apos;&gt;GNU agplV3 Lizenz&lt;/a&gt;. Der Sourcecode findet sich &lt;a href=&apos;https://itsblue.dev/dorian/blueROCK/&apos;&gt;hier&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Die Ergebnisse und Ranglisten werden von &lt;a href=&apos;http://www.digitalROCK.de&apos;&gt;digital ROCK&lt;/a&gt; zur Verfügung gestellt.</translation>
</message> </message>
<message id="#calendar"> <message id="#calendar">
<location filename="../qml/Widgets/CalendarWidget.qml" line="32"/> <location filename="../qml/Widgets/CalendarWidget.qml" line="32"/>

16
resources/translations/en.ts
View file

@ -62,34 +62,34 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="#purchaseFailed"> <message id="#purchaseFailed">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="20"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="17"/>
<source>Purchase failed</source> <source>Purchase failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="#buyNowFor"> <message id="#buyNowFor">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="34"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="31"/>
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="90"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="86"/>
<source>Buy now for</source> <source>Buy now for</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="#thisIsAPremiumFeature"> <message id="#thisIsAPremiumFeature">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="60"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="56"/>
<source>This is a premium feature.</source> <source>This is a premium feature.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="#itemIsUnavailable"> <message id="#itemIsUnavailable">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="36"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="33"/>
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="91"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="87"/>
<source>This item is currently unavailable</source> <source>This item is currently unavailable</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="#restorePurchase"> <message id="#restorePurchase">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="107"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="110"/>
<source>Restore purchase</source> <source>Restore purchase</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="#contact support"> <message id="#contact support">
<location filename="../qml/Components/SpeedFlowChartLocker.qml" line="118"/> <location filename="../qml/Components/SpeedFlowChartLocker.qml" line="124"/>
<source>contact support</source> <source>contact support</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

2
sources/bluerockbackend.cpp
View file

@ -143,7 +143,7 @@ void BlueRockBackend::shareResultsAsPoster(QString url, QString compName) {
painter.setFont(font); painter.setFont(font);
painter.setPen(Qt::black); painter.setPen(Qt::black);
// QFontMetrics(painter.font()).size(Qt::TextSingleLine, "One ").width() // QFontMetrics(painter.font()).size(Qt::TextSingleLine, "One ").width()
painter.drawText(QRect(216, 1670, 1100, 100), Qt::AlignLeft|Qt::AlignTop|Qt::TextWordWrap, rawCompName); painter.drawText(QRect(216, 1670, 1220, 100), Qt::AlignLeft|Qt::AlignTop|Qt::TextWordWrap, rawCompName);
painter.end(); painter.end();
file.close(); file.close();