diff --git a/CMakeLists.txt b/CMakeLists.txt index 545648ee5..af7641719 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ else() ) if(UNIX AND NOT APPLE) - set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner) find_package(KF5PulseAudioQt) endif() find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED) @@ -110,10 +109,6 @@ if(NOT SAILFISHOS) add_subdirectory(plasmoid) endif() - if(KF5Runner_FOUND) - add_subdirectory(runners) - endif() - if(KF5DocTools_FOUND) add_subdirectory(doc) endif() diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt deleted file mode 100644 index 57b68a452..000000000 --- a/runners/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(remotecommands) -add_subdirectory(findmyphone) diff --git a/runners/findmyphone/CMakeLists.txt b/runners/findmyphone/CMakeLists.txt deleted file mode 100644 index 8e5d96567..000000000 --- a/runners/findmyphone/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_definitions(-DTRANSLATION_DOMAIN="plasma_runner_kdeconnect_findmyphone") - -add_library(krunner_kdeconnect_findmyphone MODULE findmyphonerunner.cpp) -target_link_libraries(krunner_kdeconnect_findmyphone PUBLIC KF5::Runner KF5::I18n kdeconnectinterfaces) - -install(TARGETS krunner_kdeconnect_findmyphone DESTINATION ${KDE_INSTALL_PLUGINDIR}) -install(FILES plasma-runner-kdeconnect-findmyphone.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) diff --git a/runners/findmyphone/Messages.sh b/runners/findmyphone/Messages.sh deleted file mode 100644 index f2c9c85f9..000000000 --- a/runners/findmyphone/Messages.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env bash -$XGETTEXT *.cpp -o $podir/plasma_runner_kdeconnect_findmyphone.pot diff --git a/runners/findmyphone/findmyphonerunner.cpp b/runners/findmyphone/findmyphonerunner.cpp deleted file mode 100644 index f2488f2c5..000000000 --- a/runners/findmyphone/findmyphonerunner.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/*************************************************************************** - * Copyright © 2018 Nicolas Fella * - * * - * 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 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * 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. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "findmyphonerunner.h" - -#include -#include - -K_EXPORT_PLASMA_RUNNER(installer, FindMyPhoneRunner) - -FindMyPhoneRunner::FindMyPhoneRunner(QObject *parent, const QVariantList &args) - : Plasma::AbstractRunner(parent, args) - , m_daemonInterface(new DaemonDbusInterface) -{ - Q_UNUSED(args) - - setObjectName(QStringLiteral("Find my device")); - setPriority(AbstractRunner::NormalPriority); -} - -FindMyPhoneRunner::~FindMyPhoneRunner() -{ -} - -void FindMyPhoneRunner::match(Plasma::RunnerContext &context) -{ - QDBusReply devicesReply = m_daemonInterface.devices(true, true); - - if (devicesReply.isValid()) { - - const auto devices = devicesReply.value(); - for (const QString& deviceId : devices) { - - DeviceDbusInterface deviceInterface(deviceId, this); - - if(!deviceInterface.hasPlugin(QStringLiteral("kdeconnect_findmyphone"))) { - continue; - } - - QString deviceName = deviceInterface.name(); - - if (deviceName.contains(context.query(), Qt::CaseInsensitive) || i18n("Ring").contains(context.query(), Qt::CaseInsensitive) || i18n("Find").contains(context.query(), Qt::CaseInsensitive)) { - - Plasma::QueryMatch match(this); - match.setType(Plasma::QueryMatch::PossibleMatch); - match.setId(deviceId); - match.setIconName(QStringLiteral("kdeconnect")); - match.setText(i18n("Find %1", deviceName)); - match.setData(deviceId); - context.addMatch(match); - } - } - } -} - -void FindMyPhoneRunner::run(const Plasma::RunnerContext &/*context*/, const Plasma::QueryMatch &match) -{ - FindMyPhoneDeviceDbusInterface findInterface(match.data().toString(), this); - - findInterface.ring(); -} - -#include "findmyphonerunner.moc" diff --git a/runners/findmyphone/findmyphonerunner.h b/runners/findmyphone/findmyphonerunner.h deleted file mode 100644 index 36731c038..000000000 --- a/runners/findmyphone/findmyphonerunner.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * Copyright © 2018 Nicolas Fella * - * * - * 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 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * 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. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef FINDMYPHONESRUNNER_H -#define FINDMYPHONESRUNNER_H - -#include - -#include "dbusinterfaces.h" - -class FindMyPhoneRunner : public Plasma::AbstractRunner -{ -Q_OBJECT - -public: - FindMyPhoneRunner(QObject *parent, const QVariantList &args); - ~FindMyPhoneRunner() override; - - void match(Plasma::RunnerContext &context) override; - void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override; - -private: - DaemonDbusInterface m_daemonInterface; - -}; - -#endif - diff --git a/runners/remotecommands/CMakeLists.txt b/runners/remotecommands/CMakeLists.txt deleted file mode 100644 index a501e0388..000000000 --- a/runners/remotecommands/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_definitions(-DTRANSLATION_DOMAIN="plasma_runner_kdeconnect_remotecommands") - -add_library(krunner_kdeconnect_remotecommands MODULE remotecommandsrunner.cpp) -target_link_libraries(krunner_kdeconnect_remotecommands PUBLIC KF5::Runner kdeconnectinterfaces) - -install(TARGETS krunner_kdeconnect_remotecommands DESTINATION ${KDE_INSTALL_PLUGINDIR}) -install(FILES plasma-runner-kdeconnect-remotecommands.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) diff --git a/runners/remotecommands/Messages.sh b/runners/remotecommands/Messages.sh deleted file mode 100644 index 24e29636e..000000000 --- a/runners/remotecommands/Messages.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env bash -$XGETTEXT *.cpp -o $podir/plasma_runner_kdeconnect_remotecommands.pot diff --git a/runners/remotecommands/remotecommandsrunner.cpp b/runners/remotecommands/remotecommandsrunner.cpp deleted file mode 100644 index 86326c008..000000000 --- a/runners/remotecommands/remotecommandsrunner.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/*************************************************************************** - * Copyright © 2018 Nicolas Fella * - * * - * 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 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * 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. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "remotecommandsrunner.h" - -#include - -K_EXPORT_PLASMA_RUNNER(installer, RemoteCommandsRunner) - -RemoteCommandsRunner::RemoteCommandsRunner(QObject *parent, const QVariantList &args) - : Plasma::AbstractRunner(parent, args) - , m_daemonInterface(new DaemonDbusInterface) -{ - Q_UNUSED(args) - - setObjectName(QStringLiteral("Run Commands")); - setPriority(AbstractRunner::HighestPriority); -} - -RemoteCommandsRunner::~RemoteCommandsRunner() -{ -} - -void RemoteCommandsRunner::match(Plasma::RunnerContext &context) -{ - QDBusReply devicesReply = m_daemonInterface.devices(true, true); - - if (devicesReply.isValid()) { - - const auto devices = devicesReply.value(); - for (const QString& deviceId : devices) { - - DeviceDbusInterface deviceInterface(deviceId, this); - - if(!deviceInterface.hasPlugin(QStringLiteral("kdeconnect_remotecommands"))) { - continue; - } - - RemoteCommandsDbusInterface remoteCommandsInterface(deviceId, this); - - const auto cmds = QJsonDocument::fromJson(remoteCommandsInterface.commands()).object(); - - for (auto it = cmds.constBegin(), itEnd = cmds.constEnd(); it!=itEnd; ++it) { - const QJsonObject cont = it->toObject(); - - const QString deviceName = deviceInterface.name(); - const QString commandName = cont.value(QStringLiteral("name")).toString(); - - if (deviceName.contains(context.query(), Qt::CaseInsensitive) || commandName.contains(context.query(), Qt::CaseInsensitive)) { - - Plasma::QueryMatch match(this); - match.setType(Plasma::QueryMatch::PossibleMatch); - match.setId(it.key()); - match.setIconName(QStringLiteral("kdeconnect")); - match.setText(deviceName + QStringLiteral(": ") + commandName); - match.setSubtext(cont.value(QStringLiteral("command")).toString()); - match.setData(deviceId + QStringLiteral("$") + it.key()); - context.addMatch(match); - } - } - } - } -} - -void RemoteCommandsRunner::run(const Plasma::RunnerContext &/*context*/, const Plasma::QueryMatch &match) -{ - RemoteCommandsDbusInterface remoteCommandsInterface(match.data().toString().split(QStringLiteral("$"))[0], this); - - remoteCommandsInterface.triggerCommand(match.data().toString().split(QStringLiteral("$"))[1]); -} - -#include "remotecommandsrunner.moc" diff --git a/runners/remotecommands/remotecommandsrunner.h b/runners/remotecommands/remotecommandsrunner.h deleted file mode 100644 index 7f509a3f2..000000000 --- a/runners/remotecommands/remotecommandsrunner.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * Copyright © 2018 Nicolas Fella * - * * - * 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 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * 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. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef REMOTECOMMANDSRUNNER_H -#define REMOTECOMMANDSRUNNER_H - -#include - -#include "dbusinterfaces.h" - -class RemoteCommandsRunner : public Plasma::AbstractRunner -{ -Q_OBJECT - -public: - RemoteCommandsRunner(QObject *parent, const QVariantList &args); - ~RemoteCommandsRunner() override; - - void match(Plasma::RunnerContext &context) override; - void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override; - -private: - DaemonDbusInterface m_daemonInterface; - -}; - -#endif -