Skip to content
Snippets Groups Projects
Commit 046bb89b authored by Bart Ribbers's avatar Bart Ribbers
Browse files

testing/asteroid-btsyncd: new aport

parent ba87d58e
1 merge request!20620testing/asteroid-*: new aports
From 5371d8b9de845407769217082729a52af1ee9242 Mon Sep 17 00:00:00 2001
From: MagneFire <IDaNLContact@gmail.com>
Date: Mon, 5 Apr 2021 15:03:42 +0200
Subject: [PATCH] BatteryService: Use systemsettings for battery information.
---
asteroid-btsyncd.pro | 2 +-
batteryservice.cpp | 17 +++++++++--------
batteryservice.h | 6 +++---
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/asteroid-btsyncd.pro b/asteroid-btsyncd.pro
index 2c2eac4..4852f21 100644
--- a/asteroid-btsyncd.pro
+++ b/asteroid-btsyncd.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
QT -= gui
QT += dbus
CONFIG += link_pkgconfig c++11
-PKGCONFIG += giomm-2.4 mpris-qt5 contextkit-statefs timed-qt5
+PKGCONFIG += giomm-2.4 mpris-qt5 systemsettings timed-qt5
HEADERS += \
notificationservice.h \
diff --git a/batteryservice.cpp b/batteryservice.cpp
index d8da7ef..04f3ef6 100644
--- a/batteryservice.cpp
+++ b/batteryservice.cpp
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <contextproperty.h>
+#include <batterystatus.h>
#include <QTimer>
#include <QDBusMessage>
@@ -27,19 +27,20 @@
BatteryLvlChrc::BatteryLvlChrc(QDBusConnection bus, int index, Service *service) : Characteristic(bus, index, BATTERY_LVL_UUID, {"encrypt-authenticated-read", "notify"}, service)
{
- m_battery = new ContextProperty("Battery.ChargePercentage", this);
- connect(m_battery, SIGNAL(valueChanged()), this, SLOT(onBatteryPercentageChanged()));
+ m_battery = new BatteryStatus(this);
+ connect(m_battery, &BatteryStatus::chargePercentageChanged,
+ this, &BatteryLvlChrc::onBatteryPercentageChanged);
connect(this, SIGNAL(valueChanged()), this, SLOT(emitPropertiesChanged()));
m_value = QByteArray(1, 100);
- QTimer::singleShot(0, this, SLOT(onBatteryPercentageChanged()));
}
-void BatteryLvlChrc::onBatteryPercentageChanged()
+void BatteryLvlChrc::onBatteryPercentageChanged(int percentage)
{
- char val = m_battery->value().toUInt();
- m_value = QByteArray(1, val);
+ if (percentage >= 0) {
+ m_value = QByteArray(1, percentage);
- emit valueChanged();
+ emit valueChanged();
+ }
}
void BatteryLvlChrc::emitPropertiesChanged()
diff --git a/batteryservice.h b/batteryservice.h
index 8ff8154..9ced969 100644
--- a/batteryservice.h
+++ b/batteryservice.h
@@ -22,7 +22,7 @@
#include "service.h"
-class ContextProperty;
+class BatteryStatus;
class BatteryLvlChrc : public Characteristic
{
@@ -42,13 +42,13 @@ public slots:
private slots:
void emitPropertiesChanged();
- void onBatteryPercentageChanged();
+ void onBatteryPercentageChanged(int percentage);
signals:
void valueChanged();
private:
- ContextProperty *m_battery;
+ BatteryStatus *m_battery;
QByteArray m_value;
QByteArray getValue()
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-btsyncd
pkgver=0_git20210214
pkgrel=0
_commit="2abfb13526a02d5309716ccb54a763684deebac0"
pkgdesc="Bluetooth Low Energy synchronization daemon for AsteroidOS"
url="https://github.com/AsteroidOS/asteroid-btsyncd"
arch="all"
license="GPL-3.0-or-later"
makedepends="
glibmm-dev
nemo-qml-plugin-systemsettings-dev
qt5-qtbase-dev
qtmpris-dev
timed-dev
"
source="https://github.com/AsteroidOS/asteroid-btsyncd/archive/$_commit/asteroid-btsyncd-$_commit.tar.gz
0001-batteryservice-use-systemsettings.patch
"
builddir="$srcdir/$pkgname-$_commit"
build() {
qmake-qt5 \
PREFIX=/usr
make
}
check() {
make check
}
package() {
INSTALL_ROOT="$pkgdir" make install
}
sha512sums="7616f24111113ea59242dcd7a3962d8d8cd6c26a06a9ca3be0bead2b8b68a0efcf7c744792552c4a937897d2972b489045be9474d68e28cb4ca3d816de28ded1 asteroid-btsyncd-2abfb13526a02d5309716ccb54a763684deebac0.tar.gz
ccf4a5ad71847e1d35ba09644bdde8596560dbff58f3d26f5ceec7b5ed777859e3c6ab4e23ee53ea8d5715c6485ad425c6b766ae5672bd378f3262fea9073a50 0001-batteryservice-use-systemsettings.patch"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment