|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/harbour-dwd.git</param>
<param name="branch">main</param>
- <param name="revision">0.8.2</param>
+ <param name="revision">0.9.2</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/harbour-dwd.pro
^
|
| @@ -26,6 +26,7 @@
qml/delegates/LocationItem.qml \
qml/delegates/ForecastItem.qml \
qml/delegates/WeatherItem.qml \
+ qml/Pages/RadarView.qml \
qml/png/* \
qml/js/locations.js \
qml/js/storage.js \
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/delegates/ForecastItem.qml
^
|
| @@ -31,7 +31,7 @@
Label {
topPadding: 8
id:fDate
- text: model.dailyDate.toLocaleString().split(now.getFullYear())[0].slice(0,-1);
+ text: model.dailyDate.toLocaleString(locale, "ddd. dd");
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: Theme.fontSizeExtraSmall
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/delegates/LocationItem.qml
^
|
| @@ -19,9 +19,8 @@
//text: model.timestamp.split('t')[1].split('+')[0];
text: model.name
width: parent.width / 2
- //color: Theme.highlightColor
- color: Theme.primaryColor
- opacity: 0.5
+ color: Theme.highlightColor
+ opacity: 0.7
onClicked: {
Store.setCoverLocation(model.location_id);
pageStack.push(Qt.resolvedUrl("../pages/OverviewPage.qml"), {
@@ -32,8 +31,8 @@
}
Button {
id: deleteMe
- color: Theme.primaryColor
- opacity: 0.5
+ color: Theme.highlightColor
+ opacity: 0.7
//OpacityRampEffect
x: Theme.horizontalPageMargin
Image {
@@ -44,7 +43,7 @@
}
text: qsTr("Delete")
onClicked: {
- if (debug) console.debug(model.location_id);
+ //if (debug) console.debug(model.location_id);
Store.delCoverLocation(model.location_id);
Store.removeLocation(model.location_id);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/delegates/WeatherItem.qml
^
|
| @@ -53,10 +53,6 @@
id: column
width: parent.width * .30
spacing: Theme.paddingMedium
- /*Text{
- // this is a hack, obviously
- padding: 2
- }*/
Text {
visible: index < listView.count
text: model.timestamp.split('T')[1].split('+')[0].split(':')[0] + ":00";
@@ -121,17 +117,10 @@
id: column3
width: parent.width * .40
spacing: Theme.paddingMedium
- /*Label {
- topPadding: 8
- text: model.condition
- width: parent.width
- wrapMode: Text.WordWrap
- font.pixelSize: Theme.fontSizeExtraSmall
- color: Theme.primaryColor
- }*/
Label {
topPadding: 8
- text: model.cloud_cover + "% \uf013 " +parseFloat(model.precipitation) + " mm \uf084 "
+ //text: model.cloud_cover + "% \uf013 " +parseFloat(model.precipitation) + " mm \uf084 "
+ text: parseFloat(model.precipitation) + " mm \uf084 " + model.cloud_cover + "% \uf013 "
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: Theme.fontSizeExtraSmall
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/js/locations.js
^
|
| @@ -18,6 +18,12 @@
*/
//.import "cities.js" as Cities
+/*
+ showRequestInfo("Headers -->");
+ showRequestInfo(doc.getAllResponseHeaders ());
+ showRequestInfo("Last modified -->");
+ showRequestInfo(doc.getResponseHeader ("Last-Modified"));
+*/
function httpRequest(url, callback) {
var doc = new XMLHttpRequest();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/pages/About.qml
^
|
| @@ -56,7 +56,7 @@
color: Theme.primaryColor
textFormat: Text.StyledText
linkColor: Theme.highlightColor
- text: "<a href=\"https://dwd.de\">" + qsTr("of the German Weather Service") + "</a>"
+ text: qsTr("of the ") + "<a href=\"https://dwd.de\">" + qsTr("German Weather Service") + "</a>"
onLinkActivated: {
Qt.openUrlExternally(link)
}
@@ -72,7 +72,7 @@
source: "../png/dwd_logo_258x69.png"
}
Item {
- width: 1
+ width: parent.width
height: Theme.paddingLarge
}
@@ -81,11 +81,11 @@
horizontalAlignment: Text.AlignHCenter
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.secondaryColor
- text: qsTr(" © 2021 Mark Washeim")
+ text: qsTr(" © 2021-2022 Mark Washeim")
}
Item {
- width: 1
+ width: parent.width
height: 2 * Theme.paddingLarge
}
@@ -100,8 +100,8 @@
}
Item {
- width: 1
- height: 2 * Theme.paddingLarge
+ width: parent.width
+ height: Theme.paddingLarge
}
Label {
id: iconLabel
@@ -111,11 +111,32 @@
color: Theme.primaryColor
textFormat: Text.StyledText
linkColor: Theme.highlightColor
- text: "<a href=\"https://https://erikflowers.github.io\">" + qsTr("Icons by Erik Flowers") + "</a>"
+ text: qsTr("Icons by ") + "<a href=\"https://erikflowers.github.io\">Erik Flowers</a>"
+ onLinkActivated: {
+ Qt.openUrlExternally(link)
+ }
+ }
+ Item {
+ width: parent.width
+ height: Theme.paddingLarge
+ }
+ Label {
+ id: radarLabel
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ font.pixelSize: Theme.fontSizeMedium
+ color: Theme.primaryColor
+ textFormat: Text.StyledText
+ linkColor: Theme.highlightColor
+ text: qsTr("Radar courtesy of") + " <a href=\"https://www.rainviewer.com\">rainviewer.com</a>"
onLinkActivated: {
Qt.openUrlExternally(link)
}
}
+ Item {
+ width: parent.width
+ height: Theme.paddingLarge
+ }
Label {
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottomMargin: Theme.paddingSmall
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/pages/DailyDetails.qml
^
|
| @@ -17,46 +17,53 @@
Page {
id: detailsPage
- property var debug;
- property string name;
- property string lat;
- property string lon;
- property var now;
- property var weather;
- property string dailyDate;
- property string headerDate;
- property string weatherDetails;
- property var index;
+ property bool debug: false
+ property string name
+ property string lat
+ property string lon
+ property var now
+ property var weather
+ property string dailyDate
+ property string headerDate
+ property string weatherDetails
+ property var index
+ property var locale: Qt.locale()
+ property var tindex
function reloadDetails(){
+ if (name === "") { name="Berlin" }
+ if (lat === "") { lat="52.52" }
+ if (lon ==="") { lon="13.41" }
- debug = false;
-
- if (name === "") { name="Berlin" ;}
- if (lat === "") { lat="52.52"; }
- if (lon ==="") { lon="13.41" ;}
-
- if (debug) console.debug("daily: "+dailyDate);
+ if (debug) console.debug("daily: "+dailyDate)
if (dailyDate === "") {
now = new Date();
} else {
now = new Date(dailyDate);
}
- if (debug) console.debug("now: "+now.toISOString());
+ if (debug) console.debug("now: " + now);
+ // console.debug(now.toLocaleDateString('de-DE', {timezone: 'long', weekday: 'long', day: 'numeric', month: 'long', year: 'numeric'}));
- var tz = TZ.jstz.determine(); // Determines the time zone of the browser client
- var tzname = tz.name(); // Returns the name of the time zone eg "Europe/Berlin"
- if (debug) console.debug(tz.name());
+ //var time = new Date();
+ //if (debug) console.debug(time.toTimeString(Locale.LongFormat).split(':')[0] ) ;
+ //tindex = time.toTimeString(Locale.LongFormat).split(':')[0] ;
- // console.debug(now.toLocaleDateString('de-DE', {timezone: 'long', weekday: 'long', day: 'numeric', month: 'long', year: 'numeric'}));
+ // print(Date.fromLocaleString(locale, dateTimeString, "ddd yyyy-MM-dd hh:mm:ss"));
+ // if (debug) console.log(now.toISOString().split('T')[1].split('+')[0].split(':')[0] + ":00");
+
+ var tz = TZ.jstz.determine() ;// Determines the time zone of the browser client
+ var tzname = tz.name() // Returns the name of the time zone eg "Europe/Berlin"
+ if (debug) console.debug(tz.name());
var passDate = now.toISOString().replace(/T.*/,'') ;
if (debug) console.debug("passDate: "+passDate);
var dYear = now.getFullYear() ;
// header display date
- headerDate = now.toLocaleString().split(dYear)[0];
+ // headerDate = now.toLocaleString().split(dYear)[0]
+ headerDate = now.toLocaleString(locale, "ddd. MMM. dd");
+
// not being used yet
if (weatherDetails !== ""){
for (var i = 0; i < weather.length && i < 30; i++) {
@@ -74,11 +81,14 @@
//weather = response;
listModel.clear();
for (var i = 0; i < response.weather.length && i < 30; i++) {
- if (debug) console.debug(response.weather[i].condition);
+ //if (debug) console.debug(response.weather[i].condition);
listModel.append(response.weather[i]);
};
});
}
+
+ // set position in listView after all elements appended.
+ //listView.positionViewAtIndex(tindex, ListView.Beginning)
}
allowedOrientations: Orientation.Portrait
@@ -86,6 +96,15 @@
ListModel {
id: listModel
}
+ Component.onCompleted: {
+ /*
+ var time = new Date();
+ if (debug) console.debug(time.toTimeString(Locale.LongFormat).split(':')[0] )
+ tindex = time.toTimeString(Locale.LongFormat).split(':')[0]
+ listView.positionViewAtIndex(tindex, ListView.Beginning)
+ listView.positionViewAtEnd()
+ */
+ }
onStatusChanged: {
if (PageStatus.Activating) {
@@ -93,7 +112,7 @@
if (listModel.count < 1) {
detailsPage.reloadDetails();
}
- }
+ }
/*
switch (status) {
@@ -116,27 +135,15 @@
// PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
PullDownMenu {
MenuItem {
- text: qsTr("About")
- onClicked: {
- pageStack.push(Qt.resolvedUrl("About.qml"),{});
- }
- }
- MenuItem {
- text: qsTr("GPS Locations")
- onClicked: {
- pageStack.push(Qt.resolvedUrl("ManageLocations.qml"),{});
- }
- }
- MenuItem {
- text: qsTr("Add Locations")
+ text: qsTr("Refresh")
onClicked: {
- pageStack.push(Qt.resolvedUrl("LocationSearchPage.qml"),{});
+ reloadDetails();
}
}
MenuItem {
- text: qsTr("Refresh")
+ text: qsTr("Rain Radar")
onClicked: {
- reloadDetails();
+ pageStack.push(Qt.resolvedUrl("RadarView.qml"), { "name": name, "lat": lat, "lon": lon, "dailyDate": dailyDate });
}
}
}
@@ -157,10 +164,18 @@
id: vDate
title: name + " : " + headerDate
}
+ highlightFollowsCurrentItem: true
+ onCountChanged: {
+ var time = new Date();
+ if (debug) console.debug(time.toTimeString(Locale.LongFormat).split(':')[0] )
+ tindex = time.toTimeString(Locale.LongFormat).split(':')[0]
+ // set the index first
+ listView.currentIndex = tindex
+ listView.positionViewAtIndex(tindex, ListView.Beginning)
+ }
anchors.fill: parent
- //x: Theme.horizontalPageMargin
- width: parent.width
- height: contentItem.childrenRect.heigh
+ //width: parent.width
+ //height: contentItem.childrenRect.heigh
id: listView
model: listModel
delegate: WeatherItem{
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/pages/OverviewPage.qml
^
|
| @@ -14,24 +14,26 @@
Page {
id: page
- property string name;
- property string lat;
- property string lon;
- property string dailyDate; // used to go to the next dayk
- property string headerDate; // used to go to the next dayk
- property var weather;
- property var now;
- property var debug;
+ property string name
+ property string lat
+ property string lon
+ property string dailyDate // used to go to the next day
+ property string headerDate // used to go to the next day
+ property var weather
+ property var now
+ property bool debug
+ property var locale: Qt.locale()
//onWeatherChanged: updateWeatherModel();
//onQueryChanged: updateJSONModel();
function reload(){
+
debug = false;
- if (name === "") { name="Berlin" ;}
+ if (name === "") { name="Berlin" ; }
if (lat === "") { lat="52.52"; }
- if (lon ==="") { lon="13.41" ;}
+ if (lon ==="") { lon="13.41" ; }
if (now == undefined) {
now = new Date();
@@ -40,7 +42,10 @@
var tzname = tz.name(); // Returns the name of the time zone eg "Europe/Berlin"
var dYear = now.getFullYear() ;
- headerDate = now.toLocaleString().split(dYear)[0];
+
+ //headerDate = now.toLocaleString().split(dYear)[0];
+ var headerDay = Locs.addDays(now, 4).toLocaleString(locale, "dd");
+ headerDate = now.toLocaleString(locale, "MMM. dd - ") + headerDay
// clear the listmodel
//listModel.clear();
@@ -156,7 +161,8 @@
}
PageHeader {
id: vDate
- title: name + " : " + now.toLocaleString().split(now.getFullYear())[0].slice(0,-1)
+ //title: name + " : " + now.toLocaleString().split(now.getFullYear())[0].slice(0,-1)
+ title: name + " : " + headerDate
}
SilicaListView {
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/pages/RadarView.qml
^
|
| @@ -0,0 +1,77 @@
+/*
+ * This file is part of harbour-dwd.
+ * Copyright (C) 2021 <blueprint@poetaster.de> Mark Washeim
+ *
+ * harbour-dwd is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * harbour-dwd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with harbour-dwd. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+
+import Sailfish.WebView 1.0
+import Sailfish.WebEngine 1.0
+
+import "../js/locations.js" as Locs
+import "../js/storage.js" as Store
+import "../delegates"
+
+
+Page {
+ property bool debug: false
+ property string lat
+ property string dailyDate
+ property string name
+ property string lon
+ property string rurl
+
+ onStatusChanged: {
+
+ if (PageStatus.Activating) {
+ rurl= "https://www.rainviewer.com/map.html?loc=" + lat + "00," + lon +"00,5&oFa=0&oC=1&oU=0&oCS=1&oF=0&oAP=1&c=1&o=83&lm=1&layer=radar&sm=1&sn=1&undefined=1"
+ if (debug) console.debug(rurl)
+ }
+
+ /*
+ switch (status) {
+ case PageStatus.Activating:
+ indicator.visible = true;
+ errorMsg.visible = false;
+ break;
+ case PageStatus.Deactivating:
+ errorMsg.visible = false;
+ break;
+ }
+ */
+ }
+ id:radarView
+ allowedOrientations: Orientation.All
+
+ SilicaFlickable {
+ anchors.fill: parent
+ WebView {
+ /* This will probably be required from 4.4 on. */
+ Component.onCompleted: {
+ WebEngineSettings.setPreference("security.disable_cors_checks", true, WebEngineSettings.BoolPref)
+ //WebEngineSettings.setPreference("security.fileuri.strict_origin_policy", false, WebEngineSettings.BoolPref)
+ }
+ id: webView
+ anchors.fill: parent
+ //url: "https://www.rainviewer.com/map.html?loc=" + lat + "00," + lon +"00,5&oFa=0&oC=1&oU=0&oCS=1&oF=0&oAP=1&c=1&o=83&lm=1&layer=radar&sm=1&sn=1&undefined=1"
+ url: rurl
+ }
+
+ }
+
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/qml/pages/StartPage.qml
^
|
| @@ -27,13 +27,13 @@
Page {
id: startPage
- property var cities;
- property var now;
+ property var cities
+ property var now
- property string dDay;
- property string dMonth;
- property string dYear;
- property var debug;
+ property string dDay
+ property string dMonth
+ property string dYear
+ property bool debug
allowedOrientations: Orientation.Portrait
@@ -98,13 +98,17 @@
pageStack.push(Qt.resolvedUrl("LocationSearchPage.qml"),{});
}
}
+ }
+ PushUpMenu {
MenuItem {
text: qsTr("Refresh")
onClicked: {
startPage.fetchCities();
}
}
+
}
+
Column {
id: column
width: parent.width
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/translations/harbour-dwd-de_DE.ts
^
|
| @@ -15,13 +15,28 @@
</message>
<message>
<location filename="../qml/pages/About.qml" line="59"/>
- <source>of the German Weather Service</source>
- <translation>Deutschen Wetter Dienstes</translation>
+ <source>of the </source>
+ <translation type="unfinished">vom </translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/About.qml" line="59"/>
+ <source>German Weather Service</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/About.qml" line="84"/>
- <source> © 2021 Mark Washeim</source>
- <translation> © 2021 Mark Washeim</translation>
+ <source> © 2021-2022 Mark Washeim</source>
+ <translation type="unfinished"> © 2021 Mark Washeim {2021-2022 ?}</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/About.qml" line="114"/>
+ <source>Icons by </source>
+ <translation type="unfinished">Icons von </translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/About.qml" line="131"/>
+ <source>Radar courtesy of</source>
+ <translation type="unfinished">Radar von </translation>
</message>
<message>
<location filename="../qml/pages/About.qml" line="98"/>
@@ -33,36 +48,21 @@
<source>GNU General Public License v3.</source>
<translation>GNU General Public License v3.</translation>
</message>
- <message>
- <location filename="../qml/pages/About.qml" line="114"/>
- <source>Icons by Erik Flowers</source>
- <translation>Icons von Erik Flowers</translation>
- </message>
</context>
<context>
<name>DailyDetails</name>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="119"/>
- <source>About</source>
- <translation>Über</translation>
- </message>
- <message>
- <location filename="../qml/pages/DailyDetails.qml" line="125"/>
- <source>GPS Locations</source>
- <translation type="unfinished">GPS Orte hinzufügen</translation>
- </message>
- <message>
- <location filename="../qml/pages/DailyDetails.qml" line="131"/>
- <source>Add Locations</source>
- <translation type="unfinished">Ort hinzufügen</translation>
- </message>
- <message>
- <location filename="../qml/pages/DailyDetails.qml" line="137"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="138"/>
<source>Refresh</source>
<translation>Neu Laden</translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="145"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="144"/>
+ <source>Rain Radar</source>
+ <translation type="unfinished">Regenradar</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/DailyDetails.qml" line="152"/>
<source>Next</source>
<translation>Weiter</translation>
</message>
@@ -70,7 +70,7 @@
<context>
<name>LocationItem</name>
<message>
- <location filename="../qml/delegates/LocationItem.qml" line="45"/>
+ <location filename="../qml/delegates/LocationItem.qml" line="44"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
@@ -106,50 +106,51 @@
<translation type="unfinished">Ort hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/ManageLocations.qml" line="185"/>
+ <location filename="../qml/pages/ManageLocations.qml" line="185"/>:w
+
<source>Start</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Start</translation>
</message>
<message>
<location filename="../qml/pages/ManageLocations.qml" line="231"/>
<source> meters</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished"> meter</translation>
</message>
<message>
<location filename="../qml/pages/ManageLocations.qml" line="283"/>
<source>Timeout occurred!</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Zeitüberschreitung!</translation>
</message>
<message>
<location filename="../qml/pages/ManageLocations.qml" line="287"/>
<source>Retrieving update...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Update holen ...</translation>
</message>
</context>
<context>
<name>OverviewPage</name>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="133"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="138"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="139"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="144"/>
<source>GPS Locations</source>
<translation type="unfinished">GPS Orte hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="145"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="150"/>
<source>Add Locations</source>
<translation type="unfinished">Ort hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="151"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="156"/>
<source>Refresh</source>
<translation>Neu Laden</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="191"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="197"/>
<source>Next</source>
<translation>Weiter</translation>
</message>
@@ -177,7 +178,7 @@
<translation>Ort hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/StartPage.qml" line="102"/>
+ <location filename="../qml/pages/StartPage.qml" line="104"/>
<source>Refresh</source>
<translation>Neu Laden</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.2.tar.bz2/translations/harbour-dwd.ts
^
|
| @@ -15,54 +15,54 @@
</message>
<message>
<location filename="../qml/pages/About.qml" line="59"/>
- <source>of the German Weather Service</source>
+ <source>of the </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/About.qml" line="98"/>
- <source>This program is FOSS software licensed</source>
+ <location filename="../qml/pages/About.qml" line="59"/>
+ <source>German Weather Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/About.qml" line="99"/>
- <source>GNU General Public License v3.</source>
+ <location filename="../qml/pages/About.qml" line="84"/>
+ <source> © 2021-2022 Mark Washeim</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/About.qml" line="114"/>
- <source>Icons by Erik Flowers</source>
+ <source>Icons by </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/About.qml" line="84"/>
- <source> © 2021 Mark Washeim</source>
+ <location filename="../qml/pages/About.qml" line="131"/>
+ <source>Radar courtesy of</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>DailyDetails</name>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="119"/>
- <source>About</source>
+ <location filename="../qml/pages/About.qml" line="98"/>
+ <source>This program is FOSS software licensed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="125"/>
- <source>GPS Locations</source>
+ <location filename="../qml/pages/About.qml" line="99"/>
+ <source>GNU General Public License v3.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>DailyDetails</name>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="131"/>
- <source>Add Locations</source>
+ <location filename="../qml/pages/DailyDetails.qml" line="138"/>
+ <source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="137"/>
- <source>Refresh</source>
+ <location filename="../qml/pages/DailyDetails.qml" line="144"/>
+ <source>Rain Radar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="145"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="152"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
@@ -70,7 +70,7 @@
<context>
<name>LocationItem</name>
<message>
- <location filename="../qml/delegates/LocationItem.qml" line="45"/>
+ <location filename="../qml/delegates/LocationItem.qml" line="44"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
@@ -129,27 +129,27 @@
<context>
<name>OverviewPage</name>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="133"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="138"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="139"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="144"/>
<source>GPS Locations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="145"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="150"/>
<source>Add Locations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="151"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="156"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="191"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="197"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
@@ -177,7 +177,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/StartPage.qml" line="102"/>
+ <location filename="../qml/pages/StartPage.qml" line="104"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
|
