diff --git a/README.md b/README.md index b80cbb5..7d03723 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ Designers --------- - Stefano Amandonico (info@grafixprint.it) +Externals +--------- +A grateful thanks to [jgibbon/slumber](https://github.com/jgibbon/slumber) for SleepBlank.qml to help fix ScreenBlanking issue. + License ------- Licensed under GPLv3 (see COPYING). diff --git a/harbour-boxing-timer.pro b/harbour-boxing-timer.pro index ba76953..eb2e8d4 100644 --- a/harbour-boxing-timer.pro +++ b/harbour-boxing-timer.pro @@ -4,8 +4,9 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" DEFINES += APP_RELEASE=\\\"$$RELEASE\\\" CONFIG += sailfishapp +CONFIG += sailfishapp_i18n -QT += multimedia +QT += core qml multimedia dbus SOURCES += src/harbour-boxing-timer.cpp \ src/boxingtimer.cpp \ @@ -15,10 +16,10 @@ OTHER_FILES += qml/harbour-boxing-timer.qml \ qml/cover/CoverPage.qml \ rpm/harbour-boxing-timer.spec \ rpm/harbour-boxing-timer.yaml \ - translations/*.ts \ - harbour-boxing-timer.desktop + harbour-boxing-timer.desktop \ + translations/*.ts -SAILFISHAPP_ICONS += 86x86 108x108 128x128 256x256 +SAILFISHAPP_ICONS += 86x86 108x108 128x128 172x172 256x256 # to disable building translations every time, comment out the # following CONFIG line @@ -31,6 +32,7 @@ SAILFISHAPP_ICONS += 86x86 108x108 128x128 256x256 # TRANSLATIONS += translations/harbour-boxing-timer-de.ts DISTFILES += \ + qml/ScreenBlank.qml \ qml/pages/TimerPage.qml \ qml/pages/SettingsPage.qml \ qml/pages/js/converter.js \ @@ -43,6 +45,7 @@ DISTFILES += \ icons/86x86/harbour-boxing-timer.png \ icons/108x108/harbour-boxing-timer.png \ icons/128x128/harbour-boxing-timer.png \ + icons/172x172/harbour-boxing-timer.png \ icons/256x256/harbour-boxing-timer.png HEADERS += \ @@ -51,3 +54,6 @@ HEADERS += \ RESOURCES += \ harbour-boxing-timer.qrc + +TRANSLATIONS += \ + translations/harbour-boxing-timer.ts diff --git a/icons/172x172/harbour-boxing-timer.png b/icons/172x172/harbour-boxing-timer.png new file mode 100644 index 0000000..8af46a2 Binary files /dev/null and b/icons/172x172/harbour-boxing-timer.png differ diff --git a/qml/ScreenBlank.qml b/qml/ScreenBlank.qml new file mode 100644 index 0000000..c3581e3 --- /dev/null +++ b/qml/ScreenBlank.qml @@ -0,0 +1,41 @@ +import QtQuick 2.0 +import Nemo.DBus 2.0 + +Item { + property bool enabled: false + function request(){ + var method = "req_display"+(enabled?"":"_cancel")+"_blanking_pause"; + console.log('screen blank:', enabled, method); + dbif.call(method, []) + } + + onEnabledChanged: { + request(); + } + + DBusInterface { + id: dbif + + service: "com.nokia.mce" + path: "/com/nokia/mce/request" + iface: "com.nokia.mce.request" + + bus: DBusInterface.SystemBus + } + Timer { //request seems to time out after a while: + running: parent.enabled + interval: 15000 //minimum setting for blank display is 15s + repeat: true + onTriggered: { + if(parent.enabled) { + parent.request() + } + } + } + + Component.onDestruction: { + if(enabled){ + enabled=false + } + } +} diff --git a/qml/harbour-boxing-timer.qml b/qml/harbour-boxing-timer.qml index 6e0cd16..03f741a 100644 --- a/qml/harbour-boxing-timer.qml +++ b/qml/harbour-boxing-timer.qml @@ -35,6 +35,10 @@ import Pw.Unitoo.Backend 1.0 import "pages" ApplicationWindow { + ScreenBlank { + enabled: true + } + BoxingTimer { id: boxingTimer } diff --git a/rpm/harbour-boxing-timer.changes b/rpm/harbour-boxing-timer.changes index 639d6b9..8c418ba 100644 --- a/rpm/harbour-boxing-timer.changes +++ b/rpm/harbour-boxing-timer.changes @@ -8,6 +8,9 @@ # * date Author's Name version-release # - Summary of changes +* Thu Aug 27 2019 Claudio Maradonna 1.2.4-1 +- Update for Sailfish X (Tested on Xperia XA2 Plus) + * Fri Sep 08 2017 Claudio Maradonna 1.2.3-4 - Fixed bug when saving multiple inner timers - Fixed bug when change presets and rounds done > 0 diff --git a/rpm/harbour-boxing-timer.spec b/rpm/harbour-boxing-timer.spec index bfcb213..4a55078 100644 --- a/rpm/harbour-boxing-timer.spec +++ b/rpm/harbour-boxing-timer.spec @@ -13,8 +13,8 @@ Name: harbour-boxing-timer %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Boxing timer -Version: 1.2.3 -Release: 4 +Version: 1.2.4 +Release: 1 Group: Applications/Utilities License: GPLv3 URL: https://github.com/UnitooTeam/harbour-boxing-timer @@ -69,6 +69,7 @@ desktop-file-install --delete-original \ %{_datadir}/icons/hicolor/86x86/apps/%{name}.png %{_datadir}/icons/hicolor/108x108/apps/%{name}.png %{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%{_datadir}/icons/hicolor/172x172/apps/%{name}.png %{_datadir}/icons/hicolor/256x256/apps/%{name}.png # >> files # << files diff --git a/rpm/harbour-boxing-timer.yaml b/rpm/harbour-boxing-timer.yaml index 15073ad..2962da4 100644 --- a/rpm/harbour-boxing-timer.yaml +++ b/rpm/harbour-boxing-timer.yaml @@ -1,7 +1,7 @@ Name: harbour-boxing-timer Summary: Boxing timer -Version: 1.2.3 -Release: 4 +Version: 1.2.4 +Release: 1 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS Group: Applications/Utilities @@ -42,6 +42,7 @@ Files: - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' - '%{_datadir}/icons/hicolor/108x108/apps/%{name}.png' - '%{_datadir}/icons/hicolor/128x128/apps/%{name}.png' + - '%{_datadir}/icons/hicolor/172x172/apps/%{name}.png' - '%{_datadir}/icons/hicolor/256x256/apps/%{name}.png' # For more information about yaml and what's supported in Sailfish OS diff --git a/translations/harbour-boxing-timer-de.ts b/translations/harbour-boxing-timer-de.ts deleted file mode 100644 index bf82bab..0000000 --- a/translations/harbour-boxing-timer-de.ts +++ /dev/null @@ -1,88 +0,0 @@ - - - - - CoverPage - - My Cover - Mein Cover - - - - PresetList - - Saved presets - - - - - SettingsPage - - Save - - - - Delete - - - - Round's settings - - - - Preset name - - - - Duration - - - - Rest - - - - Total rounds - - - - Settings - - - - - TimerPage - - Settings - - - - Stop - - - - Reset - - - - Round - - - - Start - - - - About - - - - Pause - - - - Boxing timer - - - - diff --git a/translations/harbour-boxing-timer.qm b/translations/harbour-boxing-timer.qm new file mode 100644 index 0000000..965bdd1 Binary files /dev/null and b/translations/harbour-boxing-timer.qm differ diff --git a/translations/harbour-boxing-timer.ts b/translations/harbour-boxing-timer.ts index f08351b..8bc5118 100644 --- a/translations/harbour-boxing-timer.ts +++ b/translations/harbour-boxing-timer.ts @@ -1,88 +1,188 @@ - + - CoverPage + AboutPage - My Cover - + About + Chi siamo + + + +"Boxing Timer" is a customizable timer for fighting sports like boxe. + +You can set duration, rest and number of rounds. If you set 0 rounds, timer loops and count number of rounds. +You can add inner timers too. + +You can save, load and delete your settings giving a name to them. + + +"Boxing Timer" รจ un timer personalizzabile per gli sport da combattimento come la boxe. + +Puoi personalizzare la durata, il riposo e il numero di round. Se imposti 0 round, il timer va in loop e conta il numero di round effettuati. +Puoi creare anche dei round intermedi. + +Puoi salvare, caricare e cancellare le tue impostazioni impostando un nome a esse. + + + + Developers and sources + Sviluppatori e sorgenti + + + +Copyright (C) 2017 Claudio Maradonna +Unitoo Team, Italy + +Sources at: https://github.com/UnitooTeam/harbour-boxing-timer + + +Copyright (C) 2017 Claudio Maradonna +Unitoo Team, Italia + +Sorgenti: https://github.com/UnitooTeam/harbour-boxing-timer + + + + Artists + Artisti + + + +Stefano Amandonico +GrafixPrint, Italy + +info@grafixprint.it +http://www.grafixprint.it + + +Stefano Amandonico +GrafixPrint, Italia + +info@grafixprint.it +http://www.grafixprint.it + + + + License + Licenza + + + +This program 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.<br><br> + +This program 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.<br><br> + +You should have received a copy of the GNU General Public License +along with this program. If not, see <a href="http://www.gnu.org/licenses">http://www.gnu.org/licenses</a>.<br><br><br> + + +All artworks are licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International</a> + + +This program 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.<br><br> + +This program 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.<br><br> + +You should have received a copy of the GNU General Public License +along with this program. If not, see <a href="http://www.gnu.org/licenses">http://www.gnu.org/licenses</a>.<br><br><br> + + +All artworks are licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International</a> + PresetList Saved presets - + Presets salvati + + + Deleting + Sto eliminando + + + Delete + Elimina SettingsPage Save - + Salva - Delete - + Add inner time + Aggiungi tempo intermedio - Round's settings - - - - Preset name - - - - Duration - - - - Rest - - - - Total rounds - + Remove last inner time + Rimuovi ultimo tempo intermedio Settings - + Impostazioni + + + Round's settings + Impostazioni del round + + + Preset name + Nome del preset + + + Duration + Durata + + + Rest + Riposo + + + Total rounds + Totale round + + + Inner timers + Tempi intermedi TimerPage + + About + Chi siamo + Settings - + Impostazioni Stop - + Stop Reset - - - - Round - - - - Start - - - - About - - - - Pause - + Resetta Boxing timer - + Boxing timer