Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Added	_service:tar_git:harbour-dwd.changes
@@ -0,0 +1,12 @@ +# * date Author's Name <author's email> version-release +# - Summary of changes + +* Sat Dec 11 2021 Mark Washeim <blueprint@poetaster.de> 0.7.1 +- added sailjail specs for permission control +- added code to migrate to new org/app paths, migrateLocalStorage() +- fixed the location list page size to use contentItem.children for correct height. +- added chum meta data for the chum gui. + +* Sun Mar 23 2021 Mark Washeim <blueprint@poetaster.de> 0.6.1 +- Added conditional on Loading of entries to keep flickable cached +- Made a small layout change to see if this would make long comments/replies easier to read
[-] [+]	Changed	_service:tar_git:harbour-dwd.spec ^
@@ -12,14 +12,14 @@ %{!?qtc_qmake5:%define qtc_qmake5 %qmake5} %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} + Summary: German Weather Service client -Version: 0.6 +Version: 0.7.1 Release: 1 -Group: Qt/Qt +Group: Applications/Internet License: GPLv3 URL: https://github.com/poetaster/harbour-dwd Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-dwd.yaml Requires: sailfishsilica-qt5 >= 1.1.0 BuildRequires: pkgconfig(sailfishapp) BuildRequires: pkgconfig(Qt5Core) @@ -30,6 +30,29 @@ %description This German Weather Service client uses the brightsky.dev version of the DWD raw data +%if "%{?vendor}" == "chum" +PackageName: German Weather Service +Type: desktop-application +Categories: + - Science + - Physics + - News +DeveloperName: Mark Washeim +Custom: + - RepoType: github + - Repo: https://github.com/poetaster/harbour-dwd +Icon: https://raw.githubusercontent.com/poetaster/harbour-dwd/master/icons/172x172/harbour-dwd.png +Screenshots: + - https://raw.githubusercontent.com/poetaster/harbour-dwd/main/screen1.png + - https://raw.githubusercontent.com/poetaster/harbour-dwd/main/screen2.png + - https://raw.githubusercontent.com/poetaster/harbour-dwd/main/screen3.png +Url: + - Homepage: https://github.com/poetaster/harbour-dwd + - Help: https://github.com/poetaster/harbour-dwd/discussions + - Bugtracker: https://github.com/poetaster/harbour-dwd/issues + - Donation: https://www.paypal.me/poetasterFOSS +%endif + %prep %setup -q -n %{name}-%{version}
[-] [+]	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.6</param> + <param name="revision">0.7.1</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/README.md ^
@@ -4,7 +4,7 @@ https://brightsky.dev/demo for a web demo and https://github.com/jdemaeyer/brightsky/ for the source. - +Translations are being trialled with the Weblate service at https://hosted.weblate.org Just getting it up-to-date for SFOS 3.4. This is a simple project to test QML programming and network api usage/access.
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/harbour-dwd.desktop ^
@@ -1,10 +1,16 @@ [Desktop Entry] Type=Application -X-Nemo-Application-Type=silica-qt5 Icon=harbour-dwd -Exec=harbour-dwd +Exec=sailjail -p harbour-dwd.desktop /usr/bin/harbour-dwd Name=German Weather Service + +[X-Sailjail] +OrganizationName=de.poetaster +ApplicationName=harbour-dwd +Permissions=Internet;Location + # translation example: # your app name in German locale (de) + Name[de]=Deutscher Wetter Dienst
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/harbour-dwd.pro ^
@@ -32,8 +32,7 @@ qml/js/stations.json \ qml/js/locales.js \ rpm/harbour-dwd.spec \ - rpm/harbour-dwd.yaml \ - rpm/harbour-dwd.changes.in \ + rpm/harbour-dwd.changes \ translations/harbour-dwd.ts \ translations/harbour-dwd-de_DE.ts @@ -43,7 +42,7 @@ # to disable building translations every time, comment out the # following CONFIG line -#CONFIG += sailfishapp_i18n -#TRANSLATIONS += translations/harbour-dwd-de_DE.ts +CONFIG += sailfishapp_i18n +TRANSLATIONS += translations/harbour-dwd-de_DE.ts SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/qml/pages/StartPage.qml ^
@@ -120,9 +120,8 @@ }/ SilicaListView { id:listView - + height: contentItem.childrenRect.height width: parent.width - 2x - height: 500 //spacing: Theme.paddingSmall model: ListModel { @@ -134,7 +133,6 @@ } delegate: LocationItem { id:locations - } spacing: 2 VerticalScrollDecorator { flickable: sListview}
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/src/harbour-dwd.cpp ^
@@ -1,40 +1,50 @@ /* - 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. + Copyright (C) 2021 Mark Washeim + Contact: Mark Washeim <blueprint@poetaster.de> + + You may use this file under the terms of GPLv3 / #ifdef QT_QML_DEBUG #include <QtQuick> #endif +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QString> +#include <QStandardPaths> +#include <QCryptographicHash> #include <sailfishapp.h> +void migrateLocalStorage() +{ + + // The new location of the LocalStorage database + QDir newDbDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/de.poetaster/harbour-dwd/QML/OfflineStorage/Databases/"); + + if(newDbDir.exists()) + return; + + newDbDir.mkpath(newDbDir.path()); + + QString dbname = QString(QCryptographicHash::hash(("harbour-dwd"), QCryptographicHash::Md5).toHex()); + + qDebug() << "dbname: " + dbname; + + QString pathOld = "/harbour-dwd/harbour-dwd/QML/OfflineStorage/Databases/"; + QString pathNew = "/de.poetaster/harbour-dwd/QML/OfflineStorage/Databases/"; + + // The old LocalStorage database + QFile oldDb(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + pathOld + dbname + ".sqlite"); + QFile oldIni(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + pathOld + dbname + ".ini"); + + oldDb.copy(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + pathNew + dbname + ".sqlite"); + oldIni.copy(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + pathNew + dbname + ".ini"); + +} + int main(int argc, char argv[]) { // SailfishApp::main() will display "qml/template.qml", if you need more @@ -46,6 +56,9 @@ // // To display the view, call "show()" (will show fullscreen on device). + // first check if we've got the new paths in place + migrateLocalStorage(); + return SailfishApp::main(argc, argv); }
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/translations/harbour-dwd-de_DE.ts ^
@@ -6,78 +6,65 @@ <message> <location filename="../qml/pages/About.qml" line="16"/> <source>About the DWD client</source> - <translation >Über den DWD client</translation> + <translation>Über den DWD client</translation> </message> <message> <location filename="../qml/pages/About.qml" line="45"/> <source>A simple consumer of the</source> - <translation >Ein einfacher Konsument des</translation> + <translation>Ein einfacher Konsument des</translation> </message> <message> <location filename="../qml/pages/About.qml" line="59"/> <source>of the German Weather Service</source> - <translation >Deutschen Wetter Dienstes</translation> + <translation>Deutschen Wetter Dienstes</translation> </message> <message> <location filename="../qml/pages/About.qml" line="84"/> <source> © 2021 Mark Washeim</source> - <translation > © 2021 Mark Washeim</translation> + <translation> © 2021 Mark Washeim</translation> </message> <message> <location filename="../qml/pages/About.qml" line="98"/> <source>This program is FOSS software licensed</source> - <translation >Dieses Program ist FOSS, lizensiert</translation> + <translation>Dieses Program ist FOSS, lizensiert</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> + <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>CoverPage</name> - <message> - <location filename="../qml/cover/CoverPage.qml" line="15"/> - <source>Deutscher</source> - <translation >Deutscher</translation> - </message> - <message> - <location filename="../qml/cover/CoverPage.qml" line="16"/> - <source>Wetter</source> - <translation >Wetter</translation> - </message> - <message> - <location filename="../qml/cover/CoverPage.qml" line="17"/> - <source>Dienst</source> - <translation >Dienst</translation> + <translation>Icons von Erik Flowers</translation> </message> </context> <context> <name>DailyDetails</name> <message> - <location filename="../qml/pages/DailyDetails.qml" line="110"/> + <location filename="../qml/pages/DailyDetails.qml" line="119"/> <source>About</source> - <translation >Über</translation> + <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="116"/> - <source>Locations</source> - <translation >Orte</translation> + <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="122"/> + <location filename="../qml/pages/DailyDetails.qml" line="137"/> <source>Refresh</source> - <translation >Neu Laden</translation> + <translation>Neu Laden</translation> </message> <message> - <location filename="../qml/pages/DailyDetails.qml" line="130"/> + <location filename="../qml/pages/DailyDetails.qml" line="145"/> <source>Next</source> - <translation >Weiter</translation> + <translation>Weiter</translation> </message> </context> <context> @@ -85,66 +72,86 @@ <message> <location filename="../qml/delegates/LocationItem.qml" line="45"/> <source>Delete</source> - <translation >Löschen</translation> + <translation>Löschen</translation> </message> </context> <context> <name>LocationSearchPage</name> <message> - <location filename="../qml/pages/LocationSearchPage.qml" line="75"/> + <location filename="../qml/pages/LocationSearchPage.qml" line="94"/> <source>Choose Location</source> - <translation >Ort wählen</translation> + <translation>Ort wählen</translation> </message> <message> - <location filename="../qml/pages/LocationSearchPage.qml" line="79"/> + <location filename="../qml/pages/LocationSearchPage.qml" line="98"/> <source>Search</source> - <translation >Suchen</translation> + <translation>Suchen</translation> </message> </context> <context> <name>ManageLocations</name> <message> - <location filename="../qml/pages/ManageLocations.qml" line="59"/> - <source>Stored Locations</source> - <translation >Gespeicherte Orte</translation> + <location filename="../qml/pages/ManageLocations.qml" line="159"/> + <source>Position (GPS) Locations</source> + <translation type="unfinished">GPS Orte hinzufügen</translation> </message> <message> - <location filename="../qml/pages/ManageLocations.qml" line="65"/> + <location filename="../qml/pages/ManageLocations.qml" line="165"/> <source>About</source> - <translation >Über</translation> + <translation>Über</translation> </message> <message> - <location filename="../qml/pages/ManageLocations.qml" line="71"/> - <source>Locations</source> - <translation >Orte</translation> + <location filename="../qml/pages/ManageLocations.qml" line="171"/> + <source>Add Locations</source> + <translation type="unfinished">Ort hinzufügen</translation> </message> <message> - <location filename="../qml/pages/ManageLocations.qml" line="77"/> - <source>Refresh</source> - <translation >Neu laden</translation> + <location filename="../qml/pages/ManageLocations.qml" line="177"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManageLocations.qml" line="215"/> + <source> meters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManageLocations.qml" line="272"/> + <source>Timeout occurred!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManageLocations.qml" line="274"/> + <source>Retrieving update...</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>OverviewPage</name> <message> - <location filename="../qml/pages/OverviewPage.qml" line="128"/> + <location filename="../qml/pages/OverviewPage.qml" line="133"/> <source>About</source> - <translation >Über</translation> + <translation>Über</translation> </message> <message> - <location filename="../qml/pages/OverviewPage.qml" line="134"/> - <source>Locations</source> - <translation >Orte</translation> + <location filename="../qml/pages/OverviewPage.qml" line="139"/> + <source>GPS Locations</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/OverviewPage.qml" line="140"/> + <location filename="../qml/pages/OverviewPage.qml" line="145"/> + <source>Add Locations</source> + <translation type="unfinished">Ort hinzufügen</translation> + </message> + <message> + <location filename="../qml/pages/OverviewPage.qml" line="151"/> <source>Refresh</source>
[-] [+]	Changed	_service:tar_git:harbour-dwd-0.7.1.tar.bz2/translations/harbour-dwd.ts ^
@@ -40,42 +40,29 @@ </message> </context> <context> - <name>CoverPage</name> + <name>DailyDetails</name> <message> - <location filename="../qml/cover/CoverPage.qml" line="15"/> - <source>Deutscher</source> + <location filename="../qml/pages/DailyDetails.qml" line="119"/> + <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/cover/CoverPage.qml" line="16"/> - <source>Wetter</source> + <location filename="../qml/pages/DailyDetails.qml" line="125"/> + <source>GPS Locations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/cover/CoverPage.qml" line="17"/> - <source>Dienst</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>DailyDetails</name> - <message> - <location filename="../qml/pages/DailyDetails.qml" line="110"/> - <source>About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qml/pages/DailyDetails.qml" line="116"/> - <source>Locations</source> + <location filename="../qml/pages/DailyDetails.qml" line="131"/> + <source>Add Locations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/DailyDetails.qml" line="122"/> + <location filename="../qml/pages/DailyDetails.qml" line="137"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/DailyDetails.qml" line="130"/> + <location filename="../qml/pages/DailyDetails.qml" line="145"/> <source>Next</source> <translation type="unfinished"></translation> </message> @@ -91,12 +78,12 @@ <context> <name>LocationSearchPage</name> <message> - <location filename="../qml/pages/LocationSearchPage.qml" line="75"/> + <location filename="../qml/pages/LocationSearchPage.qml" line="94"/> <source>Choose Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LocationSearchPage.qml" line="79"/> + <location filename="../qml/pages/LocationSearchPage.qml" line="98"/> <source>Search</source> <translation type="unfinished"></translation> </message> @@ -104,45 +91,65 @@ <context> <name>ManageLocations</name> <message> - <location filename="../qml/pages/ManageLocations.qml" line="59"/> - <source>Stored Locations</source> + <location filename="../qml/pages/ManageLocations.qml" line="159"/> + <source>Position (GPS) Locations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManageLocations.qml" line="65"/> + <location filename="../qml/pages/ManageLocations.qml" line="165"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManageLocations.qml" line="71"/> - <source>Locations</source> + <location filename="../qml/pages/ManageLocations.qml" line="171"/> + <source>Add Locations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManageLocations.qml" line="77"/> - <source>Refresh</source> + <location filename="../qml/pages/ManageLocations.qml" line="177"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManageLocations.qml" line="215"/> + <source> meters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManageLocations.qml" line="272"/> + <source>Timeout occurred!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManageLocations.qml" line="274"/> + <source>Retrieving update...</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OverviewPage</name> <message> - <location filename="../qml/pages/OverviewPage.qml" line="128"/> + <location filename="../qml/pages/OverviewPage.qml" line="133"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/OverviewPage.qml" line="134"/> - <source>Locations</source> + <location filename="../qml/pages/OverviewPage.qml" line="139"/> + <source>GPS Locations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/OverviewPage.qml" line="140"/> + <location filename="../qml/pages/OverviewPage.qml" line="145"/> + <source>Add Locations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/OverviewPage.qml" line="151"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/OverviewPage.qml" line="180"/> + <location filename="../qml/pages/OverviewPage.qml" line="191"/> <source>Next</source> <translation type="unfinished"></translation> </message> @@ -161,11 +168,16 @@ </message> <message> <location filename="../qml/pages/StartPage.qml" line="90"/> - <source>Add Locations</source> + <source>GPS Locations</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qml/pages/StartPage.qml" line="96"/> + <source>Add Locations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/StartPage.qml" line="102"/> <source>Refresh</source> <translation type="unfinished"></translation> </message>
[-] [+]	Deleted	_service:tar_git:harbour-dwd.changes.in ^
@@ -1,19 +0,0 @@ -# Rename this file as HackerNews.changes to include changelog -# entries in your RPM file. -# -# Add new changelog entries following the format below. -# Add newest entries to the top of the list. -# Separate entries from eachother with a blank line. - -# * date Author's Name <author's email> version-release -# - Summary of changes - -* Sun Mar 23 2021 Mark Washeim <blueprint@poetaster.de> 1.0.1 -- Added conditional on Loading of entries to keep flickable cached -- Made a small layout change to see if this would make long comments/replies easier to read - -* Sun Apr 13 2014 Jack Tar <jack.tar@example.com> 0.0.1-1 -- Scrubbed the deck -- Hoisted the sails - -
[-] [+]	Deleted	_service:tar_git:harbour-dwd.yaml ^
@@ -1,27 +0,0 @@ -Name: harbour-dwd -Summary: German Weather Service client -Version: 0.6 -Release: 1 -Group: Qt/Qt -URL: https://github.com/poetaster/harbour-dwd -License: GPLv3 -Sources: -- '%{name}-%{version}.tar.bz2' -Description: This German Weather Service client uses the brightsky.dev version of the DWD raw data - -Configure: none -Builder: qtc5 -PkgConfigBR: -- sailfishapp -- Qt5Core -- Qt5Qml -- Qt5Quick -Requires: -- sailfishsilica-qt5 >= 1.1.0 -Files: -- '%{_datadir}/%{name}' -- '%{_datadir}/icons/hicolor/*/apps/%{name}.png' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/%{name}/qml' -- '%{_bindir}/%{name}' -PkgBR: []