From 2207ac317ac5e91c5b88e797e010f79cad8cb48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 14 Jan 2018 10:15:57 +0100 Subject: [PATCH] Update copyright headers --- libguh-core/guhcore.cpp | 2 +- libguh-core/guhcore.h | 2 +- libguh-core/guhdbusservice.cpp | 5 +- libguh-core/guhdbusservice.h | 3 +- .../bluetoothdiscoveryreplyimplementation.cpp | 2 +- .../bluetoothdiscoveryreplyimplementation.h | 2 +- ...bluetoothlowenergydeviceimplementation.cpp | 2 +- .../bluetoothlowenergydeviceimplementation.h | 2 +- ...luetoothlowenergymanagerimplementation.cpp | 2 +- .../network/networkaccessmanagerimpl.cpp | 2 +- .../network/networkaccessmanagerimpl.h | 2 +- .../upnp/upnpdiscoveryimplementation.cpp | 2 +- .../upnp/upnpdiscoveryimplementation.h | 2 +- .../network/upnp/upnpdiscoveryrequest.cpp | 4 +- .../network/upnp/upnpdiscoveryrequest.h | 4 +- .../plugintimermanagerimplementation.cpp | 8 +-- .../plugintimermanagerimplementation.h | 8 +-- .../radio433/radio433brennenstuhl.cpp | 2 +- .../hardware/radio433/radio433brennenstuhl.h | 2 +- .../radio433/radio433brennenstuhlgateway.cpp | 2 +- .../radio433/radio433brennenstuhlgateway.h | 2 +- .../hardware/radio433/radio433transmitter.cpp | 2 +- .../hardware/radio433/radio433transmitter.h | 2 +- libguh-core/hardwaremanagerdbusservice.cpp | 34 +++++++++++ libguh-core/hardwaremanagerdbusservice.h | 45 ++++++++++++++ libguh-core/hardwaremanagerimplementation.cpp | 4 +- libguh-core/hardwaremanagerimplementation.h | 12 ++-- libguh/devicemanager.cpp | 4 +- libguh/devicemanager.h | 4 +- libguh/guhsettings.cpp | 2 +- libguh/guhsettings.h | 2 +- .../bluetoothdiscoveryreply.cpp | 2 +- .../bluetoothdiscoveryreply.h | 2 +- .../bluetoothlowenergydevice.cpp | 2 +- .../bluetoothlowenergydevice.h | 2 +- .../bluetoothlowenergymanager.cpp | 2 +- .../bluetoothlowenergymanager.h | 2 +- libguh/hardware/radio433/radio433.cpp | 2 +- libguh/hardware/radio433/radio433.h | 3 +- libguh/hardwaremanager.cpp | 2 +- libguh/hardwaremanager.h | 2 +- libguh/hardwareresource.cpp | 2 +- libguh/hardwareresource.h | 2 +- libguh/loggingcategories.cpp | 2 +- libguh/loggingcategories.h | 2 +- .../network/avahi/qtavahiservicebrowser.cpp | 2 +- libguh/network/avahi/qtavahiservicebrowser.h | 2 +- libguh/network/networkaccessmanager.h | 1 + libguh/network/upnp/upnpdiscovery.cpp | 2 +- libguh/network/upnp/upnpdiscovery.h | 2 +- libguh/network/upnp/upnpdiscoveryreply.cpp | 2 +- libguh/network/upnp/upnpdiscoveryreply.h | 3 +- libguh/plugin/device.cpp | 2 +- libguh/plugin/device.h | 2 +- libguh/plugin/deviceplugin.cpp | 2 +- libguh/plugin/deviceplugin.h | 2 +- libguh/plugintimer.cpp | 2 +- libguh/plugintimer.h | 2 +- plugins/mock/translations/de_DE.ts | 61 ------------------- plugins/mock/translations/en_US.ts | 61 ------------------- translations/guhd-de_DE.ts | 14 ++--- translations/guhd-en_US.ts | 14 ++--- 62 files changed, 171 insertions(+), 207 deletions(-) create mode 100644 libguh-core/hardwaremanagerdbusservice.cpp create mode 100644 libguh-core/hardwaremanagerdbusservice.h diff --git a/libguh-core/guhcore.cpp b/libguh-core/guhcore.cpp index cf3860c8..7f67b7c7 100644 --- a/libguh-core/guhcore.cpp +++ b/libguh-core/guhcore.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * diff --git a/libguh-core/guhcore.h b/libguh-core/guhcore.h index 12d06b26..c9046b55 100644 --- a/libguh-core/guhcore.h +++ b/libguh-core/guhcore.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * diff --git a/libguh-core/guhdbusservice.cpp b/libguh-core/guhdbusservice.cpp index 969b24ae..38fea3c8 100644 --- a/libguh-core/guhdbusservice.cpp +++ b/libguh-core/guhdbusservice.cpp @@ -1,6 +1,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright (C) 2017 Michael Zanetti * + * Copyright (C) 2018 Simon Stürz * * * * This file is part of guh. * * * @@ -24,11 +25,11 @@ namespace guhserver { QDBusConnection GuhDBusService::s_connection = QDBusConnection::systemBus(); -GuhDBusService::GuhDBusService(const QString &objectPath, UserManager *parent) : QObject(parent) +GuhDBusService::GuhDBusService(const QString &objectPath, QObject *parent) : QObject(parent) { bool status = s_connection.registerService("io.guh.nymead"); if (!status) { - qCWarning(dcApplication) << "Failed to register D-Bus service."; + qCWarning(dcApplication()) << "Failed to register D-Bus service."; return; } status = s_connection.registerObject(objectPath, this, QDBusConnection::ExportScriptableContents); diff --git a/libguh-core/guhdbusservice.h b/libguh-core/guhdbusservice.h index e5717050..beed2dd4 100644 --- a/libguh-core/guhdbusservice.h +++ b/libguh-core/guhdbusservice.h @@ -1,6 +1,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright (C) 2017 Michael Zanetti * + * Copyright (C) 2018 Simon Stürz * * * * This file is part of guh. * * * @@ -33,7 +34,7 @@ class GuhDBusService : public QObject, public QDBusContext Q_CLASSINFO("D-Bus Interface", "io.guh.nymead") public: - explicit GuhDBusService(const QString &objectPath, UserManager *parent = nullptr); + explicit GuhDBusService(const QString &objectPath, QObject *parent = nullptr); static void setBusType(QDBusConnection::BusType busType); diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp b/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp index acc368b9..1ecd2cf8 100644 --- a/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp +++ b/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h b/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h index 681e0f66..c02045ca 100644 --- a/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h +++ b/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp b/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp index f37a68a4..23be6d0f 100644 --- a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp +++ b/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h b/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h index 12307379..e9c24f10 100644 --- a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h +++ b/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp b/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp index d24e0d17..eddcf819 100644 --- a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp +++ b/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/network/networkaccessmanagerimpl.cpp b/libguh-core/hardware/network/networkaccessmanagerimpl.cpp index d21249a8..9950ba9c 100644 --- a/libguh-core/hardware/network/networkaccessmanagerimpl.cpp +++ b/libguh-core/hardware/network/networkaccessmanagerimpl.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/network/networkaccessmanagerimpl.h b/libguh-core/hardware/network/networkaccessmanagerimpl.h index 6ea2beb0..59070f6d 100644 --- a/libguh-core/hardware/network/networkaccessmanagerimpl.h +++ b/libguh-core/hardware/network/networkaccessmanagerimpl.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp index 29b6cc1f..cd694bb3 100644 --- a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp +++ b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.h b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.h index 667d835c..1169c387 100644 --- a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.h +++ b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.cpp b/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.cpp index 475a2667..b7675e00 100644 --- a/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.cpp +++ b/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -35,7 +35,7 @@ UpnpDiscoveryRequest::UpnpDiscoveryRequest(UpnpDiscovery *upnpDiscovery, QPointe connect(m_timer, &QTimer::timeout, this, &UpnpDiscoveryRequest::onTimeout); } -void UpnpDiscoveryRequest::discover(const int &timeout) +void UpnpDiscoveryRequest::discover(int timeout) { m_ssdpSearchMessage = QByteArray("M-SEARCH * HTTP/1.1\r\n" "HOST:239.255.255.250:1900\r\n" diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.h b/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.h index 12abb889..0782a711 100644 --- a/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.h +++ b/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -44,7 +44,7 @@ class UpnpDiscoveryRequest : public QObject public: explicit UpnpDiscoveryRequest(UpnpDiscovery *upnpDiscovery, QPointer reply); - void discover(const int &timeout); + void discover(int timeout); void addDeviceDescriptor(const UpnpDeviceDescriptor &deviceDescriptor); QNetworkRequest createNetworkRequest(UpnpDeviceDescriptor deviveDescriptor); QList deviceList() const; diff --git a/libguh-core/hardware/plugintimermanagerimplementation.cpp b/libguh-core/hardware/plugintimermanagerimplementation.cpp index dd0a32c3..07cec3af 100644 --- a/libguh-core/hardware/plugintimermanagerimplementation.cpp +++ b/libguh-core/hardware/plugintimermanagerimplementation.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -48,7 +48,7 @@ bool PluginTimerImplementation::running() const return m_running; } -void PluginTimerImplementation::setRunning(const bool &running) +void PluginTimerImplementation::setRunning(bool running) { if (m_running != running) { m_running = running; @@ -56,7 +56,7 @@ void PluginTimerImplementation::setRunning(const bool &running) } } -void PluginTimerImplementation::setPaused(const bool &paused) +void PluginTimerImplementation::setPaused(bool paused) { if (m_paused != paused) { m_paused = paused; @@ -64,7 +64,7 @@ void PluginTimerImplementation::setPaused(const bool &paused) } } -void PluginTimerImplementation::setCurrentTick(const int &tick) +void PluginTimerImplementation::setCurrentTick(int tick) { if (m_currentTick != tick) { m_currentTick = tick; diff --git a/libguh-core/hardware/plugintimermanagerimplementation.h b/libguh-core/hardware/plugintimermanagerimplementation.h index 9e172a9f..b06cc3db 100644 --- a/libguh-core/hardware/plugintimermanagerimplementation.h +++ b/libguh-core/hardware/plugintimermanagerimplementation.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -51,9 +51,9 @@ private: bool m_paused = false; bool m_running = true; - void setRunning(const bool &running); - void setPaused(const bool &paused); - void setCurrentTick(const int &tick); + void setRunning(bool running); + void setPaused(bool paused); + void setCurrentTick(int tick); void tick(); diff --git a/libguh-core/hardware/radio433/radio433brennenstuhl.cpp b/libguh-core/hardware/radio433/radio433brennenstuhl.cpp index 5f908737..b698e619 100644 --- a/libguh-core/hardware/radio433/radio433brennenstuhl.cpp +++ b/libguh-core/hardware/radio433/radio433brennenstuhl.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 -2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/radio433/radio433brennenstuhl.h b/libguh-core/hardware/radio433/radio433brennenstuhl.h index 45177e30..71f6818f 100644 --- a/libguh-core/hardware/radio433/radio433brennenstuhl.h +++ b/libguh-core/hardware/radio433/radio433brennenstuhl.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/radio433/radio433brennenstuhlgateway.cpp b/libguh-core/hardware/radio433/radio433brennenstuhlgateway.cpp index 74421e7a..1f718494 100644 --- a/libguh-core/hardware/radio433/radio433brennenstuhlgateway.cpp +++ b/libguh-core/hardware/radio433/radio433brennenstuhlgateway.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/radio433/radio433brennenstuhlgateway.h b/libguh-core/hardware/radio433/radio433brennenstuhlgateway.h index b285fb4a..12a77595 100644 --- a/libguh-core/hardware/radio433/radio433brennenstuhlgateway.h +++ b/libguh-core/hardware/radio433/radio433brennenstuhlgateway.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/radio433/radio433transmitter.cpp b/libguh-core/hardware/radio433/radio433transmitter.cpp index 88c8f214..c09edcc3 100644 --- a/libguh-core/hardware/radio433/radio433transmitter.cpp +++ b/libguh-core/hardware/radio433/radio433transmitter.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 -2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh-core/hardware/radio433/radio433transmitter.h b/libguh-core/hardware/radio433/radio433transmitter.h index ba6d72cc..1c34f349 100644 --- a/libguh-core/hardware/radio433/radio433transmitter.h +++ b/libguh-core/hardware/radio433/radio433transmitter.h @@ -2,7 +2,7 @@ * * * This file is part of guh. * * * - * Copyright (C) 2015 -2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-core/hardwaremanagerdbusservice.cpp b/libguh-core/hardwaremanagerdbusservice.cpp new file mode 100644 index 00000000..2dd09adf --- /dev/null +++ b/libguh-core/hardwaremanagerdbusservice.cpp @@ -0,0 +1,34 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of guh. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * This library 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 * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this library; If not, see * + * . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + +#include "hardwaremanagerdbusservice.h" + +namespace guhserver { + +HardwareManagerDBusService::HardwareManagerDBusService(const QString &objectPath, QObject *parent) : + GuhDBusService(objectPath, parent) +{ + +} + +} diff --git a/libguh-core/hardwaremanagerdbusservice.h b/libguh-core/hardwaremanagerdbusservice.h new file mode 100644 index 00000000..a9e3c75a --- /dev/null +++ b/libguh-core/hardwaremanagerdbusservice.h @@ -0,0 +1,45 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of guh. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * This library 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 * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this library; If not, see * + * . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#ifndef HARDWAREMANAGERDBUSSERVICE_H +#define HARDWAREMANAGERDBUSSERVICE_H + +#include +#include "guhdbusservice.h" + +namespace guhserver { + +class HardwareManagerDBusService : public GuhDBusService +{ + Q_OBJECT +public: + explicit HardwareManagerDBusService(const QString &objectPath, QObject *parent = nullptr); + +signals: + +public slots: + +}; + +} + +#endif // HARDWAREMANAGERDBUSSERVICE_H diff --git a/libguh-core/hardwaremanagerimplementation.cpp b/libguh-core/hardwaremanagerimplementation.cpp index 2b305cbe..6236a9b0 100644 --- a/libguh-core/hardwaremanagerimplementation.cpp +++ b/libguh-core/hardwaremanagerimplementation.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -76,6 +76,8 @@ HardwareManagerImplementation::HardwareManagerImplementation(QObject *parent) : setResourceEnabled(m_bluetoothLowEnergyManager, true); // Register D-Bus interface for enable/disable hardware resources + + // FIXME: use HardwareManagerDBusService in the source tree instead of direct implementation bool status = QDBusConnection::systemBus().registerService("io.guh.nymead"); if (!status) { qCWarning(dcHardware()) << "Failed to register HardwareManager D-Bus service. HardwareManager D-Bus control will not work."; diff --git a/libguh-core/hardwaremanagerimplementation.h b/libguh-core/hardwaremanagerimplementation.h index cca7236a..36279af0 100644 --- a/libguh-core/hardwaremanagerimplementation.h +++ b/libguh-core/hardwaremanagerimplementation.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -43,7 +43,6 @@ namespace guhserver { class HardwareManagerImplementation : public HardwareManager { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "io.guh.nymead") public: explicit HardwareManagerImplementation(QObject *parent = nullptr); @@ -56,11 +55,8 @@ public: QtAvahiServiceBrowser *avahiBrowser() override; BluetoothLowEnergyManager *bluetoothLowEnergyManager() override; - // D-Bus method for enable/disable bluetooth support - Q_SCRIPTABLE void EnableBluetooth(const bool &enabled); - private: - QNetworkAccessManager *m_networkAccessManager; + QNetworkAccessManager *m_networkAccessManager = nullptr; // Hardware Resources PluginTimerManager *m_pluginTimerManager = nullptr; @@ -70,6 +66,10 @@ private: QtAvahiServiceBrowser *m_avahiBrowser = nullptr; BluetoothLowEnergyManager *m_bluetoothLowEnergyManager = nullptr; +private slots: + void EnableBluetooth(const bool &enabled); + + }; } diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp index 61cb4fdf..95ec0f76 100644 --- a/libguh/devicemanager.cpp +++ b/libguh/devicemanager.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015-2017 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * @@ -288,7 +288,7 @@ void DeviceManager::setLocale(const QLocale &locale) emit languageUpdated(); } -HardwareManager *DeviceManager::hardwareManager() +HardwareManager *DeviceManager::hardwareManager() const { return m_hardwareManager; } diff --git a/libguh/devicemanager.h b/libguh/devicemanager.h index 8e5f41d7..af5e10bb 100644 --- a/libguh/devicemanager.h +++ b/libguh/devicemanager.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015-2017 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * @@ -97,7 +97,7 @@ public: void setLocale(const QLocale &locale); - HardwareManager *hardwareManager(); + HardwareManager *hardwareManager() const; QList plugins() const; DevicePlugin* plugin(const PluginId &id) const; diff --git a/libguh/guhsettings.cpp b/libguh/guhsettings.cpp index a0ae1c01..3fde4dfc 100644 --- a/libguh/guhsettings.cpp +++ b/libguh/guhsettings.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015-2017 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/guhsettings.h b/libguh/guhsettings.h index 9e035e20..bc7f7988 100644 --- a/libguh/guhsettings.h +++ b/libguh/guhsettings.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015-2017 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp b/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp index e30725ca..33531869 100644 --- a/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp +++ b/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h b/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h index a9884834..d1d1a13d 100644 --- a/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h +++ b/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp index f986cb31..21564e76 100644 --- a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp +++ b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h index ea19c3e2..586c9b49 100644 --- a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h +++ b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp index 9e7e73c7..a45afdb0 100644 --- a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp +++ b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h index 59d49bee..5bbebaab 100644 --- a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h +++ b/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/radio433/radio433.cpp b/libguh/hardware/radio433/radio433.cpp index e3a47b33..7a93e227 100644 --- a/libguh/hardware/radio433/radio433.cpp +++ b/libguh/hardware/radio433/radio433.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 -2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardware/radio433/radio433.h b/libguh/hardware/radio433/radio433.h index 693f7335..45b3a22c 100644 --- a/libguh/hardware/radio433/radio433.h +++ b/libguh/hardware/radio433/radio433.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -34,6 +34,7 @@ class LIBGUH_EXPORT Radio433 : public HardwareResource public: explicit Radio433(QObject *parent = nullptr); + virtual ~Radio433() = default; public slots: virtual bool sendData(int delay, QList rawData, int repetitions) = 0; diff --git a/libguh/hardwaremanager.cpp b/libguh/hardwaremanager.cpp index 3df4b3bc..4fb20098 100644 --- a/libguh/hardwaremanager.cpp +++ b/libguh/hardwaremanager.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardwaremanager.h b/libguh/hardwaremanager.h index 5d03ed25..fb6866f0 100644 --- a/libguh/hardwaremanager.h +++ b/libguh/hardwaremanager.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardwareresource.cpp b/libguh/hardwareresource.cpp index 92e3e42b..e9794009 100644 --- a/libguh/hardwareresource.cpp +++ b/libguh/hardwareresource.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/hardwareresource.h b/libguh/hardwareresource.h index 78916456..214b1bdc 100644 --- a/libguh/hardwareresource.h +++ b/libguh/hardwareresource.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/loggingcategories.cpp b/libguh/loggingcategories.cpp index 0a46bb4e..c80c0db7 100644 --- a/libguh/loggingcategories.cpp +++ b/libguh/loggingcategories.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015-2017 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/loggingcategories.h b/libguh/loggingcategories.h index d4acc57e..2506f28c 100644 --- a/libguh/loggingcategories.h +++ b/libguh/loggingcategories.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015-2017 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/network/avahi/qtavahiservicebrowser.cpp b/libguh/network/avahi/qtavahiservicebrowser.cpp index c18cabc9..075f4a39 100644 --- a/libguh/network/avahi/qtavahiservicebrowser.cpp +++ b/libguh/network/avahi/qtavahiservicebrowser.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/network/avahi/qtavahiservicebrowser.h b/libguh/network/avahi/qtavahiservicebrowser.h index 203746c5..e9e98c03 100644 --- a/libguh/network/avahi/qtavahiservicebrowser.h +++ b/libguh/network/avahi/qtavahiservicebrowser.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2016-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/network/networkaccessmanager.h b/libguh/network/networkaccessmanager.h index b99c7f89..33933ad8 100644 --- a/libguh/network/networkaccessmanager.h +++ b/libguh/network/networkaccessmanager.h @@ -40,6 +40,7 @@ class LIBGUH_EXPORT NetworkAccessManager : public HardwareResource public: NetworkAccessManager(QObject *parent = nullptr); + virtual ~NetworkAccessManager() = default; virtual QNetworkReply *get(const QNetworkRequest &request) = 0; virtual QNetworkReply *deleteResource(const QNetworkRequest &request) = 0; diff --git a/libguh/network/upnp/upnpdiscovery.cpp b/libguh/network/upnp/upnpdiscovery.cpp index e74c249b..d4ae8307 100644 --- a/libguh/network/upnp/upnpdiscovery.cpp +++ b/libguh/network/upnp/upnpdiscovery.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/network/upnp/upnpdiscovery.h b/libguh/network/upnp/upnpdiscovery.h index 0ee1437e..f6468dd3 100644 --- a/libguh/network/upnp/upnpdiscovery.h +++ b/libguh/network/upnp/upnpdiscovery.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/network/upnp/upnpdiscoveryreply.cpp b/libguh/network/upnp/upnpdiscoveryreply.cpp index 8552d706..14ea8a25 100644 --- a/libguh/network/upnp/upnpdiscoveryreply.cpp +++ b/libguh/network/upnp/upnpdiscoveryreply.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/network/upnp/upnpdiscoveryreply.h b/libguh/network/upnp/upnpdiscoveryreply.h index 43229066..21215d1b 100644 --- a/libguh/network/upnp/upnpdiscoveryreply.h +++ b/libguh/network/upnp/upnpdiscoveryreply.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * @@ -41,6 +41,7 @@ public: Q_ENUM(UpnpDiscoveryReplyError) explicit UpnpDiscoveryReply(QObject *parent = nullptr); + virtual ~UpnpDiscoveryReply() = default; virtual QString searchTarget() const = 0; virtual QString userAgent() const = 0; diff --git a/libguh/plugin/device.cpp b/libguh/plugin/device.cpp index aa9500f2..ade2398a 100644 --- a/libguh/plugin/device.cpp +++ b/libguh/plugin/device.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * diff --git a/libguh/plugin/device.h b/libguh/plugin/device.h index 2d4a1ab3..e50c1476 100644 --- a/libguh/plugin/device.h +++ b/libguh/plugin/device.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * diff --git a/libguh/plugin/deviceplugin.cpp b/libguh/plugin/deviceplugin.cpp index 6363e3a5..a2f80533 100644 --- a/libguh/plugin/deviceplugin.cpp +++ b/libguh/plugin/deviceplugin.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * diff --git a/libguh/plugin/deviceplugin.h b/libguh/plugin/deviceplugin.h index a344203e..89d27407 100644 --- a/libguh/plugin/deviceplugin.h +++ b/libguh/plugin/deviceplugin.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2015 Simon Stürz * + * Copyright (C) 2015-2018 Simon Stürz * * Copyright (C) 2014 Michael Zanetti * * * * This file is part of guh. * diff --git a/libguh/plugintimer.cpp b/libguh/plugintimer.cpp index 51bf2bdb..310816f4 100644 --- a/libguh/plugintimer.cpp +++ b/libguh/plugintimer.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/libguh/plugintimer.h b/libguh/plugintimer.h index 8e695868..ed677a6c 100644 --- a/libguh/plugintimer.h +++ b/libguh/plugintimer.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Simon Stürz * + * Copyright (C) 2017-2018 Simon Stürz * * * * This file is part of guh. * * * diff --git a/plugins/mock/translations/de_DE.ts b/plugins/mock/translations/de_DE.ts index be19a9b9..8b82f386 100644 --- a/plugins/mock/translations/de_DE.ts +++ b/plugins/mock/translations/de_DE.ts @@ -12,267 +12,228 @@ MockDevice - guh The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) guh - Mock Device The name of the DeviceClass (753f0d32-0468-4d08-82ed-1964aab03298) Mock Gerät - http port The name of the paramType (d4f06047-125e-4479-9810-b54c189917f5) of Mock Device HTTP Port - Mock Action 3 (async) The name of the ActionType fbae06d3-7666-483e-a39e-ec50fe89054e of deviceClass Mock Device Mock Aktion 3 (async) - Mock Action 4 (broken) The name of the ActionType df3cf33d-26d5-4577-9132-9823bd33fad0 of deviceClass Mock Device Mock Aktion 4 (kaputt) - Mock Action 5 (async, broken) The name of the ActionType bfe89a1d-3497-4121-8318-e77c37537219 of deviceClass Mock Device Mock Aktion 5 (async, kaputt) - Mock Device (Auto created) The name of the DeviceClass (ab4257b3-7548-47ee-9bd4-7dc3004fd197) Mock Gerät (Auto erstellt) - Mock Device (Push Button) The name of the DeviceClass (9e03144c-e436-4eea-82d9-ccb33ef778db) Mock Gerät (Drückknopf) - Wait 3 second before you continue, the push button will be pressed automatically. The pairing info of deviceClass Mock Device (Push Button) Warte 3 Sekunden bevor du fortfährst, the Knopf wird automatisch gerückt. - configParamInt The name of the paramType (e1f72121-a426-45e2-b475-8262b5cdf103) of Mock Devices configParamInt - configParamBool The name of the paramType (c75723b6-ea4f-4982-9751-6c5e39c88145) of Mock Devices configParamBool - async The name of the paramType (f2977061-4dd0-4ef5-85aa-3b7134743be3) of Mock Device async - broken The name of the paramType (ae8f8901-f2c1-42a5-8111-6d2fc8e4c1e4) of Mock Device kaputt - resultCount The name of the paramType (d222adb4-2f9c-4c3f-8655-76400d0fb6ce) of Mock Device Resultat Anzahl - Dummy int state changed The name of the autocreated EventType (80baec19-54de-4948-ac46-31eabfaceb83) Int Zustand verändert - Dummy int state The name of the ParamType of StateType (80baec19-54de-4948-ac46-31eabfaceb83) of DeviceClass Mock Device Dummy Int Zustand - Dummy bool state changed The name of the autocreated EventType (9dd6a97c-dfd1-43dc-acbd-367932742310) Bool Zustand verändert - Dummy bool state The name of the ParamType of StateType (9dd6a97c-dfd1-43dc-acbd-367932742310) of DeviceClass Mock Device Dummy Bool Zustand - Mock Action 1 (with params) The name of the ActionType dea0f4e1-65e3-4981-8eaa-2701c53a9185 of deviceClass Mock Device Mock Aktion 1 (Mit Parametern) - mockActionParam1 The name of the paramType (a2d3a256-a551-4712-a65b-ecd5a436a1cb) of Mock Device mockActionParam1 - mockActionParam2 The name of the paramType (304a4899-18be-4e3b-94f4-d03be52f3233) of Mock Device mockActionParam2 - Mock Action 2 (without params) The name of the ActionType defd3ed6-1a0d-400b-8879-a0202cf39935 of deviceClass Mock Device Mock Aktion (ohne Parameter - mockParamInt The name of the paramType (0550e16d-60b9-4ba5-83f4-4d3cee656121) of Mock Device mockParamInt - Mock Event 1 The name of the EventType 45bf3752-0fc6-46b9-89fd-ffd878b5b22b of deviceClass Mock Device (Auto created) Mock Event 1 - Mock Event 2 The name of the EventType 863d5920-b1cf-4eb9-88bd-8f7b8583b1cf of deviceClass Mock Device (Auto created) Mock Event 2 - color changed The name of the autocreated EventType (20dc7c22-c50e-42db-837c-2bbced939f8e) Farbe geändert - color The name of the ParamType of StateType (20dc7c22-c50e-42db-837c-2bbced939f8e) of DeviceClass Mock Device (Push Button) Farbe - Set color The name of the autocreated ActionType (20dc7c22-c50e-42db-837c-2bbced939f8e) Setze Farbe - percentage changed The name of the autocreated EventType (72981c04-267a-4ba0-a59e-9921d2f3af9c) Prozent gändert - percentage The name of the ParamType of StateType (72981c04-267a-4ba0-a59e-9921d2f3af9c) of DeviceClass Mock Device (Push Button) Prozent - Set percentage The name of the autocreated ActionType (72981c04-267a-4ba0-a59e-9921d2f3af9c) Setze Prozentwert - allowed values changed The name of the autocreated EventType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) Erlaubter Wert geändert - allowed values The name of the ParamType of StateType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) of DeviceClass Mock Device (Push Button) Erlaubte Werte - Set allowed values The name of the autocreated ActionType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) Setze erlaubten Wert - double value changed The name of the autocreated EventType (53cd7c55-49b7-441b-b970-9048f20f0e2c) Double Wert geändert - double value The name of the ParamType of StateType (53cd7c55-49b7-441b-b970-9048f20f0e2c) of DeviceClass Mock Device (Push Button) Double Wert - Set double value The name of the autocreated ActionType (53cd7c55-49b7-441b-b970-9048f20f0e2c) Setze double Wert - - Set bool value @@ -282,22 +243,18 @@ The name of the autocreated ActionType (d24ede5f-4064-4898-bb84-cfb533b1fbc0)Setze boll Wert - Timeout action The name of the ActionType 54646e7c-bc54-4895-81a2-590d72d120f9 of deviceClass Mock Device (Push Button) Timeout Aktion - Mock Device (Display Pin) The name of the DeviceClass (296f1fd4-e893-46b2-8a42-50d1bceb8730) Mock Gerät (Pin anzeigen) - - bool value changed @@ -307,8 +264,6 @@ The name of the autocreated EventType (d24ede5f-4064-4898-bb84-cfb533b1fbc0)Bool Wert geändert - - bool value @@ -318,112 +273,96 @@ The name of the ParamType of StateType (d24ede5f-4064-4898-bb84-cfb533b1fbc0) of Bool Wert - Text line The name of the paramType (e6acf0c7-4b8e-4296-ac62-855d20deb816) of Mock Device (InputTypes) Textzeile - Text area The name of the paramType (716f0994-bc01-42b0-b64d-59236f7320d2) of Mock Device (InputTypes) Textfeld - Password text The name of the paramType (e5c0d14b-c9f1-4aca-a56e-85bfa6977150) of Mock Device (InputTypes) Passwort Text - Search text The name of the paramType (22add8c9-ee4f-43ad-8931-58e999313ac3) of Mock Device (InputTypes) Suchtext - Mail address The name of the paramType (a8494faf-3a0f-4cf3-84b7-4b39148a838d) of Mock Device (InputTypes) Mail Adresse - IPv4 address The name of the paramType (9e5f86a0-4bb3-4892-bff8-3fc4032af6e2) of Mock Device (InputTypes) IPv4 Adresse - IPv6 address The name of the paramType (43bf3832-dd48-4090-a836-656e8b60216e) of Mock Device (InputTypes) IPv6 Adresse - URL The name of the paramType (fa67229f-fcef-496f-b671-59a4b48f3ab5) of Mock Device (InputTypes) URL - Mac address The name of the paramType (e93db587-7919-48f3-8c88-1651de63c765) of Mock Device (InputTypes) Mac Adresse - Please enter the secret which normaly will be displayed on the device. For the mockdevice the pin is 243681. The pairing info of deviceClass Mock Device (Display Pin) Bitte geben sie den Pincode ein der normalerweise auf dem Gerät angezeit werden würde. In diesem fall lautet der Pincode 243681. - Mock Devices The name of the plugin Mock Devices (727a4a9a-c187-446f-aadf-f1b2220607d1) Mock Gerät - pin The name of the paramType (da820e07-22dc-4173-9c07-2f49a4e265f9) of Mock Device (Display Pin) Pin - Mock Device (Parent) The name of the DeviceClass (a71fbde9-9a38-4bf8-beab-c8aade2608ba) Mock Gerät (Elternteil) - Mock Device (Child) The name of the DeviceClass (40893c9f-bc47-40c1-8bf7-b390c7c1b4fc) Mock Gerät (Kind) - parent uuid The name of the paramType (104b5288-404e-42d3-bf38-e40682e75681) of Mock Device (Child) Elternteil Uuid - Mock Device (InputTypes) The name of the DeviceClass (515ffdf1-55e5-498d-9abc-4e2fe768f3a9) diff --git a/plugins/mock/translations/en_US.ts b/plugins/mock/translations/en_US.ts index 312a5ec9..ed068c24 100644 --- a/plugins/mock/translations/en_US.ts +++ b/plugins/mock/translations/en_US.ts @@ -12,267 +12,228 @@ MockDevice - guh The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - Mock Device The name of the DeviceClass (753f0d32-0468-4d08-82ed-1964aab03298) - http port The name of the paramType (d4f06047-125e-4479-9810-b54c189917f5) of Mock Device - Mock Action 3 (async) The name of the ActionType fbae06d3-7666-483e-a39e-ec50fe89054e of deviceClass Mock Device - Mock Action 4 (broken) The name of the ActionType df3cf33d-26d5-4577-9132-9823bd33fad0 of deviceClass Mock Device - Mock Action 5 (async, broken) The name of the ActionType bfe89a1d-3497-4121-8318-e77c37537219 of deviceClass Mock Device - Mock Device (Auto created) The name of the DeviceClass (ab4257b3-7548-47ee-9bd4-7dc3004fd197) - Mock Device (Push Button) The name of the DeviceClass (9e03144c-e436-4eea-82d9-ccb33ef778db) - Wait 3 second before you continue, the push button will be pressed automatically. The pairing info of deviceClass Mock Device (Push Button) - configParamInt The name of the paramType (e1f72121-a426-45e2-b475-8262b5cdf103) of Mock Devices - configParamBool The name of the paramType (c75723b6-ea4f-4982-9751-6c5e39c88145) of Mock Devices - async The name of the paramType (f2977061-4dd0-4ef5-85aa-3b7134743be3) of Mock Device - broken The name of the paramType (ae8f8901-f2c1-42a5-8111-6d2fc8e4c1e4) of Mock Device - resultCount The name of the paramType (d222adb4-2f9c-4c3f-8655-76400d0fb6ce) of Mock Device - Dummy int state changed The name of the autocreated EventType (80baec19-54de-4948-ac46-31eabfaceb83) - Dummy int state The name of the ParamType of StateType (80baec19-54de-4948-ac46-31eabfaceb83) of DeviceClass Mock Device - Dummy bool state changed The name of the autocreated EventType (9dd6a97c-dfd1-43dc-acbd-367932742310) - Dummy bool state The name of the ParamType of StateType (9dd6a97c-dfd1-43dc-acbd-367932742310) of DeviceClass Mock Device - Mock Action 1 (with params) The name of the ActionType dea0f4e1-65e3-4981-8eaa-2701c53a9185 of deviceClass Mock Device - mockActionParam1 The name of the paramType (a2d3a256-a551-4712-a65b-ecd5a436a1cb) of Mock Device - mockActionParam2 The name of the paramType (304a4899-18be-4e3b-94f4-d03be52f3233) of Mock Device - Mock Action 2 (without params) The name of the ActionType defd3ed6-1a0d-400b-8879-a0202cf39935 of deviceClass Mock Device - mockParamInt The name of the paramType (0550e16d-60b9-4ba5-83f4-4d3cee656121) of Mock Device - Mock Event 1 The name of the EventType 45bf3752-0fc6-46b9-89fd-ffd878b5b22b of deviceClass Mock Device (Auto created) - Mock Event 2 The name of the EventType 863d5920-b1cf-4eb9-88bd-8f7b8583b1cf of deviceClass Mock Device (Auto created) - color changed The name of the autocreated EventType (20dc7c22-c50e-42db-837c-2bbced939f8e) - color The name of the ParamType of StateType (20dc7c22-c50e-42db-837c-2bbced939f8e) of DeviceClass Mock Device (Push Button) - Set color The name of the autocreated ActionType (20dc7c22-c50e-42db-837c-2bbced939f8e) - percentage changed The name of the autocreated EventType (72981c04-267a-4ba0-a59e-9921d2f3af9c) - percentage The name of the ParamType of StateType (72981c04-267a-4ba0-a59e-9921d2f3af9c) of DeviceClass Mock Device (Push Button) - Set percentage The name of the autocreated ActionType (72981c04-267a-4ba0-a59e-9921d2f3af9c) - allowed values changed The name of the autocreated EventType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) - allowed values The name of the ParamType of StateType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) of DeviceClass Mock Device (Push Button) - Set allowed values The name of the autocreated ActionType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) - double value changed The name of the autocreated EventType (53cd7c55-49b7-441b-b970-9048f20f0e2c) - double value The name of the ParamType of StateType (53cd7c55-49b7-441b-b970-9048f20f0e2c) of DeviceClass Mock Device (Push Button) - Set double value The name of the autocreated ActionType (53cd7c55-49b7-441b-b970-9048f20f0e2c) - - Set bool value @@ -282,22 +243,18 @@ The name of the autocreated ActionType (d24ede5f-4064-4898-bb84-cfb533b1fbc0) - Timeout action The name of the ActionType 54646e7c-bc54-4895-81a2-590d72d120f9 of deviceClass Mock Device (Push Button) - Mock Device (Display Pin) The name of the DeviceClass (296f1fd4-e893-46b2-8a42-50d1bceb8730) - - bool value changed @@ -307,8 +264,6 @@ The name of the autocreated EventType (d24ede5f-4064-4898-bb84-cfb533b1fbc0) - - bool value @@ -318,112 +273,96 @@ The name of the ParamType of StateType (d24ede5f-4064-4898-bb84-cfb533b1fbc0) of - Text line The name of the paramType (e6acf0c7-4b8e-4296-ac62-855d20deb816) of Mock Device (InputTypes) - Text area The name of the paramType (716f0994-bc01-42b0-b64d-59236f7320d2) of Mock Device (InputTypes) - Password text The name of the paramType (e5c0d14b-c9f1-4aca-a56e-85bfa6977150) of Mock Device (InputTypes) - Search text The name of the paramType (22add8c9-ee4f-43ad-8931-58e999313ac3) of Mock Device (InputTypes) - Mail address The name of the paramType (a8494faf-3a0f-4cf3-84b7-4b39148a838d) of Mock Device (InputTypes) - IPv4 address The name of the paramType (9e5f86a0-4bb3-4892-bff8-3fc4032af6e2) of Mock Device (InputTypes) - IPv6 address The name of the paramType (43bf3832-dd48-4090-a836-656e8b60216e) of Mock Device (InputTypes) - URL The name of the paramType (fa67229f-fcef-496f-b671-59a4b48f3ab5) of Mock Device (InputTypes) - Mac address The name of the paramType (e93db587-7919-48f3-8c88-1651de63c765) of Mock Device (InputTypes) - Please enter the secret which normaly will be displayed on the device. For the mockdevice the pin is 243681. The pairing info of deviceClass Mock Device (Display Pin) - Mock Devices The name of the plugin Mock Devices (727a4a9a-c187-446f-aadf-f1b2220607d1) - pin The name of the paramType (da820e07-22dc-4173-9c07-2f49a4e265f9) of Mock Device (Display Pin) - Mock Device (Parent) The name of the DeviceClass (a71fbde9-9a38-4bf8-beab-c8aade2608ba) - Mock Device (Child) The name of the DeviceClass (40893c9f-bc47-40c1-8bf7-b390c7c1b4fc) - parent uuid The name of the paramType (104b5288-404e-42d3-bf38-e40682e75681) of Mock Device (Child) - Mock Device (InputTypes) The name of the DeviceClass (515ffdf1-55e5-498d-9abc-4e2fe768f3a9) diff --git a/translations/guhd-de_DE.ts b/translations/guhd-de_DE.ts index 89ee1a9f..d61aafd1 100644 --- a/translations/guhd-de_DE.ts +++ b/translations/guhd-de_DE.ts @@ -4,7 +4,7 @@ main - + guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, which allows to control a lot of different devices from many different @@ -23,12 +23,12 @@ Szenen undVerhaltensweisen des Systems festzulegen. - + Run guhd in the foreground, not as daemon. Starte guhd im Vordergrund, nicht als Service. - + Debug categories to enable. Prefix with "No" to disable. Warnings from all categories will be printed unless explicitly muted with "NoWarnings". Categories are: @@ -36,22 +36,22 @@ Categories are: Es gibt folgende Kategorien: - + Enables all debug categories. This parameter overrides all debug category parameters. Aktiviere alle Debug-Kategorien. Dieser Parameter überschreibt alle anderen Debug-Kategorien Parameter. - + Specify a log file to write to, If this option is not specified, logs will be printed to the standard output. - + If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus. - + No such debug category: Diese Debug-Kategorie existiert nicht: diff --git a/translations/guhd-en_US.ts b/translations/guhd-en_US.ts index 5c03ed17..ab7360a1 100644 --- a/translations/guhd-en_US.ts +++ b/translations/guhd-en_US.ts @@ -4,7 +4,7 @@ main - + guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, which allows to control a lot of different devices from many different @@ -23,12 +23,12 @@ for your environment. - + Run guhd in the foreground, not as daemon. Run guhd in the foreground, not as daemon. - + Debug categories to enable. Prefix with "No" to disable. Warnings from all categories will be printed unless explicitly muted with "NoWarnings". Categories are: @@ -37,22 +37,22 @@ Categories are: Categories are: - + Enables all debug categories. This parameter overrides all debug category parameters. Enables all debug categories. This parameter overrides all debug category parameters. - + Specify a log file to write to, If this option is not specified, logs will be printed to the standard output. - + If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus. - + No such debug category: No such debug category: