diff --git a/i18n/radar_de.ts b/i18n/radar_de.ts
index 4ab1ca393c4dc4945fc86d3fc09debf11e8c54a9..8b9aa0b270642fe8c563a1709f5efa58de5eb47d 100644
--- a/i18n/radar_de.ts
+++ b/i18n/radar_de.ts
@@ -4,37 +4,37 @@
<context>
<name>App</name>
<message>
- <location filename="../src/app.cpp" line="978"/>
+ <location filename="../src/app.cpp" line="841"/>
<source>Radar App</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="978"/>
+ <location filename="../src/app.cpp" line="841"/>
<source>Link to Android APK: %1</source>
<translation>Link zu Android APK: %1</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1018"/>
+ <location filename="../src/app.cpp" line="881"/>
<source>-- All ---</source>
<translation>-- Alle --</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1086"/>
+ <location filename="../src/app.cpp" line="949"/>
<source>%1 days, %2 hours %3 minutes</source>
<translation>%1 Tage, %2 Stunden %3 Minuten</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1088"/>
+ <location filename="../src/app.cpp" line="951"/>
<source>%1:%2</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1120"/>
+ <location filename="../src/app.cpp" line="983"/>
<source>%1, %2</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1200"/>
+ <location filename="../src/app.cpp" line="1064"/>
<source>%1
Date: %2
%3
@@ -46,6 +46,11 @@ Datum: %2
Link: %4</translation>
</message>
+ <message>
+ <location filename="../src/app.cpp" line="1117"/>
+ <source>Event</source>
+ <translation>Veranstaltung</translation>
+ </message>
</context>
<context>
<name>EventView</name>
@@ -55,77 +60,77 @@ Link: %4</translation>
<translation>Kategorie:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="155"/>
+ <location filename="../ui/EventView.qml" line="161"/>
<source>at:</source>
<translation>wo:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="202"/>
+ <location filename="../ui/EventView.qml" line="212"/>
<source>Force Plaintext</source>
<translation>Formatierung ausschalten</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="211"/>
+ <location filename="../ui/EventView.qml" line="221"/>
<source>When:</source>
<translation>Wann:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="228"/>
+ <location filename="../ui/EventView.qml" line="242"/>
<source>Duration:</source>
<translation>Dauer:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="242"/>
+ <location filename="../ui/EventView.qml" line="260"/>
<source>Price:</source>
<translation>Preis:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="256"/>
+ <location filename="../ui/EventView.qml" line="278"/>
<source>Address:</source>
<translation>Adresse:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="281"/>
+ <location filename="../ui/EventView.qml" line="327"/>
<source>View on Map</source>
<translation>An der Karte ansehen</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="290"/>
+ <location filename="../ui/EventView.qml" line="338"/>
<source>Directions:</source>
<translation>Fahrt:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="325"/>
+ <location filename="../ui/EventView.qml" line="383"/>
<source>Add to calendar</source>
<translation>Ins Kalender eintragen</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="329"/>
+ <location filename="../ui/EventView.qml" line="387"/>
<source>Plan</source>
<translation>Planen</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="349"/>
+ <location filename="../ui/EventView.qml" line="409"/>
<source>Show in Browser</source>
<translation>Im Browser öffnen</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="353"/>
+ <location filename="../ui/EventView.qml" line="413"/>
<source>View</source>
<translation>Zeigen</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="373"/>
+ <location filename="../ui/EventView.qml" line="436"/>
<source>Share...</source>
<translation>Teilen...</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="377"/>
+ <location filename="../ui/EventView.qml" line="440"/>
<source>Share</source>
<translation>Teilen</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="402"/>
+ <location filename="../ui/EventView.qml" line="465"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -138,37 +143,37 @@ Link: %4</translation>
<translation>Land</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="89"/>
+ <location filename="../ui/LocationPage.qml" line="94"/>
<source>City</source>
<translation>Stadt</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="127"/>
+ <location filename="../ui/LocationPage.qml" line="138"/>
<source>Remember location</source>
<translation>Die Lage merken</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="142"/>
+ <location filename="../ui/LocationPage.qml" line="153"/>
<source>%1 events in this area</source>
<translation>%1 Veranstaltung(en) gefunden</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="149"/>
+ <location filename="../ui/LocationPage.qml" line="160"/>
<source>%1 events today</source>
<translation>%1 Veranstaltung(en) heute</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="173"/>
+ <location filename="../ui/LocationPage.qml" line="184"/>
<source>Show ></source>
<translation>Zeigen ></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="174"/>
+ <location filename="../ui/LocationPage.qml" line="185"/>
<source>Show...</source>
<translation>Zeigen...</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="159"/>
+ <location filename="../ui/LocationPage.qml" line="170"/>
<source>Reload...</source>
<translation>Neuladen...</translation>
</message>
@@ -189,7 +194,7 @@ Link: %4</translation>
<context>
<name>ResultsPage</name>
<message>
- <location filename="../ui/ResultsPage.qml" line="99"/>
+ <location filename="../ui/ResultsPage.qml" line="103"/>
<source>Nothing found in %1</source>
<translation>%1: nichts gefunden</translation>
</message>
@@ -197,53 +202,51 @@ Link: %4</translation>
<context>
<name>main</name>
<message>
- <location filename="../ui/main.qml" line="41"/>
- <location filename="../ui/main.qml" line="223"/>
+ <location filename="../ui/main.qml" line="43"/>
+ <location filename="../ui/main.qml" line="294"/>
<source>Radar App</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="97"/>
+ <location filename="../ui/main.qml" line="92"/>
<source>Event on Map</source>
<translation>Vernstaltung an der Karte</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="100"/>
<source>Event</source>
- <translation>Veranstaltung</translation>
+ <translation type="vanished">Veranstaltung</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="104"/>
+ <location filename="../ui/main.qml" line="66"/>
<source>Location</source>
<translation>Ort</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="106"/>
<source>Ongoing events</source>
- <translation>Veranstaltungen</translation>
+ <translation type="vanished">Veranstaltungen</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="108"/>
+ <location filename="../ui/main.qml" line="70"/>
<source>Radar</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="193"/>
+ <location filename="../ui/main.qml" line="264"/>
<source>Reload Countries</source>
<translation>Länder neuladen</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="199"/>
+ <location filename="../ui/main.qml" line="270"/>
<source>About</source>
<translation>Über die App</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="204"/>
+ <location filename="../ui/main.qml" line="275"/>
<source>Share App...</source>
<translation>App Teilen...</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="209"/>
+ <location filename="../ui/main.qml" line="280"/>
<source>Share via QR-code...</source>
<translation>Mit QR-Kode teilen...</translation>
</message>
@@ -252,67 +255,71 @@ Link: %4</translation>
<translation type="vanished"><p>Copyright © 2019-2021</p><p>Für dieses Programm besteht KEINERLEI GARANTIE.</p><p>Dies ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen</p><p><a href="http://www.gnu.de/documents/gpl-3.0.de.html">Details…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Quelltext…</a></p></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="236"/>
<source><p>Copyright © 2021</p><p>This program comes with ABSOLUTELY NO WARRANTY.</p><p>This is free software, and you are welcome to redistribute it under certain conditions.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.en.html">Details on License…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Source code…</a></p></source>
- <translation><p>Copyright © 2019-2021</p><p>Für dieses Programm besteht KEINERLEI GARANTIE.</p><p>Dies ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen</p><p><a href="http://www.gnu.de/documents/gpl-3.0.de.html">Lizenz…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Quelltext…</a></p></translation>
+ <translation type="vanished"><p>Copyright © 2019-2021</p><p>Für dieses Programm besteht KEINERLEI GARANTIE.</p><p>Dies ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen</p><p><a href="http://www.gnu.de/documents/gpl-3.0.de.html">Lizenz…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Quelltext…</a></p></translation>
+ </message>
+ <message>
+ <location filename="../ui/main.qml" line="307"/>
+ <source><p>Copyright © 2023</p><p>This program comes with ABSOLUTELY NO WARRANTY.</p><p>This is free software, and you are welcome to redistribute it under certain conditions.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.en.html">Details on License…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Source code…</a></p></source>
+ <translation><p>Copyright © 2019-2021</p><p>Für dieses Programm besteht KEINERLEI GARANTIE.</p><p>Dies ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen</p><p><a href="http://www.gnu.de/documents/gpl-3.0.de.html">Lizenz…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Quelltext…</a></p> {2023<?} {3.0.?} {0x?}</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="257"/>
+ <location filename="../ui/main.qml" line="328"/>
<source>Scan QR Code to download</source>
<translation>Scannen Sie die QR Code zum Unterladen</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="292"/>
+ <location filename="../ui/main.qml" line="363"/>
<source>No Maps application available.</source>
<translation>Keine Karten App verfügbar.</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="296"/>
+ <location filename="../ui/main.qml" line="367"/>
<source>Do you want to see event location with web browser?</source>
<translation>Möchten Sie diese Veranstaltung im Browser ansehen?</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="312"/>
+ <location filename="../ui/main.qml" line="383"/>
<source>Failed to load data</source>
<translation>Fehler beim Laden von Dateien</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="313"/>
+ <location filename="../ui/main.qml" line="384"/>
<source>Network Errror</source>
<translation>Netzwerk Fehler</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="399"/>
+ <location filename="../ui/main.qml" line="469"/>
<source>< Back</source>
<translation>< Zurück</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="424"/>
+ <location filename="../ui/main.qml" line="494"/>
<source>Next ></source>
<translation>Weiter ></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="521"/>
+ <location filename="../ui/main.qml" line="590"/>
<source>Please wait…</source>
<translation>Bitte warten...</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="551"/>
+ <location filename="../ui/main.qml" line="620"/>
<source>Getting events</source>
<translation>Veranstaltungen werden geladen</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="554"/>
+ <location filename="../ui/main.qml" line="623"/>
<source>Filtering events</source>
<translation>Veranstaltungen werden gefilteret</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="557"/>
+ <location filename="../ui/main.qml" line="626"/>
<source>Loading countries</source>
<translation>Länder werden geladen</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="560"/>
+ <location filename="../ui/main.qml" line="629"/>
<source>Loading cities</source>
<translation>Städte werden geladen</translation>
</message>
diff --git a/i18n/radar_en.ts b/i18n/radar_en.ts
index 9f836e207d3105891a002b384c8150b94476a98d..946c548c10f8f7682f7db9d3d89cd735768ebe5f 100644
--- a/i18n/radar_en.ts
+++ b/i18n/radar_en.ts
@@ -4,37 +4,37 @@
<context>
<name>App</name>
<message>
- <location filename="../src/app.cpp" line="978"/>
+ <location filename="../src/app.cpp" line="841"/>
<source>Radar App</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="978"/>
+ <location filename="../src/app.cpp" line="841"/>
<source>Link to Android APK: %1</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1018"/>
+ <location filename="../src/app.cpp" line="881"/>
<source>-- All ---</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1086"/>
+ <location filename="../src/app.cpp" line="949"/>
<source>%1 days, %2 hours %3 minutes</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1088"/>
+ <location filename="../src/app.cpp" line="951"/>
<source>%1:%2</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1120"/>
+ <location filename="../src/app.cpp" line="983"/>
<source>%1, %2</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1200"/>
+ <location filename="../src/app.cpp" line="1064"/>
<source>%1
Date: %2
%3
@@ -42,6 +42,11 @@ Date: %2
Link: %4</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../src/app.cpp" line="1117"/>
+ <source>Event</source>
+ <translation></translation>
+ </message>
</context>
<context>
<name>EventView</name>
@@ -51,77 +56,77 @@ Link: %4</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="155"/>
+ <location filename="../ui/EventView.qml" line="161"/>
<source>at:</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="202"/>
+ <location filename="../ui/EventView.qml" line="212"/>
<source>Force Plaintext</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="211"/>
+ <location filename="../ui/EventView.qml" line="221"/>
<source>When:</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="228"/>
+ <location filename="../ui/EventView.qml" line="242"/>
<source>Duration:</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="242"/>
+ <location filename="../ui/EventView.qml" line="260"/>
<source>Price:</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="256"/>
+ <location filename="../ui/EventView.qml" line="278"/>
<source>Address:</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="281"/>
+ <location filename="../ui/EventView.qml" line="327"/>
<source>View on Map</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="290"/>
+ <location filename="../ui/EventView.qml" line="338"/>
<source>Directions:</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="325"/>
+ <location filename="../ui/EventView.qml" line="383"/>
<source>Add to calendar</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="329"/>
+ <location filename="../ui/EventView.qml" line="387"/>
<source>Plan</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="349"/>
+ <location filename="../ui/EventView.qml" line="409"/>
<source>Show in Browser</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="353"/>
+ <location filename="../ui/EventView.qml" line="413"/>
<source>View</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="373"/>
+ <location filename="../ui/EventView.qml" line="436"/>
<source>Share...</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="377"/>
+ <location filename="../ui/EventView.qml" line="440"/>
<source>Share</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="402"/>
+ <location filename="../ui/EventView.qml" line="465"/>
<source>Close</source>
<translation></translation>
</message>
@@ -134,37 +139,37 @@ Link: %4</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="89"/>
+ <location filename="../ui/LocationPage.qml" line="94"/>
<source>City</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="127"/>
+ <location filename="../ui/LocationPage.qml" line="138"/>
<source>Remember location</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="142"/>
+ <location filename="../ui/LocationPage.qml" line="153"/>
<source>%1 events in this area</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="149"/>
+ <location filename="../ui/LocationPage.qml" line="160"/>
<source>%1 events today</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="159"/>
+ <location filename="../ui/LocationPage.qml" line="170"/>
<source>Reload...</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="173"/>
+ <location filename="../ui/LocationPage.qml" line="184"/>
<source>Show ></source>
<translation></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="174"/>
+ <location filename="../ui/LocationPage.qml" line="185"/>
<source>Show...</source>
<translation></translation>
</message>
@@ -185,7 +190,7 @@ Link: %4</source>
<context>
<name>ResultsPage</name>
<message>
- <location filename="../ui/ResultsPage.qml" line="99"/>
+ <location filename="../ui/ResultsPage.qml" line="103"/>
<source>Nothing found in %1</source>
<translation></translation>
</message>
@@ -193,118 +198,108 @@ Link: %4</source>
<context>
<name>main</name>
<message>
- <location filename="../ui/main.qml" line="41"/>
- <location filename="../ui/main.qml" line="223"/>
+ <location filename="../ui/main.qml" line="43"/>
+ <location filename="../ui/main.qml" line="294"/>
<source>Radar App</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="97"/>
+ <location filename="../ui/main.qml" line="92"/>
<source>Event on Map</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="100"/>
- <source>Event</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../ui/main.qml" line="104"/>
+ <location filename="../ui/main.qml" line="66"/>
<source>Location</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="106"/>
- <source>Ongoing events</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../ui/main.qml" line="108"/>
+ <location filename="../ui/main.qml" line="70"/>
<source>Radar</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="193"/>
+ <location filename="../ui/main.qml" line="264"/>
<source>Reload Countries</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="199"/>
+ <location filename="../ui/main.qml" line="270"/>
<source>About</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="204"/>
+ <location filename="../ui/main.qml" line="275"/>
<source>Share App...</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="209"/>
+ <location filename="../ui/main.qml" line="280"/>
<source>Share via QR-code...</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="236"/>
- <source><p>Copyright © 2021</p><p>This program comes with ABSOLUTELY NO WARRANTY.</p><p>This is free software, and you are welcome to redistribute it under certain conditions.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.en.html">Details on License…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Source code…</a></p></source>
+ <location filename="../ui/main.qml" line="307"/>
+ <source><p>Copyright © 2023</p><p>This program comes with ABSOLUTELY NO WARRANTY.</p><p>This is free software, and you are welcome to redistribute it under certain conditions.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.en.html">Details on License…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Source code…</a></p></source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="257"/>
+ <location filename="../ui/main.qml" line="328"/>
<source>Scan QR Code to download</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="292"/>
+ <location filename="../ui/main.qml" line="363"/>
<source>No Maps application available.</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="296"/>
+ <location filename="../ui/main.qml" line="367"/>
<source>Do you want to see event location with web browser?</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="312"/>
+ <location filename="../ui/main.qml" line="383"/>
<source>Failed to load data</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="313"/>
+ <location filename="../ui/main.qml" line="384"/>
<source>Network Errror</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="399"/>
+ <location filename="../ui/main.qml" line="469"/>
<source>< Back</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="424"/>
+ <location filename="../ui/main.qml" line="494"/>
<source>Next ></source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="521"/>
+ <location filename="../ui/main.qml" line="590"/>
<source>Please wait…</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="551"/>
+ <location filename="../ui/main.qml" line="620"/>
<source>Getting events</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="554"/>
+ <location filename="../ui/main.qml" line="623"/>
<source>Filtering events</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="557"/>
+ <location filename="../ui/main.qml" line="626"/>
<source>Loading countries</source>
<translation></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="560"/>
+ <location filename="../ui/main.qml" line="629"/>
<source>Loading cities</source>
<translation></translation>
</message>
diff --git a/i18n/radar_ru.ts b/i18n/radar_ru.ts
index fd4294d875d7e647384836b0a4d029a6f68ec616..de411cb5574105a6ceb9d3d45680a3aa3c1ed298 100644
--- a/i18n/radar_ru.ts
+++ b/i18n/radar_ru.ts
@@ -4,37 +4,37 @@
<context>
<name>App</name>
<message>
- <location filename="../src/app.cpp" line="978"/>
+ <location filename="../src/app.cpp" line="841"/>
<source>Radar App</source>
<translation>Radar</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="978"/>
+ <location filename="../src/app.cpp" line="841"/>
<source>Link to Android APK: %1</source>
<translation>Ссылка на Андроид пакет: %1</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1018"/>
+ <location filename="../src/app.cpp" line="881"/>
<source>-- All ---</source>
<translation>-- все --</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1086"/>
+ <location filename="../src/app.cpp" line="949"/>
<source>%1 days, %2 hours %3 minutes</source>
<translation>%1 дней, %2 часов %3 минут</translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1088"/>
+ <location filename="../src/app.cpp" line="951"/>
<source>%1:%2</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1120"/>
+ <location filename="../src/app.cpp" line="983"/>
<source>%1, %2</source>
<translation></translation>
</message>
<message>
- <location filename="../src/app.cpp" line="1200"/>
+ <location filename="../src/app.cpp" line="1064"/>
<source>%1
Date: %2
%3
@@ -46,6 +46,11 @@ Link: %4</source>
Ссылка: %4</translation>
</message>
+ <message>
+ <location filename="../src/app.cpp" line="1117"/>
+ <source>Event</source>
+ <translation>Мероприятие</translation>
+ </message>
</context>
<context>
<name>EventView</name>
@@ -55,77 +60,77 @@ Link: %4</source>
<translation>Категория:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="155"/>
+ <location filename="../ui/EventView.qml" line="161"/>
<source>at:</source>
<translation>место:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="202"/>
+ <location filename="../ui/EventView.qml" line="212"/>
<source>Force Plaintext</source>
<translation>Без форматирования</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="211"/>
+ <location filename="../ui/EventView.qml" line="221"/>
<source>When:</source>
<translation>Когда:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="228"/>
+ <location filename="../ui/EventView.qml" line="242"/>
<source>Duration:</source>
<translation>Длительность:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="242"/>
+ <location filename="../ui/EventView.qml" line="260"/>
<source>Price:</source>
<translation>Цена:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="256"/>
+ <location filename="../ui/EventView.qml" line="278"/>
<source>Address:</source>
<translation>Адрес:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="281"/>
+ <location filename="../ui/EventView.qml" line="327"/>
<source>View on Map</source>
<translation>Показать на карте</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="290"/>
+ <location filename="../ui/EventView.qml" line="338"/>
<source>Directions:</source>
<translation>Проезд:</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="325"/>
+ <location filename="../ui/EventView.qml" line="383"/>
<source>Add to calendar</source>
<translation>В календарь</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="329"/>
+ <location filename="../ui/EventView.qml" line="387"/>
<source>Plan</source>
<translation>Запланировать</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="349"/>
+ <location filename="../ui/EventView.qml" line="409"/>
<source>Show in Browser</source>
<translation>Открыть в браузере</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="353"/>
+ <location filename="../ui/EventView.qml" line="413"/>
<source>View</source>
<translation>Смотреть</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="373"/>
+ <location filename="../ui/EventView.qml" line="436"/>
<source>Share...</source>
<translation>Поделиться...</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="377"/>
+ <location filename="../ui/EventView.qml" line="440"/>
<source>Share</source>
<translation>Поделиться</translation>
</message>
<message>
- <location filename="../ui/EventView.qml" line="402"/>
+ <location filename="../ui/EventView.qml" line="465"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
@@ -138,37 +143,37 @@ Link: %4</source>
<translation>Страна</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="89"/>
+ <location filename="../ui/LocationPage.qml" line="94"/>
<source>City</source>
<translation>Город</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="127"/>
+ <location filename="../ui/LocationPage.qml" line="138"/>
<source>Remember location</source>
<translation>Запомнить место</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="142"/>
+ <location filename="../ui/LocationPage.qml" line="153"/>
<source>%1 events in this area</source>
<translation>Мероприятий в регионе: %1</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="149"/>
+ <location filename="../ui/LocationPage.qml" line="160"/>
<source>%1 events today</source>
<translation>Мероприятий сегодня: %1</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="173"/>
+ <location filename="../ui/LocationPage.qml" line="184"/>
<source>Show ></source>
<translation>Показать ></translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="174"/>
+ <location filename="../ui/LocationPage.qml" line="185"/>
<source>Show...</source>
<translation>Показать...</translation>
</message>
<message>
- <location filename="../ui/LocationPage.qml" line="159"/>
+ <location filename="../ui/LocationPage.qml" line="170"/>
<source>Reload...</source>
<translation>Перезагрузить...</translation>
</message>
@@ -189,7 +194,7 @@ Link: %4</source>
<context>
<name>ResultsPage</name>
<message>
- <location filename="../ui/ResultsPage.qml" line="99"/>
+ <location filename="../ui/ResultsPage.qml" line="103"/>
<source>Nothing found in %1</source>
<translation>%1: ничего не найдено</translation>
</message>
@@ -197,53 +202,51 @@ Link: %4</source>
<context>
<name>main</name>
<message>
- <location filename="../ui/main.qml" line="41"/>
- <location filename="../ui/main.qml" line="223"/>
+ <location filename="../ui/main.qml" line="43"/>
+ <location filename="../ui/main.qml" line="294"/>
<source>Radar App</source>
<translation>Радар</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="97"/>
+ <location filename="../ui/main.qml" line="92"/>
<source>Event on Map</source>
<translation>Событие на карте</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="100"/>
<source>Event</source>
- <translation>Мероприятие</translation>
+ <translation type="vanished">Мероприятие</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="104"/>
+ <location filename="../ui/main.qml" line="66"/>
<source>Location</source>
<translation>Место</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="106"/>
<source>Ongoing events</source>
- <translation>Мероприятия</translation>
+ <translation type="vanished">Мероприятия</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="108"/>
+ <location filename="../ui/main.qml" line="70"/>
<source>Radar</source>
<translation>Радар</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="193"/>
+ <location filename="../ui/main.qml" line="264"/>
<source>Reload Countries</source>
<translation>Обновить страны</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="199"/>
+ <location filename="../ui/main.qml" line="270"/>
<source>About</source>
<translation>О программе</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="204"/>
+ <location filename="../ui/main.qml" line="275"/>
<source>Share App...</source>
<translation>Поделиться приложением...</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="209"/>
+ <location filename="../ui/main.qml" line="280"/>
<source>Share via QR-code...</source>
<translation>Поделиться через QR-код...</translation>
</message>
@@ -252,67 +255,71 @@ Link: %4</source>
<translation type="vanished"><p>Copyright © 2019-2021</p><p>Программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ.</p><p>Это Свободное Программное Обеспечение, распространение на определённых условиях приветствуется.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.ru.html">Подробнее о лицензии…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Исходный код…</a></p></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="236"/>
<source><p>Copyright © 2021</p><p>This program comes with ABSOLUTELY NO WARRANTY.</p><p>This is free software, and you are welcome to redistribute it under certain conditions.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.en.html">Details on License…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Source code…</a></p></source>
- <translation><p>Copyright © 2019-2021</p><p>Программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ.</p><p>Это Свободное Программное Обеспечение, распространение на определённых условиях приветствуется.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.ru.html">Подробнее о лицензии…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Исходный код…</a></p></translation>
+ <translation type="vanished"><p>Copyright © 2019-2021</p><p>Программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ.</p><p>Это Свободное Программное Обеспечение, распространение на определённых условиях приветствуется.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.ru.html">Подробнее о лицензии…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Исходный код…</a></p></translation>
+ </message>
+ <message>
+ <location filename="../ui/main.qml" line="307"/>
+ <source><p>Copyright © 2023</p><p>This program comes with ABSOLUTELY NO WARRANTY.</p><p>This is free software, and you are welcome to redistribute it under certain conditions.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.en.html">Details on License…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Source code…</a></p></source>
+ <translation><p>Copyright © 2019-2021</p><p>Программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ.</p><p>Это Свободное Программное Обеспечение, распространение на определённых условиях приветствуется.</p><p><a href="https://www.gnu.org/licenses/gpl-3.0.ru.html">Подробнее о лицензии…</a></p><p><a href="https://0xacab.org/xandyx/radar-app/tree/master">Исходный код…</a></p> {2023<?} {3.0.?} {0x?}</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="257"/>
+ <location filename="../ui/main.qml" line="328"/>
<source>Scan QR Code to download</source>
<translation>Отсканируйте QR-код для скачивания</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="292"/>
+ <location filename="../ui/main.qml" line="363"/>
<source>No Maps application available.</source>
<translation>Нет приложения Карты.</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="296"/>
+ <location filename="../ui/main.qml" line="367"/>
<source>Do you want to see event location with web browser?</source>
<translation>Желаете ли вы открыть местоположение мероприятия в браузере?</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="312"/>
+ <location filename="../ui/main.qml" line="383"/>
<source>Failed to load data</source>
<translation>Сбой загрузки данных</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="313"/>
+ <location filename="../ui/main.qml" line="384"/>
<source>Network Errror</source>
<translation>Ошибка сети</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="399"/>
+ <location filename="../ui/main.qml" line="469"/>
<source>< Back</source>
<translation>< Назад</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="424"/>
+ <location filename="../ui/main.qml" line="494"/>
<source>Next ></source>
<translation>Далее ></translation>
</message>
<message>
- <location filename="../ui/main.qml" line="521"/>
+ <location filename="../ui/main.qml" line="590"/>
<source>Please wait…</source>
<translation>Подождите...</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="551"/>
+ <location filename="../ui/main.qml" line="620"/>
<source>Getting events</source>
<translation>Загрузка мероприятий</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="554"/>
+ <location filename="../ui/main.qml" line="623"/>
<source>Filtering events</source>
<translation>Фильтрация мероприятий</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="557"/>
+ <location filename="../ui/main.qml" line="626"/>
<source>Loading countries</source>
<translation>Загрузка стран</translation>
</message>
<message>
- <location filename="../ui/main.qml" line="560"/>
+ <location filename="../ui/main.qml" line="629"/>
<source>Loading cities</source>
<translation>Загрузка городов</translation>
</message>
diff --git a/src/app.cpp b/src/app.cpp
index 5874c95dd8ec91fc3c00db8f17ff5e4677175aa1..50d03122aa9e25b5fd75b7a2f4b3e78b727bebc8 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -112,6 +112,7 @@ App::App(QObject *parent)
const auto currentCityID = settings.value(m_settingsCityKey, QString()).toString();
m_city = {currentCityID, cityDisplayName(currentCityID)};
+ emit currentLocationTextChanged(QPrivateSignal());
m_country = settings.value(m_settingsCountryKey, QStringLiteral("Germany")).toString();
qDebug() << __FUNCTION__;
@@ -617,6 +618,7 @@ void App::setCity(const QVariant &city)
} else if (m_city.id != newValue.id) {
setIsFirstLoad(true);
}
+ emit currentLocationTextChanged(QPrivateSignal());
}
void App::setCityIndex(int index)
@@ -1036,6 +1038,7 @@ void App::forceSetCountry(const QString &country)
}
emit citiesChanged(QPrivateSignal());
reloadEvents();
+ emit currentLocationTextChanged(QPrivateSignal());
}
void App::updateAllCountries(const QStringList &countries)
@@ -1103,3 +1106,18 @@ void App::updateCurrentLocation()
}
forceSetCountry(m_country);
}
+
+QString App::getCurrentLocationText() const
+{
+ return m_city.id.isEmpty() ? m_country : m_city.displayName;
+}
+
+QString App::getCurrentEventText() const
+{
+ return tr("Event");
+// const auto &titleText = title();
+// return titleText.isEmpty() ? tr("Event") : ([titleText]() {
+// const auto &parts = titleText.splitRef(' ', QString::SplitBehavior::SkipEmptyParts);
+// return (parts.size() > 2) ? (parts[0].toString() + ' ' + parts[1].toString()) : titleText;
+// })();
+}
diff --git a/src/app.h b/src/app.h
index f1ff3961ecf15189612cb24fb1502187d767d25e..c8a6bb7db03598e9c45b0d77f71a5080df53c3ab 100644
--- a/src/app.h
+++ b/src/app.h
@@ -109,6 +109,9 @@ class App : public QObject
Q_PROPERTY(int todayFoundEvents READ todayFoundEvents NOTIFY todayFoundEventsChanged)
Q_PROPERTY(QString downloadLink MEMBER m_downloadLink FINAL CONSTANT)
+
+ Q_PROPERTY(QString currentLocationText READ getCurrentLocationText NOTIFY currentLocationTextChanged)
+ Q_PROPERTY(QString currentEventText READ getCurrentEventText NOTIFY currentEventChanged)
public:
explicit App(QObject *parent = nullptr);
~App() override;
@@ -177,6 +180,9 @@ public:
int totalFoundEvents() const;
int todayFoundEvents() const;
+ QString getCurrentLocationText() const;
+ QString getCurrentEventText() const;
+
void updateCurrentLocation();
static float getAndroidScale();
@@ -218,6 +224,8 @@ signals:
void failedToOpenMapApp(QPrivateSignal);
+ void currentLocationTextChanged(QPrivateSignal);
+
private:
void prepareNetworkAccessManager();
static bool cleanupJNI();
diff --git a/ui/EventView.qml b/ui/EventView.qml
index 21b1ca6591169cb4ae9ab2f61c4d8a003c2ee3e8..51d442cc9b40ac2e19c6d045ccb83d78fa9a67fb 100644
--- a/ui/EventView.qml
+++ b/ui/EventView.qml
@@ -126,6 +126,7 @@ Cras nec ante sit amet augue sodales iaculis. Aliquam erat volutpat. Nam aliquet
textFormat: Text.AutoText
text: root.title
font.bold: true
+ font.pointSize: fontPointSize * 1.2
wrapMode: Text.Wrap
}
RowLayout {
diff --git a/ui/main.qml b/ui/main.qml
index 013532e17a1a58ecfc3c41bf969da2bc1be19590..a276e9b1be53c77d2e5a59aebb268f78c4ef2d63 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -65,7 +65,7 @@ ApplicationWindow {
case location:
return qsTr("Location");
case results:
- return qsTr("Ongoing events");
+ return App.currentLocationText;
default:
return qsTr("Radar")
}
@@ -77,7 +77,7 @@ ApplicationWindow {
PropertyChanges{target: eventView; visible: true; opacity: 1.0}
PropertyChanges{target: mapView; active: true; opacity: 0.0; visible: false}
PropertyChanges{target: swipeView; enabled: false}
- PropertyChanges{target: titleLabel; text: qsTr("Event"); }
+ PropertyChanges{target: titleLabel; text: App.currentEventText; }
PropertyChanges{target: optionsToolButton; visible: false}
PropertyChanges{target: calendarToolButton; visible: true }
PropertyChanges{target: mapToolButton; visible: true }
@@ -179,7 +179,9 @@ ApplicationWindow {
id: titleLabel
fontSizeMode: Text.HorizontalFit
+ font.capitalization: Font.Capitalize
font.pixelSize: parent.iconSize
+
elide: Label.ElideRight
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter