[-]
[+]
|
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.2-1</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/README.md
^
|
@@ -40,6 +40,7 @@
## Planned Features
+- Switch to offical NINA API
- Feature requests
## Social Media
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/app/qml/global.qml
^
|
@@ -2,5 +2,6 @@
import QtQuick 2.0
QtObject {
- readonly property string appVersion: "0.4.0"
+ readonly property string appId: "harbour-apocalypse"
+ readonly property string appVersion: "0.4.2"
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/app/qml/pages/AboutPage.qml
^
|
@@ -4,8 +4,6 @@
import "../."
Page {
- readonly property string appId: "harbour-apocalypse"
-
id: page
allowedOrientations: Orientation.All
@@ -26,7 +24,7 @@
Image {
id: logo
- source: "/usr/share/" + appId + "/icons/" + appId + ".svg"
+ source: "/usr/share/" + Global.appId + "/icons/" + Global.appId + ".svg"
smooth: true
sourceSize.width: parent.width / 2
sourceSize.height: parent.width / 2
@@ -80,7 +78,7 @@
anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.8
height: width
- source: "/usr/share/" + appId + "/icons/mastodon.svg"
+ source: "/usr/share/" + Global.appId + "/icons/mastodon.svg"
}
Label{
@@ -115,7 +113,7 @@
anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.8
height: width
- source: "/usr/share/" + appId + "/icons/mastodon.svg"
+ source: "/usr/share/" + Global.appId + "/icons/mastodon.svg"
}
Label{
@@ -154,7 +152,7 @@
anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.8
height: width
- source: "/usr/share/" + appId + "/icons/github.svg"
+ source: "/usr/share/" + Global.appId + "/icons/github.svg"
}
Label{
@@ -163,12 +161,12 @@
wrapMode: Text.WrapAnywhere
font.pixelSize: Theme.fontSizeSmall
- text: "https://github.com/black-sheep-dev/" + appId
+ text: "https://github.com/black-sheep-dev/" + Global.appId
color: parent.parent.pressed ? Theme.highlightColor : Theme.primaryColor
}
}
- onClicked: Qt.openUrlExternally("https://github.com/black-sheep-dev/" + appId)
+ onClicked: Qt.openUrlExternally("https://github.com/black-sheep-dev/" + Global.appId)
}
SectionHeader{
@@ -202,7 +200,7 @@
width: parent.height * 0.8
height: width
fillMode: Image.PreserveAspectFit
- source: "/usr/share/" + appId + "/icons/paypal.svg"
+ source: "/usr/share/" + Global.appId + "/icons/paypal.svg"
}
Label{
width: parent.width - parent.height - parent.spacing
@@ -233,7 +231,7 @@
width: parent.height * 0.8
height: width
fillMode: Image.PreserveAspectFit
- source: "/usr/share/" + appId + "/icons/liberpay.svg"
+ source: "/usr/share/" + Global.appId + "/icons/liberpay.svg"
}
Label{
width: parent.width - parent.height - parent.spacing
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/app/qml/pages/SettingsUpdatePage.qml
^
|
@@ -60,31 +60,6 @@
//% "Update interval (minutes)"
label: qsTrId("id-update-interval")
- currentIndex: {
- switch (dbusSerivce.getProperty("updateInterval")) {
- case BackgroundJob.TwoAndHalfMinutes:
- return 0
-
- case BackgroundJob.FiveMinutes:
- return 1
-
- case BackgroundJob.TenMinutes:
- return 2
-
- case BackgroundJob.FifteenMinutes:
- return 3
-
- case BackgroundJob.ThirtyMinutes:
- return 4
-
- case BackgroundJob.OneHour:
- return 5
-
- default:
- return 0
- }
- }
-
menu: ContextMenu {
MenuItem {
text: "2.5"
@@ -105,6 +80,40 @@
text: "60"
}
}
+
+ Component.onCompleted: {
+ const interval = dbusService.getProperty("updateInterval")
+
+ switch (interval) {
+ case BackgroundJob.TwoAndHalfMinutes:
+ currentIndex = 0
+ break
+
+ case BackgroundJob.FiveMinutes:
+ currentIndex = 1
+ break
+
+ case BackgroundJob.TenMinutes:
+ currentIndex = 2
+ break
+
+ case BackgroundJob.FifteenMinutes:
+ currentIndex = 3
+ break
+
+ case BackgroundJob.ThirtyMinutes:
+ currentIndex = 4
+ break
+
+ case BackgroundJob.OneHour:
+ currentIndex = 5
+ break
+
+ default:
+ currentIndex = 0
+ break
+ }
+ }
}
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.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.2.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.2.tar.bz2/daemon/daemon.pro
^
|
@@ -1,6 +1,6 @@
TARGET = harbour-apocalypse-daemon
-VERSION = 0.4.0-1
+VERSION = 0.4.2-1
DEFINES += APP_VERSION=\"\\\"$$VERSION\\\"\"
DEFINES += APP_NAME=\"\\\"$$TARGET\\\"\"
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.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()) {
|
|
Added |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/metadata/screenshot1.png
^
|
|
Added |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/metadata/screenshot2.png
^
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-apocalypse-0.4.2.tar.bz2/service/harbour-apocalypse.service
^
|
@@ -4,6 +4,8 @@
[Service]
ExecStart=/usr/bin/harbour-apocalypse-daemon
+Restart=on-failure
+RestartSec=1s
[Install]
WantedBy=user-session.target
|