|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/black-sheep-dev/harbour-apocalypse.git</param>
<param name="branch"></param>
- <param name="revision">0.4.0-1</param>
+ <param name="revision">0.4.1-1</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.1.tar.bz2/app/qml/global.qml
^
|
| @@ -2,5 +2,5 @@
import QtQuick 2.0
QtObject {
- readonly property string appVersion: "0.4.0"
+ readonly property string appVersion: "0.4.1"
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.1.tar.bz2/app/translations/harbour-apocalypse-de.ts
^
|
| @@ -376,8 +376,8 @@
<translation>Wenn aktiviert wird die Anwendung in einem definierten Intervall eine Aktualisierung der Meldungen durchführen.</translation>
</message>
<message id="id-update-interval">
- <source></source>
- <translation></translation>
+ <source>Update interval (minutes)</source>
+ <translation type="unfinished">Update Intervall (Minuten)</translation>
</message>
<message id="id-play-sound">
<source>Play notifaction sound</source>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.1.tar.bz2/app/translations/harbour-apocalypse.ts
^
|
| @@ -53,7 +53,7 @@
</message>
<message id="id-longitude">
<source>id-longitude</source>
- <translation>id-longitude</translation>
+ <translation>Longitude</translation>
</message>
<message id="id-about">
<source>About</source>
@@ -377,7 +377,7 @@
</message>
<message id="id-update-interval">
<source>Update interval (minutes)</source>
- <translation type="unfinished"></translation>
+ <translation>Update interval (minutes)</translation>
</message>
<message id="id-play-sound">
<source>Play notifaction sound</source>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.1.tar.bz2/daemon/daemon.pro
^
|
| @@ -1,6 +1,6 @@
TARGET = harbour-apocalypse-daemon
-VERSION = 0.4.0-1
+VERSION = 0.4.1-1
DEFINES += APP_VERSION=\"\\\"$$VERSION\\\"\"
DEFINES += APP_NAME=\"\\\"$$TARGET\\\"\"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.1.tar.bz2/daemon/src/serviceprovider.cpp
^
|
| @@ -16,13 +16,16 @@
ServiceProvider::ServiceProvider(QObject *parent) :
QDBusAbstractAdaptor(parent)
{
- connect(m_api, &ApiInterface::messagesAvailable, this, &ServiceProvider::parseMessages);
-
readServices();
readSettings();
+ connect(m_api, &ApiInterface::messagesAvailable, this, &ServiceProvider::parseMessages);
+
if (!m_autoUpdate) {
refresh();
+ } else {
+ m_backgroundJob->run();
+ m_backgroundJob->wait();
}
}
@@ -53,7 +56,6 @@
connect(m_backgroundJob, &BackgroundActivity::running, this, &ServiceProvider::refresh);
m_backgroundJob->setWakeupFrequency(BackgroundActivity::Frequency(m_updateInterval));
- m_backgroundJob->run();
}
} else {
m_backgroundJob->deleteLater();
@@ -284,6 +286,10 @@
void ServiceProvider::parseMessages(const QString &url, const QJsonArray &msgs)
{
+ if (m_backgroundJob != nullptr) {
+ m_backgroundJob->wait();
+ }
+
int ret = m_requestQueue.removeAll(url);
if (m_requestQueue.isEmpty()) {
|
