diff --git a/CMakeLists.txt b/CMakeLists.txt index d7a3a30a..586a3b89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,132 +1,136 @@ cmake_minimum_required(VERSION 3.0) project(kdeconnect) set(KDECONNECT_VERSION_MAJOR 1) set(KDECONNECT_VERSION_MINOR 3) set(KDECONNECT_VERSION_PATCH 3) set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}") find_package(PkgConfig) if (SAILFISHOS) set(KF5_MIN_VERSION "5.31.0") set(QT_MIN_VERSION "5.6.0") set(KF5_REQUIRED_COMPONENTS I18n DBusAddons CoreAddons IconThemes Config Service) set(KF5_OPTIONAL_COMPONENTS) set(QCA_MIN_VERSION 2.0.0) pkg_search_module(SFOS REQUIRED sailfishapp) pkg_check_modules(QCA2 qca2-qt5>=${QCA_MIN_VERSION} REQUIRED) add_definitions(-DSAILFISHOS) include_directories(${QCA2_INCLUDEDIR}) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) else() set(KF5_MIN_VERSION "5.42.0") set(QT_MIN_VERSION "5.7.0") set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils) set(KF5_OPTIONAL_COMPONENTS DocTools) if(UNIX) - set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} PulseAudioQt) + set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} PulseAudioQt Runner) endif() set(QCA_MIN_VERSION "2.1.0") find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS) endif() find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick Network) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ${KF5_REQUIRED_COMPONENTS}) if (KF5_OPTIONAL_COMPONENTS) find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS ${KF5_OPTIONAL_COMPONENTS}) endif() find_package(Phonon4Qt5 4.9.0 NO_MODULE) set_package_properties(Phonon4Qt5 PROPERTIES DESCRIPTION "Qt-based audio library" TYPE OPTIONAL PURPOSE "Required for Find My Device plugin" ) set_package_properties(KF5Kirigami2 PROPERTIES DESCRIPTION "QtQuick plugins to build user interfaces based on KDE UX guidelines" PURPOSE "Required for KDE Connect's QML-based GUI applications" URL "https://www.kde.org/products/kirigami/" TYPE RUNTIME ) include_directories(${CMAKE_SOURCE_DIR}) configure_file(kdeconnect-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeconnect-version.h) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddTests) include(ECMSetupVersion) include(ECMInstallIcons) include(FeatureSummary) include(KDEConnectMacros.cmake) include(GenerateExportHeader) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(core) if(NOT SAILFISHOS) add_subdirectory(kcm) add_subdirectory(kcmplugin) add_subdirectory(daemon) endif() if(NOT WIN32 AND NOT SAILFISHOS) add_subdirectory(kio) add_subdirectory(plasmoid) endif() add_subdirectory(icon) add_subdirectory(interfaces) add_subdirectory(data) option(EXPERIMENTALAPP_ENABLED OFF) if(EXPERIMENTALAPP_ENABLED) find_package(KF5Kirigami2) add_subdirectory(app) endif() add_subdirectory(plugins) add_subdirectory(cli) add_subdirectory(declarativeplugin) +if(KF5Runner_FOUND) + add_subdirectory(runners) +endif() + if (NOT SAILFISHOS) add_subdirectory(indicator) add_subdirectory(urlhandler) add_subdirectory(nautilus-extension) else() add_subdirectory(sfos) endif() option(SMSAPP_ENABLED OFF) if(SMSAPP_ENABLED) find_package(KF5Kirigami2) find_package(KF5People REQUIRED) find_package(KF5PeopleVCard) set_package_properties(KF5PeopleVCard PROPERTIES PURPOSE "Read vcards from the file system" URL "https://phabricator.kde.org/source/kpeoplevcard/" TYPE RUNTIME ) add_subdirectory(smsapp) endif() if(KF5DocTools_FOUND) add_subdirectory(doc) endif() if(BUILD_TESTING AND NOT SAILFISHOS) add_subdirectory(tests) endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt new file mode 100644 index 00000000..907baff9 --- /dev/null +++ b/runners/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(remotecommands) diff --git a/runners/remotecommands/CMakeLists.txt b/runners/remotecommands/CMakeLists.txt new file mode 100644 index 00000000..a501e038 --- /dev/null +++ b/runners/remotecommands/CMakeLists.txt @@ -0,0 +1,7 @@ +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 new file mode 100644 index 00000000..24e29636 --- /dev/null +++ b/runners/remotecommands/Messages.sh @@ -0,0 +1,2 @@ +#! /usr/bin/env bash +$XGETTEXT *.cpp -o $podir/plasma_runner_kdeconnect_remotecommands.pot diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop new file mode 100644 index 00000000..b539abe7 --- /dev/null +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Run command +Comment=Run commands on connected devices +Icon=kdeconnect +Type=Service +X-KDE-ServiceTypes=Plasma/Runner + +X-KDE-Library=krunner_kdeconnect_remotecommands +X-KDE-PluginInfo-Author=Nicolas Fella +X-KDE-PluginInfo-Email=nicolas.fella@gmx.de +X-KDE-PluginInfo-Version=0.1 +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true diff --git a/runners/remotecommands/remotecommandsrunner.cpp b/runners/remotecommands/remotecommandsrunner.cpp new file mode 100644 index 00000000..20b1c761 --- /dev/null +++ b/runners/remotecommands/remotecommandsrunner.cpp @@ -0,0 +1,91 @@ +/*************************************************************************** + * 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 +#include + +#include "interfaces/dbusinterfaces.h" + +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()) { + + for (const QString& deviceId : devicesReply.value()) { + + DeviceDbusInterface deviceInterface(deviceId, this); + + if(!deviceInterface.hasPlugin("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.setIcon(QIcon::fromTheme("kdeconnect")); + match.setText(deviceName + ": " + commandName); + match.setSubtext(cont.value(QStringLiteral("command")).toString()); + match.setData(deviceId + "$" + it.key()); + context.addMatch(match); + } + } + } + } +} + +void RemoteCommandsRunner::run(const Plasma::RunnerContext &/*context*/, const Plasma::QueryMatch &match) +{ + RemoteCommandsDbusInterface remoteCommandsInterface(match.data().toString().split("$")[0], this); + + remoteCommandsInterface.triggerCommand(match.data().toString().split("$")[1]); +} + +#include "remotecommandsrunner.moc" diff --git a/runners/remotecommands/remotecommandsrunner.h b/runners/remotecommands/remotecommandsrunner.h new file mode 100644 index 00000000..4e50f3b6 --- /dev/null +++ b/runners/remotecommands/remotecommandsrunner.h @@ -0,0 +1,45 @@ +/*************************************************************************** + * 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 "interfaces/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 +