From 9af65bd746fafc354965744d0332eb803bb80d27 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 6 Aug 2021 21:39:29 +0200 Subject: [PATCH] - Fix selector popup clipping - Fix rare issue with backgound of boulder result rect --- resources/qml/Components/ResultDelegate.qml | 2 +- resources/qml/Pages/StartPage.qml | 2 +- resources/qml/Pages/WidgetPage.qml | 1 + resources/qml/Widgets/CalendarWidget.qml | 1 - resources/translations/de.qm | Bin 5874 -> 5866 bytes resources/translations/de.ts | 17 +++++++++-------- resources/translations/en.qm | Bin 5436 -> 5428 bytes resources/translations/en.ts | 15 ++++++++------- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/resources/qml/Components/ResultDelegate.qml b/resources/qml/Components/ResultDelegate.qml index dd8125b..e0d4df3 100644 --- a/resources/qml/Components/ResultDelegate.qml +++ b/resources/qml/Components/ResultDelegate.qml @@ -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"; } diff --git a/resources/qml/Pages/StartPage.qml b/resources/qml/Pages/StartPage.qml index 2b766eb..28c90e2 100644 --- a/resources/qml/Pages/StartPage.qml +++ b/resources/qml/Pages/StartPage.qml @@ -171,7 +171,7 @@ Page { id: aboutBluerockDisclaimerDialog Material.theme: root.Material.theme title: "blueROCK v" + APP_VERSION + "
By Itsblue Development" - //% "This app was built using the Qt Framework licensed under the GNU lgplV3 license.

This app is open source and licensed under the GNU agplV3 license, the source code can be found here.

Resultservice and rankings provided by digital ROCK." + //% "This app was built using the Qt Framework licensed under the GNU lgplV3 license.

This app is open source and licensed under the GNU agplV3 license, the source code can be found here.

