[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd.changes
|
|
[-]
[+]
|
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.9.5</param>
+ <param name="revision">0.9.6</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/cover/CoverPage.qml
^
|
@@ -14,15 +14,14 @@
source: "../png/weathericons-regular-webfont.ttf"
}
id: back
- property var debug;
- property var now;
- property string name;
- property string lat;
- property string lon;
- property var hourly;
+ property bool debug: false
+ property var now
+ property string name
+ property string lat
+ property string lon
+ property var hourly
function reload(){
- debug = true;
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"
@@ -62,9 +61,10 @@
if (debug ) console.debug(JSON.stringify(now.getHours()));
if (debug ) console.debug(JSON.stringify(i));
- var rain = response.weather[index].precipitation;
- rainLabel.text = "\uf084 " + response.weather[index].precipitation + " mm";
-
+ var rain = response.weather[index].precipitation
+ var rain_prob = response.weather[index].precipitation_probability
+ rainLabel.text = "\uf084 " + response.weather[index].precipitation + " mm";
+ //rainLabel.text = response.weather[index].precipitation_probability + "% \uf084 " + response.weather[index].precipitation + " mm";
var cloud = response.weather[index].cloud_cover;
cloudLabel.text = "\uf041 " + response.weather[index].cloud_cover + " %";
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/harbour-dwd.qml
^
|
@@ -1,32 +1,21 @@
/*
- Copyright (C) 2013 Jolla Ltd.
- Contact: Thomas Perl <thomas.perl@jollamobile.com>
- All rights reserved.
-
- You may use this file under the terms of BSD license as follows:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the Jolla Ltd nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * This file is part of harbour-dwd.
+ * Copyright (C) 2023 <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-meteoswiss. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
import QtQuick 2.0
import Sailfish.Silica 1.0
@@ -53,4 +42,5 @@
}
initialPage: Component { StartPage { } }
cover: Qt.resolvedUrl("cover/CoverPage.qml")
+
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/js/brightsky.js
^
|
@@ -1,4 +1,4 @@
-const BRIGHTSKY_URL = 'https://api.brightsky.dev/';
+var BRIGHTSKY_URL = 'https://api.brightsky.dev/'
//const jsonViewer = new JSONViewer();
//document.getElementById('response-json').appendChild(jsonViewer.getContainer());
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/About.qml
^
|
@@ -81,7 +81,7 @@
horizontalAlignment: Text.AlignHCenter
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.secondaryColor
- text: qsTr(" © 2021-2022 Mark Washeim")
+ text: qsTr(" © 2021-2023 Mark Washeim")
}
Item {
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/DailyDetails.qml
^
|
@@ -1,9 +1,21 @@
/*
- Copyright (C) 2021 Mark Washeim
- Contact: blueprint@poetaster.de
-
-
-*/
+ * This file is part of harbour-dwd.
+ * Copyright (C) 2023 <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-meteoswiss. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
/* requests: https://api.brightsky.dev/
weather?lat=52.52&lon=13.41&date=2021-04-30 */
@@ -17,7 +29,7 @@
Page {
id: detailsPage
- property bool debug: true
+ property bool debug: false
property string name
property string lat
property string lon
@@ -35,7 +47,7 @@
console.log("func index: " + index)
- for (var i = 0; i < 26; i++) {
+ for (var i = 0; i < 24; i++) {
switch( index ) {
case 0 : {
listModel.insert(i, model0.get(i))
@@ -57,10 +69,10 @@
listModel.insert(i, model4.get(i))
break
}
- default : console.log("none")
+ default : if (debug) console.log("none")
}
- };
+ }
}
function reloadDetails(){
@@ -101,9 +113,9 @@
// headerDate = now.toLocaleString().split(dYear)[0]
headerDate = now.toLocaleString(locale, "ddd MMM dd");
- // not being used yet
- if (listModel.count > 20){
+ if (listModel.count > 23){
if (debug) console.log("cached")
+ if (debug) console.log(listModel.count)
/*
for (var i = 0; i < weather.length && i < 30; i++) {
@@ -129,8 +141,6 @@
});
}
- // set position in listView after all elements appended.
- //listView.positionViewAtIndex(tindex, ListView.Beginning)
}
allowedOrientations: Orientation.Portrait
@@ -140,6 +150,7 @@
}
Component.onCompleted: {
/*
+ we do this in the ListView
var time = new Date();
if (debug) console.debug(time.toTimeString(Locale.LongFormat).split(':')[0] )
tindex = time.toTimeString(Locale.LongFormat).split(':')[0]
@@ -210,13 +221,21 @@
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)
+ //only update view if we have full count
+ if (listModel.count === 24){
+ var time = new Date();
+ // only move if it's current day
+ if (time.toLocaleString(locale, "ddd MMM dd") === headerDate) {
+ tindex = time.toTimeString(Locale.LongFormat).split(':')[0]
+ if (debug) console.debug(tindex)
+ // set the index first
+ listView.currentIndex = tindex
+ listView.positionViewAtEnd()
+ listView.positionViewAtIndex(tindex, ListView.Beginning)
+ }
+ }
}
anchors.fill: parent
//width: parent.width
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/LocationSearchPage.qml
^
|
@@ -1,6 +1,6 @@
/*
* This file is part of harbour-dwd.
- * Copyright (C) 2021 <blueprint@poetaster.de> Mark Washeim
+ * Copyright (C) 2023 <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
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/ManageLocations.qml
^
|
@@ -1,6 +1,6 @@
/*
* This file is part of harbour-dwd.
- * Copyright (C) 2021 <blueprint@poetaster.de> Mark Washeim
+ * Copyright (C) 2023 <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
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/OverviewPage.qml
^
|
@@ -1,10 +1,21 @@
/*
- Copyright (C) 2021 Mark Washeim
- Contact: blueprint@poetaster.de
-
-
-*/
-
+ * This file is part of harbour-dwd.
+ * Copyright (C) 2023 <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-meteoswiss. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
import QtQuick 2.2
import Sailfish.Silica 1.0
@@ -21,14 +32,13 @@
property string headerDate // used to go to the next day
property var weather
property var now
- property bool debug
+ property bool debug:false
property var locale: Qt.locale()
//onWeatherChanged: updateWeatherModel();
//onQueryChanged: updateJSONModel();
function updateModel(index,response){
- console.log("func index: " + index)
for (var i = 0; i < response.weather.length && i < 30; i++) {
switch( index ) {
case 0 : {
@@ -51,7 +61,7 @@
model4.append(response.weather[i]);
break
}
- default : console.log("none")
+ default : if (debug) console.log("none")
}
};
@@ -119,7 +129,6 @@
function updateWeatherModel(){
- debug = true
listModel.clear();
@@ -230,7 +239,6 @@
delegate: ForecastItem {
id:delegate
onClicked: {
- console.debug(JSON.stringify(weather[index]))
pageStack.push(Qt.resolvedUrl("DailyDetails.qml"), { "name": name, "lat": lat, "lon": lon, "dailyDate": dailyDate, "oindex": index });
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/RadarView.qml
^
|
@@ -1,6 +1,6 @@
/*
* This file is part of harbour-dwd.
- * Copyright (C) 2021 <blueprint@poetaster.de> Mark Washeim
+ * Copyright (C) 2023 <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
@@ -29,7 +29,7 @@
Page {
- property bool debug: true
+ property bool debug: false
property string lat
property string lon
property string dailyDate
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/qml/pages/StartPage.qml
^
|
@@ -1,6 +1,6 @@
/*
* This file is part of harbour-dwd.
- * Copyright (C) 2021 <blueprint@poetaster.de> Mark Washeim
+ * Copyright (C) 2023 <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
@@ -33,7 +33,7 @@
property string dDay
property string dMonth
property string dYear
- property bool debug
+ property bool debug: false
allowedOrientations: Orientation.Portrait
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/translations/harbour-dwd-de_DE.ts
^
|
@@ -24,11 +24,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/About.qml" line="84"/>
- <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>
@@ -44,6 +39,11 @@
<translation>Dieses Program ist FOSS, lizensiert</translation>
</message>
<message>
+ <location filename="../qml/pages/About.qml" line="84"/>
+ <source> © 2021-2023 Mark Washeim</source>
+ <translation type="unfinished"> © 2021 Mark Washeim {2021-2022 ?} {2021-2023 ?}</translation>
+ </message>
+ <message>
<location filename="../qml/pages/About.qml" line="99"/>
<source>GNU General Public License v3.</source>
<translation>GNU General Public License v3.</translation>
@@ -52,17 +52,17 @@
<context>
<name>DailyDetails</name>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="138"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="191"/>
<source>Refresh</source>
<translation>Neu Laden</translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="144"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="198"/>
<source>Rain Radar</source>
<translation type="unfinished">Regenradar</translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="152"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="206"/>
<source>Next</source>
<translation>Weiter</translation>
</message>
@@ -106,8 +106,7 @@
<translation type="unfinished">Ort hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/ManageLocations.qml" line="185"/>:w
-
+ <location filename="../qml/pages/ManageLocations.qml" line="185"/>
<source>Start</source>
<translation type="unfinished">Start</translation>
</message>
@@ -130,27 +129,27 @@
<context>
<name>OverviewPage</name>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="138"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="194"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="144"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="200"/>
<source>GPS Locations</source>
<translation type="unfinished">GPS Orte hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="150"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="206"/>
<source>Add Locations</source>
<translation type="unfinished">Ort hinzufügen</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="156"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="212"/>
<source>Refresh</source>
<translation>Neu Laden</translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="197"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="252"/>
<source>Next</source>
<translation>Weiter</translation>
</message>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dwd-0.9.6.tar.bz2/translations/harbour-dwd.ts
^
|
@@ -24,11 +24,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <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 </source>
<translation type="unfinished"></translation>
@@ -44,6 +39,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../qml/pages/About.qml" line="84"/>
+ <source> © 2021-2023 Mark Washeim</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/pages/About.qml" line="99"/>
<source>GNU General Public License v3.</source>
<translation type="unfinished"></translation>
@@ -52,17 +52,17 @@
<context>
<name>DailyDetails</name>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="138"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="191"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="144"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="198"/>
<source>Rain Radar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/DailyDetails.qml" line="152"/>
+ <location filename="../qml/pages/DailyDetails.qml" line="206"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
@@ -129,27 +129,27 @@
<context>
<name>OverviewPage</name>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="169"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="194"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="175"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="200"/>
<source>GPS Locations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="181"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="206"/>
<source>Add Locations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="187"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="212"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/OverviewPage.qml" line="228"/>
+ <location filename="../qml/pages/OverviewPage.qml" line="252"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
|