diff --git a/containments/panel/CMakeLists.txt b/containments/panel/CMakeLists.txt
index 7de0fd4..49cb9c9 100644
--- a/containments/panel/CMakeLists.txt
+++ b/containments/panel/CMakeLists.txt
@@ -1,21 +1,25 @@
+qt5_add_dbus_interfaces(DBUS_SRCS dbus/org.kde.KWin.Screenshot.xml)
+
set(phonepanel_SRCS
phonepanel.cpp
+ ${DBUS_SRCS}
)
add_library(plasma_applet_phonepanel MODULE ${phonepanel_SRCS})
kcoreaddons_desktop_to_json(plasma_applet_phonepanel package/metadata.desktop)
target_link_libraries(plasma_applet_phonepanel
Qt5::Gui
+ Qt5::DBus
KF5::Plasma
KF5::I18n
${GSTREAMER_LIBRARIES} GLIB2::GLIB2 ${GOBJECT_LIBRARIES})
target_include_directories(plasma_applet_phonepanel PRIVATE "${GSTREAMER_INCLUDE_DIR}")
install(TARGETS plasma_applet_phonepanel DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
#install(FILES plasma-phonepanel-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
plasma_install_package(package org.kde.phone.panel)
diff --git a/containments/panel/dbus/org.kde.KWin.Screenshot.xml b/containments/panel/dbus/org.kde.KWin.Screenshot.xml
new file mode 100644
index 0000000..0d2d92c
--- /dev/null
+++ b/containments/panel/dbus/org.kde.KWin.Screenshot.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml b/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
index 0c7c7ad..82ec7ae 100644
--- a/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
+++ b/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
@@ -1,222 +1,244 @@
/*
* Copyright 2015 Marco Martin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* 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 Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import QtQuick 2.1
import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
Item {
id: root
implicitWidth: flow.implicitWidth + units.smallSpacing * 6
implicitHeight: flow.implicitHeight + units.smallSpacing * 6
signal closeRequested
signal closed
+ property bool screenshotRequested: false
+
function toggleAirplane() {
print("toggle airplane mode")
}
function toggleTorch() {
plasmoid.nativeInterface.toggleTorch()
}
function requestShutdown() {
print("Shutdown requested, depends on ksmserver running");
var service = pmSource.serviceForSource("PowerDevil");
//note the strange camelCasing is intentional
var operation = service.operationDescription("requestShutDown");
return service.startOperationCall(operation);
}
function addPlasmoid(applet) {
settingsModel.append({"icon": applet.icon,
"text": applet.title,
"enabled": false,
"applet": applet,
"settingsCommand": "",
"toggleFunction": ""});
}
signal plasmoidTriggered(var applet, var id)
Layout.minimumHeight: flow.implicitHeight + units.largeSpacing*2
property int screenBrightness
property bool disableBrightnessUpdate: true
readonly property int maximumScreenBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Screen Brightness"] || 0 : 0
onScreenBrightnessChanged: {
if(!disableBrightnessUpdate) {
var service = pmSource.serviceForSource("PowerDevil");
var operation = service.operationDescription("setBrightness");
operation.brightness = screenBrightness;
operation.silent = true
service.startOperationCall(operation);
}
}
+ function requestScreenshot() {
+ screenshotRequested = true;
+ root.closeRequested();
+ }
+
+ onClosed: {
+ if (screenshotRequested) {
+ plasmoid.nativeInterface.takeScreenshot();
+ screenshotRequested = false;
+ }
+ }
+
PlasmaCore.DataSource {
id: pmSource
engine: "powermanagement"
connectedSources: ["PowerDevil"]
onSourceAdded: {
if (source === "PowerDevil") {
disconnectSource(source);
connectSource(source);
}
}
onDataChanged: {
disableBrightnessUpdate = true;
root.screenBrightness = pmSource.data["PowerDevil"]["Screen Brightness"];
disableBrightnessUpdate = false;
}
}
//HACK: make the list know about the applet delegate which is a qtobject
QtObject {
id: nullApplet
}
Component.onCompleted: {
//NOTE: add all in javascript as the static decl of listelements can't have scripts
settingsModel.append({
"text": i18n("Settings"),
"icon": "configure",
"enabled": false,
"settingsCommand": "plasma-settings",
"toggleFunction": "",
"delegate": "",
"enabled": false,
"applet": null
});
settingsModel.append({
"text": i18n("Wifi"),
"icon": "network-wireless-signal",
"enabled": false,
"settingsCommand": "plasma-settings -m kcm_mobile_wifi",
"toggleFunction": "",
"delegate": "",
"enabled": false,
"applet": null
});
settingsModel.append({
"text": i18n("Mobile Data"),
"icon": "network-modem",
"enabled": false,
"settingsCommand": "plasma-settings -m kcm_mobile_broadband",
"toggleFunction": "",
"delegate": "",
"enabled": false,
"applet": null
});
settingsModel.append({
"text": i18n("Battery"),
"icon": "battery-full",
"enabled": false,
"settingsCommand": "plasma-settings -m kcm_mobile_power",
"toggleFunction": "",
"delegate": "",
"enabled": false,
"applet": null
});
settingsModel.append({
"text": i18n("Sound"),
"icon": "audio-speakers-symbolic",
"enabled": false,
"settingsCommand": "plasma-settings -m kcm_pulseaudio",
"toggleFunction": "",
"delegate": "",
"enabled": false,
"applet": null
});
settingsModel.append({
"text": i18n("Flashlight"),
"icon": "flashlight-on",
"enabled": false,
"settingsCommand": "",
"toggleFunction": "toggleTorch",
"applet": null
});
settingsModel.append({
"text": i18n("Location"),
"icon": "find-location-symbolic",
"enabled": false,
"settingsCommand": "",
"applet": null
});
+ settingsModel.append({
+ "text": i18n("Screenshot"),
+ "icon": "spectacle",
+ "enabled": false,
+ "settingsCommand": "",
+ "toggleFunction": "requestScreenshot",
+ "applet": null
+ });
brightnessSlider.moved.connect(function() {
root.screenBrightness = brightnessSlider.value;
});
disableBrightnessUpdate = false;
}
ListModel {
id: settingsModel
}
Flow {
id: flow
anchors {
fill: parent
margins: units.smallSpacing*3
}
readonly property real cellSizeHint: units.iconSizes.large + units.smallSpacing * 6 + Math.floor(units.largeSpacing/2)
readonly property real columnWidth: Math.floor(width / Math.floor(width / cellSizeHint))
spacing: 0
Repeater {
model: settingsModel
delegate: Loader {
id: loader
//FIXME: why this is needed?
width: flow.columnWidth
height: item ? item.implicitHeight : 0
source: Qt.resolvedUrl((model.delegate ? model.delegate : "Delegate") + ".qml")
Connections {
target: loader.item
onCloseRequested: root.closeRequested();
}
Connections {
target: root
onClosed: loader.item.panelClosed();
}
}
}
move: Transition {
NumberAnimation {
duration: units.shortDuration
easing.type: Easing.InOutQuad
properties: "x,y"
}
}
BrightnessItem {
id: brightnessSlider
width: flow.width
icon: "video-display-brightness"
label: i18n("Display Brightness")
value: root.screenBrightness
maximumValue: root.maximumScreenBrightness
Connections {
target: root
onScreenBrightnessChanged: brightnessSlider.value = root.screenBrightness
}
}
}
}
diff --git a/containments/panel/phonepanel.cpp b/containments/panel/phonepanel.cpp
index b1816a5..3455fff 100644
--- a/containments/panel/phonepanel.cpp
+++ b/containments/panel/phonepanel.cpp
@@ -1,76 +1,129 @@
/***************************************************************************
* Copyright (C) 2015 Marco Martin *
* Copyright (C) 2018 Bhushan Shah *
* *
* 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) any later version. *
* *
* 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, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/
#include "phonepanel.h"
+#include
+#include
+#include
#include
+#include
#include
+#include
+
+#include "screenshotinterface.h"
PhonePanel::PhonePanel(QObject *parent, const QVariantList &args)
: Plasma::Containment(parent, args)
{
//setHasConfigurationInterface(true);
}
PhonePanel::~PhonePanel()
= default;
void PhonePanel::executeCommand(const QString &command)
{
qWarning()<<"Executing"< reply = interface->screenshotFullscreen();
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+
+ connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) {
+ QDBusPendingReply reply = *watcher;
+
+ if (reply.isError()) {
+ qWarning() << "Creating the screenshot failed:" << reply.error().name() << reply.error().message();
+ } else {
+ QString filePath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+ if (filePath.isEmpty()) {
+ qWarning() << "Couldn't find a writable location for the screenshot! The screenshot is in /tmp.";
+ return;
+ }
+
+ QDir picturesDir(filePath);
+ if (!picturesDir.mkpath(QStringLiteral("Screenshots"))) {
+ qWarning() << "Couldn't create folder at"
+ << picturesDir.path() + QStringLiteral("/Screenshots")
+ << "to take screenshot.";
+ return;
+ }
+
+ filePath += QStringLiteral("/Screenshots/Screenshot_%1.png")
+ .arg(QDateTime::currentDateTime().toString(QStringLiteral("yyyyMMdd_hhmmss")));
+
+ const QString currentPath = reply.argumentAt<0>();
+ QtConcurrent::run(QThreadPool::globalInstance(), [=]() {
+ QFile screenshotFile(currentPath);
+ if (!screenshotFile.rename(filePath)) {
+ qWarning() << "Couldn't move screenshot into Pictures folder:"
+ << screenshotFile.errorString();
+ }
+
+ qDebug() << "Successfully saved screenshot at" << filePath;
+ });
+ }
+
+ watcher->deleteLater();
+ interface->deleteLater();
+ });
+}
+
K_EXPORT_PLASMA_APPLET_WITH_JSON(quicksettings, PhonePanel, "metadata.json")
#include "phonepanel.moc"
diff --git a/containments/panel/phonepanel.h b/containments/panel/phonepanel.h
index 205b1f3..08c279a 100644
--- a/containments/panel/phonepanel.h
+++ b/containments/panel/phonepanel.h
@@ -1,49 +1,50 @@
/***************************************************************************
* Copyright (C) 2015 Marco Martin *
*
* *
* 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) any later version. *
* *
* 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, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/
#ifndef PHONEPANEL_H
#define PHONEPANEL_H
#include
#include
class PhonePanel : public Plasma::Containment
{
Q_OBJECT
public:
PhonePanel( QObject *parent, const QVariantList &args );
~PhonePanel() override;
public Q_SLOTS:
void executeCommand(const QString &command);
void toggleTorch();
+ void takeScreenshot();
private:
GstElement* m_pipeline;
GstElement* m_sink;
GstElement* m_source;
bool m_running = false;
};
#endif