Resultservice and rankings provided by digital ROCK." content: qsTrId("#aboutBluerockDisclaimer") } } diff --git a/resources/qml/Pages/WidgetPage.qml b/resources/qml/Pages/WidgetPage.qml index ee303af..9a5a68a 100644 --- a/resources/qml/Pages/WidgetPage.qml +++ b/resources/qml/Pages/WidgetPage.qml @@ -282,6 +282,7 @@ Page { property int delegateHeight: 50 spacing: 10 + clip: true implicitHeight: model === 0 ? 0:(delegateHeight + spacing) * model diff --git a/resources/qml/Widgets/CalendarWidget.qml b/resources/qml/Widgets/CalendarWidget.qml index c82baae..03ae164 100644 --- a/resources/qml/Widgets/CalendarWidget.qml +++ b/resources/qml/Widgets/CalendarWidget.qml @@ -435,7 +435,6 @@ DataListView { property int delegateHeight: 50 spacing: 10 - clip: true implicitHeight: model === 0 ? 0:(delegateHeight + spacing) * model diff --git a/resources/translations/de.qm b/resources/translations/de.qm index e8cf818b089e85d514cd0e065ccd1dc15de02aa2..6372228e3e75d0f150431690034a19943588b85f 100644 GIT binary patch delta 448 zcmeyQ`$~6$a(x+t=7OCJ3~W~z_ZX%!FbLQ%KJj&8VBoW1;#XE-U|@A;+M&$Az#z!T z^w7YRfkA|eIegu71_s_n=BR8Xpt@@2m?@ta7aS!z#CZrPzk)?8em77f z150VDC<6m~ElWenOrZRBmR~7AzKAEQqsV3khI&CaRzHUj1_piw)(usQ7#KJ_ShrkX z4Ak(4_1)Z~K!fkI*`5L#%>S01W8)2=#^3CDdQ%w~gk;$(`kR3K4eWC&nSl1#vd>cl zIz;dt`@&bo3=G0j9NK4>0`)EB&`A~odPI_Af(|RtTvv__%eDX={(|G@;ztbi41BDd zw^Y9ZE%N1jxc)HEy)(I#_*xklxJ$S!{3Zi6&gTlP0vgDDl`A>47-;ZeZqpN|ffgO* zZcYa}Sg?~vdR7b2K}&eEy@5232ygZ@XP`x=d4Det1%`wdUx*q|9m_4g)UzOuWbqX| zxC}HWgWpK{s~}LLAAeF7P$S!qOa=x~qsbc?9T|Bxe`b8jB%Z{O!%)hQ$`Hih&*049 S&7jYa$WXvgu=zX7Z$SXFTyeJm delta 456 zcmaE*`$>0#a(x|x=7OCJ3~YB8_ZX%!FbKFXKJj&8VBm9M;#XE-U|{uU+M&$Az#z!U z^w7YRfk8xwIegu71_s_v=BR8Xpt@$}m?@ta7ThH|#CZrPzkx+7em77f z150VDC<6m~D@#MlOrZRJmR~7AzDOXeqsV3khI&CiRzHUj1_pi&)(usQ7#KJLShrkX z45V3D-_1P=H2682?J1za{9oBQHr`-h5M^f1)0@h`Af(D((cc6#Xb1b8N+zH^w(Rp1 zfesP;#=h{CF$06J5{LHLr9gdaIdqbRfF4ogn4rT7bcip~9V|GJM|xHZ&_Qc>v%P^dj|^}2G-seimwA6L4+Vxq5MPKIP#w!7zSOfIj}-A0 zJh%)rr-0u``l}#NV;Fx@7EmKQLnhFBR+Bd}Ix>oE{>=E4Nj`-kpP>jSoXC*JpwE!R Zki$^QkjfCm;LqU9;LV`F`8~^TK>$tIakT&d diff --git a/resources/translations/de.ts b/resources/translations/de.ts index c0ed7bb..0fed67b 100644 --- a/resources/translations/de.ts +++ b/resources/translations/de.ts @@ -129,8 +129,9 @@ - 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>. - 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. + 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>. + 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>. + 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. @@ -174,9 +175,9 @@ - - - + + + Select category Kategorie auswählen @@ -216,17 +217,17 @@ (Registrierung) - + Show results Ergebnisse anzeigen - + (Results) (Ergebnisse) - + (Startlist) (Startliste) diff --git a/resources/translations/en.qm b/resources/translations/en.qm index e12ab652e960d1d7ceb69e06b877652087a5f5ff..444cfef5a9c1ff777b23e6247cef6815a10d6940 100644 GIT binary patch delta 448 zcmdm^wMA=!OuY$%=7OCJ3~ULEdkj+<82FhOpZGd4Fz}i%@hht^FtEI5+M&z<6yMDB z(7=>|K`4(oeBE;f2A)>tsB9&mx=iMnDW4b^xEC<5kx>Pzvt&NRc?c-Kfki8RH&7!3 zOKGYo(EP6~4Jk8$@`WtFQhR&n^Y(E9cNj76LlsAjbq9R-i+Ua%@<(1!&(Xj-QJkG1N2gvU1*1 z{R*@wp7Y`Q!$5_>TuOYc3=CY;xGel8Gcd5abA?s`4dnXDl^j|Obh#50=oi=w%k z(}4~aQ00-H)dIB8gg4t8NOSA)W>0eldcctP_wrC+NCfePr~%cn^zfyg1$o4Qui(LD zp!#?GM$%sefd)L`Ps##nWNXRLUS<+cV#r}AWk_WRV(@2hX7Fav QXGmlyU?|x9fF(u%0Fc>nW&i*H delta 456 zcmdm@wMT1$OuY?*=7OCJ3~U*Udkj+<82GsupZGd4F!0(i@hht^FtB`Q+M&z<6yMGC z(7=>|L8y#5eBE;f2A*E#sB9&mxPzb7Vfmc?c-KgGDQTH&7!3 zOKGYo(EPtF4Jk8$@|7&VQhF_BoYIKzr=j=P3dm zBGALW@RczGgWx6(?XydP`sz7!l7)cIILR?VhZX3Mvm6_iZ2>y`635TQj~MD1czHQ* zseT1ol+O8Z{b8WOXf7qbRt5&Hd0ZBLlNlIT{kcM`fCh5?<;ZMo}YGmum1bS!E - 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>. + 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>. @@ -170,9 +171,9 @@ - - - + + + Select category @@ -212,17 +213,17 @@ - + Show results - + (Results) - + (Startlist)