diff --git a/.reviewboardrc b/.reviewboardrc deleted file mode 100644 --- a/.reviewboardrc +++ /dev/null @@ -1,2 +0,0 @@ -REVIEWBOARD_URL = 'https://git.reviewboard.kde.org' -REPOSITORY = 'git://anongit.kde.org/kscreen' diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,11 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(Qt5 REQUIRED COMPONENTS QuickWidgets Test) -find_package(KF5 REQUIRED COMPONENTS DBusAddons Config ConfigWidgets I18n XmlGui GlobalAccel WidgetsAddons) +find_package(KF5 REQUIRED COMPONENTS DBusAddons Config ConfigWidgets I18n XmlGui GlobalAccel WidgetsAddons + Declarative IconThemes Plasma +) +# WARNING PlasmaQuick provides unversioned CMake config +find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) set(MIN_LIBKSCREEN_VERSION "5.2.91") find_package(KF5Screen ${MIN_LIBKSCREEN_VERSION} REQUIRED) diff --git a/kcm/kcm_kscreen.desktop.cmake b/kcm/kcm_kscreen.desktop.cmake --- a/kcm/kcm_kscreen.desktop.cmake +++ b/kcm/kcm_kscreen.desktop.cmake @@ -67,7 +67,7 @@ Comment[he]=נהל את הגדרות המסכים והתצוגות שלך Comment[hu]=Monitorok és kijelzők kezelése és beállítása Comment[ia]=Gere e configura monitors e monstratores -Comment[id]=Kelola dan atur monitor dan display +Comment[id]=Kelola dan konfigurasi monitor dan display Comment[it]=Gestisci e configura monitor e schermi Comment[ko]=모니터와 디스플레이 설정 및 관리 Comment[lt]=Tvarkyti ir konfigūruoti monitorius ir ekranus diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -1,12 +1,15 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kscreen\") -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_SOURCE_DIR}/kcm/src) set(kscreen_daemon_SRCS daemon.cpp serializer.cpp generator.cpp device.cpp + osd.cpp + osdmanager.cpp + ${CMAKE_SOURCE_DIR}/kcm/src/utils.cpp ) ecm_qt_declare_logging_category(kscreen_daemon_SRCS HEADER kscreen_daemon_debug.h IDENTIFIER KSCREEN_KDED CATEGORY_NAME kscreen.kded) @@ -22,12 +25,29 @@ add_library(kscreen MODULE ${kscreen_daemon_SRCS}) -target_link_libraries(kscreen Qt5::Widgets Qt5::DBus KF5::Screen KF5::DBusAddons KF5::I18n KF5::XmlGui KF5::GlobalAccel) +target_link_libraries(kscreen Qt5::Widgets + Qt5::DBus + Qt5::Quick + KF5::Declarative + KF5::Screen + KF5::DBusAddons + KF5::I18n + KF5::XmlGui + KF5::GlobalAccel) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kscreen.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kscreen.desktop @ONLY) kcoreaddons_desktop_to_json(kscreen ${CMAKE_CURRENT_BINARY_DIR}/kscreen.desktop) install(TARGETS kscreen DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded) + +set(QML_FILES + qml/Osd.qml + qml/OsdItem.qml + qml/OsdSelector.qml + qml/OutputIdentifier.qml +) + +install(FILES ${QML_FILES} DESTINATION ${DATA_INSTALL_DIR}/kded_kscreen/qml) diff --git a/kded/daemon.h b/kded/daemon.h --- a/kded/daemon.h +++ b/kded/daemon.h @@ -26,6 +26,7 @@ #include #include "generator.h" +#include "osdmanager.h" class QTimer; @@ -60,6 +61,8 @@ void lidClosedTimeout(); void setMonitorForChanges(bool enabled); void outputConnectedChanged(); + void showOutputIdentifier(); + void applyOsdAction(KScreen::OsdAction::Action action); Q_SIGNALS: void outputConnected(const QString &outputName); diff --git a/kded/daemon.cpp b/kded/daemon.cpp --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -23,6 +23,7 @@ #include "device.h" #include "kscreenadaptor.h" #include "kscreen_daemon_debug.h" +#include "osdmanager.h" #include #include @@ -95,6 +96,8 @@ connect(action, &QAction::triggered, [&](bool) { displayButton(); }); new KScreenAdaptor(this); + // Initialize OSD manager to register its dbus interface + KScreen::OsdManager::self(); m_buttonTimer->setInterval(300); m_buttonTimer->setSingleShot(true); @@ -180,10 +183,49 @@ doApplyConfig(config); } +void KScreenDaemon::applyOsdAction(KScreen::OsdAction::Action action) +{ + switch (action) { + case KScreen::OsdAction::NoAction: + qCDebug(KSCREEN_KDED) << "OSD: no action"; + return; + case KScreen::OsdAction::SwitchToInternal: + qCDebug(KSCREEN_KDED) << "OSD: switch to internal"; + doApplyConfig(Generator::self()->displaySwitch(Generator::TurnOffExternal)); + return; + case KScreen::OsdAction::SwitchToExternal: + qCDebug(KSCREEN_KDED) << "OSD: switch to external"; + doApplyConfig(Generator::self()->displaySwitch(Generator::TurnOffEmbedded)); + return; + case KScreen::OsdAction::ExtendLeft: + qCDebug(KSCREEN_KDED) << "OSD: extend left"; + doApplyConfig(Generator::self()->displaySwitch(Generator::ExtendToLeft)); + return; + case KScreen::OsdAction::ExtendRight: + qCDebug(KSCREEN_KDED) << "OSD: extend right"; + doApplyConfig(Generator::self()->displaySwitch(Generator::ExtendToRight)); + return; + case KScreen::OsdAction::Clone: + qCDebug(KSCREEN_KDED) << "OSD: clone"; + doApplyConfig(Generator::self()->displaySwitch(Generator::Clone)); + return; + } + + Q_UNREACHABLE(); +} + void KScreenDaemon::applyIdealConfig() { - qCDebug(KSCREEN_KDED) << "Applying ideal config"; - doApplyConfig(Generator::self()->idealConfig(m_monitoredConfig)); + + if (m_monitoredConfig->connectedOutputs().count() < 2) { + KScreen::OsdManager::self()->hideOsd(); + doApplyConfig(Generator::self()->idealConfig(m_monitoredConfig)); + } else { + qCDebug(KSCREEN_KDED) << "Getting ideal config from user via OSD..."; + auto action = KScreen::OsdManager::self()->showActionSelector(); + connect(action, &KScreen::OsdAction::selected, + this, &KScreenDaemon::applyOsdAction); + } } void logConfig(const KScreen::ConfigPtr &config) { @@ -243,15 +285,19 @@ QDBusConnection::sessionBus().asyncCall(msg); } +void KScreenDaemon::showOutputIdentifier() +{ + KScreen::OsdManager::self()->showOutputIdentifiers(); +} + void KScreenDaemon::displayButton() { qCDebug(KSCREEN_KDED) << "displayBtn triggered"; QString message = i18nc("OSD text after XF86Display button press", "No External Display"); if (m_monitoredConfig && m_monitoredConfig->connectedOutputs().count() > 1) { message = i18nc("OSD text after XF86Display button press", "Changing Screen Layout"); } - showOsd(QStringLiteral("preferences-desktop-display-randr"), message); if (m_buttonTimer->isActive()) { qCDebug(KSCREEN_KDED) << "Too fast, cowboy"; @@ -276,6 +322,23 @@ m_iteration = Generator::DisplaySwitchAction(static_cast(m_iteration) + 1); qCDebug(KSCREEN_KDED) << "displayButton: " << m_iteration; + static QHash actionMessages({ + {Generator::DisplaySwitchAction::None, i18nc("osd when displaybutton is pressed", "No Action")}, + {Generator::DisplaySwitchAction::Clone, i18nc("osd when displaybutton is pressed", "Cloned Display")}, + {Generator::DisplaySwitchAction::ExtendToLeft, i18nc("osd when displaybutton is pressed", "Extend Left")}, + {Generator::DisplaySwitchAction::TurnOffEmbedded, i18nc("osd when displaybutton is pressed", "External Only")}, + {Generator::DisplaySwitchAction::TurnOffExternal, i18nc("osd when displaybutton is pressed", "Internal Only")}, + {Generator::DisplaySwitchAction::ExtendToRight, i18nc("osd when displaybutton is pressed", "Extended Right")} + }); + const QString &message = actionMessages.value(m_iteration); + + // We delay the OSD for two seconds and hope that X and hardware are done setting everything up. + QTimer::singleShot(2000, + [message]() { + KScreen::OsdManager::self()->showOsd(QStringLiteral("preferences-desktop-display-randr"), message); + } + ); + doApplyConfig(Generator::self()->displaySwitch(m_iteration)); } @@ -436,5 +499,4 @@ } - #include "daemon.moc" diff --git a/kded/osd.h b/kded/osd.h new file mode 100644 --- /dev/null +++ b/kded/osd.h @@ -0,0 +1,74 @@ +/* + * Copyright 2014 Martin Klapetek + * Copyright 2016 Sebastian Kügler + * + * 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 KSCREEN_OSD_H +#define KSCREEN_OSD_H + +#include +#include +#include + +#include + +#include "osdmanager.h" + +namespace KDeclarative { + class QmlObject; +} + +class QTimer; + +namespace KScreen { + +class Osd : public QObject { + + Q_OBJECT + +public: + Osd(const KScreen::OutputPtr output, QObject *parent = nullptr); + ~Osd() override; + + void showGenericOsd(const QString &icon, const QString &text); + void showOutputIdentifier(const KScreen::OutputPtr output); + void showActionSelector(); + void hideOsd(); + +Q_SIGNALS: + void osdActionSelected(OsdAction::Action action); + +private Q_SLOTS: + void onOsdActionSelected(int action); + void onOutputAvailabilityChanged(); + +private: + bool initOsd(); + void showOsd(); + void updatePosition(); + + KScreen::OutputPtr m_output; + QRect m_outputGeometry; + KDeclarative::QmlObject *m_osdObject = nullptr; + QTimer *m_osdTimer = nullptr; + int m_timeout = 0; + +}; + +} // ns + +#endif // KSCREEN_OSD_H diff --git a/kded/osd.cpp b/kded/osd.cpp new file mode 100644 --- /dev/null +++ b/kded/osd.cpp @@ -0,0 +1,212 @@ +/* + * Copyright 2014 Martin Klapetek + * Copyright 2016 Sebastian Kügler + * + * 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 "osd.h" +#include "utils.h" +#include "kscreen_daemon_debug.h" + +#include + +#include +#include +#include +#include + + +using namespace KScreen; + +Osd::Osd(const KScreen::OutputPtr output, QObject *parent) + : QObject(parent) + , m_output(output) +{ + connect(output.data(), &KScreen::Output::isConnectedChanged, + this, &Osd::onOutputAvailabilityChanged); + connect(output.data(), &KScreen::Output::isEnabledChanged, + this, &Osd::onOutputAvailabilityChanged); + connect(output.data(), &KScreen::Output::currentModeIdChanged, + this, &Osd::updatePosition); + connect(output.data(), &KScreen::Output::destroyed, + this, &Osd::hideOsd); +} + +Osd::~Osd() +{ +} + +bool Osd::initOsd() +{ + if (m_osdObject) { + return true; + } + + const QString &osdPath = QStandardPaths::locate(QStandardPaths::QStandardPaths::GenericDataLocation, QStringLiteral("kded_kscreen/qml/Osd.qml")); + if (osdPath.isEmpty()) { + qCWarning(KSCREEN_KDED) << "Failed to find OSD QML file" << osdPath; + return false; + } + + m_osdObject = new KDeclarative::QmlObject(this); + m_osdObject->setSource(QUrl::fromLocalFile(osdPath)); + + if (m_osdObject->status() != QQmlComponent::Ready) { + qCWarning(KSCREEN_KDED) << "Failed to load OSD QML file" << osdPath; + delete m_osdObject; + m_osdObject = nullptr; + return false; + } + + m_timeout = m_osdObject->rootObject()->property("timeout").toInt(); + m_osdTimer = new QTimer(this); + m_osdTimer->setSingleShot(true); + connect(m_osdTimer, &QTimer::timeout, this, &Osd::hideOsd); + return true; + +} + +void Osd::showGenericOsd(const QString &icon, const QString &text) +{ + if (!initOsd()) { + return; + } + + m_outputGeometry = m_output->geometry(); + auto *rootObject = m_osdObject->rootObject(); + rootObject->setProperty("itemSource", QStringLiteral("OsdItem.qml")); + rootObject->setProperty("infoText", text); + rootObject->setProperty("icon", icon); + + showOsd(); +} + +void Osd::showOutputIdentifier(const KScreen::OutputPtr output) +{ + if (!initOsd()) { + return; + } + + m_outputGeometry = output->geometry(); + + auto *rootObject = m_osdObject->rootObject(); + auto mode = output->currentMode(); + QSize realSize = mode->size(); + if (!output->isHorizontal()) { + realSize.transpose(); + } + rootObject->setProperty("itemSource", QStringLiteral("OutputIdentifier.qml")); + rootObject->setProperty("modeName", Utils::sizeToString(realSize)); + rootObject->setProperty("outputName", Utils::outputName(output)); + showOsd(); +} + +void Osd::showActionSelector() +{ + if (!initOsd()) { + return; + } + + m_outputGeometry = m_output->geometry(); + auto *rootObject = m_osdObject->rootObject(); + rootObject->setProperty("itemSource", QStringLiteral("OsdSelector.qml")); + rootObject->setProperty("timeout", 0); + rootObject->setProperty("outputOnly", false); + auto osdItem = rootObject->property("osdItem").value(); + connect(osdItem, SIGNAL(clicked(int)), + this, SLOT(onOsdActionSelected(int))); + m_timeout = 0; // no timeout for this one + + showOsd(); +} + +void Osd::onOsdActionSelected(int action) +{ + Q_EMIT osdActionSelected(static_cast(action)); + hideOsd(); +} + +void Osd::onOutputAvailabilityChanged() +{ + if (!m_output || !m_output->isConnected() || !m_output->isEnabled() || !m_output->currentMode()) { + hideOsd(); + } +} + +void Osd::updatePosition() +{ + if (!initOsd()) { + return; + } + + const auto geometry = m_output->geometry(); + if (!geometry.isValid()) { + hideOsd(); + } + + auto *rootObject = m_osdObject->rootObject(); + + const int dialogWidth = rootObject->property("width").toInt(); + const int dialogHeight = rootObject->property("height").toInt(); + const int relx = geometry.x(); + const int rely = geometry.y(); + const int pos_x = relx + (geometry.width() - dialogWidth) / 2; + const int pos_y = rely + (geometry.height() - dialogHeight) / 2; + + rootObject->setProperty("x", pos_x); + rootObject->setProperty("y", pos_y); +} + +void Osd::showOsd() +{ + m_osdTimer->stop(); + + auto *rootObject = m_osdObject->rootObject(); + + // only animate on X11, wayland plugin doesn't support this and + // pukes loads of warnings into our logs + if (qGuiApp->platformName() == QLatin1String("xcb")) { + if (rootObject->property("timeout").toInt() > 0) { + rootObject->setProperty("animateOpacity", false); + rootObject->setProperty("opacity", 1); + rootObject->setProperty("visible", true); + rootObject->setProperty("animateOpacity", true); + rootObject->setProperty("opacity", 0); + } else { + rootObject->setProperty("visible", true); + } + } else { + rootObject->setProperty("visible", true); + } + QTimer::singleShot(0, this, &Osd::updatePosition); + if (m_timeout > 0) { + m_osdTimer->start(m_timeout); + } +} + +void Osd::hideOsd() +{ + if (!initOsd()) { + return; + } + + auto *rootObject = m_osdObject->rootObject(); + if (!rootObject) { + return; + } + rootObject->setProperty("visible", false); +} + diff --git a/kded/osdmanager.h b/kded/osdmanager.h new file mode 100644 --- /dev/null +++ b/kded/osdmanager.h @@ -0,0 +1,81 @@ +/* + * Copyright 2016 Sebastian Kügler + * + * 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 OSDM_H +#define OSDM_H + +#include +#include +#include +#include + +class QmlObject; + +namespace KScreen { + +class ConfigOperation; +class Osd; +class Output; + +class OsdAction : public QObject +{ + Q_OBJECT +public: + enum Action { + NoAction, + SwitchToExternal, + SwitchToInternal, + Clone, + ExtendLeft, + ExtendRight + }; + Q_ENUM(Action) + +Q_SIGNALS: + void selected(Action action); + +protected: + explicit OsdAction(QObject *parent = nullptr); +}; + + +class OsdManager : public QObject { + Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "org.kde.kscreen.osdService") + +public: + ~OsdManager() override; + static OsdManager* self(); + +public Q_SLOTS: + void showOutputIdentifiers(); + void showOsd(const QString &icon, const QString &text); + void hideOsd(); + OsdAction *showActionSelector(); + +private: + OsdManager(QObject *parent = nullptr); + void slotIdentifyOutputs(KScreen::ConfigOperation *op); + QMap m_osds; + + static OsdManager* s_instance; + QTimer* m_cleanupTimer; +}; + +} // ns +#endif // OSDM_H diff --git a/kded/osdmanager.cpp b/kded/osdmanager.cpp new file mode 100644 --- /dev/null +++ b/kded/osdmanager.cpp @@ -0,0 +1,221 @@ +/* + * Copyright 2016 Sebastian Kügler + * + * 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 "osdmanager.h" +#include "osd.h" +#include "kscreen_daemon_debug.h" + +#include +#include +#include + +#include + +#include + +namespace KScreen { + +OsdManager* OsdManager::s_instance = nullptr; + +OsdAction::OsdAction(QObject *parent) + : QObject(parent) +{ +} + +class OsdActionImpl : public OsdAction +{ + Q_OBJECT +public: + OsdActionImpl(QObject *parent = nullptr) + : OsdAction(parent) + {} + + void setOsd(Osd *osd) { + connect(osd, &Osd::osdActionSelected, + this, [this](Action action) { + Q_EMIT selected(action); + deleteLater(); + }); + } +}; + +OsdManager::OsdManager(QObject *parent) + : QObject(parent) + , m_cleanupTimer(new QTimer(this)) +{ + qmlRegisterUncreatableType("org.kde.KScreen", 1, 0, "OsdAction", "You cannot create OsdAction"); + + // free up memory when the osd hasn't been used for more than 1 minute + m_cleanupTimer->setInterval(60000); + m_cleanupTimer->setSingleShot(true); + connect(m_cleanupTimer, &QTimer::timeout, this, [this]() { + hideOsd(); + }); + QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kscreen.osdService")); + if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/kde/kscreen/osdService"), this, QDBusConnection::ExportAllSlots)) { + qCWarning(KSCREEN_KDED) << "Failed to registerObject"; + } +} + +void OsdManager::hideOsd() +{ + qDeleteAll(m_osds); + m_osds.clear(); +} + +OsdManager::~OsdManager() +{ +} + +OsdManager* OsdManager::self() +{ + if (!OsdManager::s_instance) { + s_instance = new OsdManager(); + } + return s_instance; +} + +void OsdManager::showOutputIdentifiers() +{ + connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished, + this, &OsdManager::slotIdentifyOutputs); +} + +void OsdManager::slotIdentifyOutputs(KScreen::ConfigOperation *op) +{ + if (op->hasError()) { + return; + } + + const KScreen::ConfigPtr config = qobject_cast(op)->config(); + + Q_FOREACH (const KScreen::OutputPtr &output, config->outputs()) { + if (!output->isConnected() || !output->isEnabled() || !output->currentMode()) { + continue; + } + auto osd = m_osds.value(output->name()); + if (!osd) { + osd = new KScreen::Osd(output, this); + m_osds.insert(output->name(), osd); + } + osd->showOutputIdentifier(output); + } + m_cleanupTimer->start(); +} + +void OsdManager::showOsd(const QString& icon, const QString& text) +{ + qDeleteAll(m_osds); + m_osds.clear(); + connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished, + this, [this, icon, text] (KScreen::ConfigOperation *op) { + if (op->hasError()) { + return; + } + + const KScreen::ConfigPtr config = qobject_cast(op)->config(); + + Q_FOREACH (const KScreen::OutputPtr &output, config->outputs()) { + if (!output->isConnected() || !output->isEnabled() || !output->currentMode()) { + continue; + } + auto osd = m_osds.value(output->name()); + if (!osd) { + osd = new KScreen::Osd(output, this); + m_osds.insert(output->name(), osd); + } + osd->showGenericOsd(icon, text); + } + m_cleanupTimer->start(); + } + ); +} + +OsdAction *OsdManager::showActionSelector() +{ + hideOsd(); + + OsdActionImpl *action = new OsdActionImpl(this); + connect(action, &OsdActionImpl::selected, + this, [this]() { + for (auto osd : qAsConst(m_osds)) { + osd->hideOsd(); + } + }); + connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished, + this, [this, action](const KScreen::ConfigOperation *op) { + if (op->hasError()) { + qCWarning(KSCREEN_KDED) << op->errorString(); + return; + } + + // Show selector on alll enabled screens + const auto outputs = op->config()->outputs(); + KScreen::OutputPtr osdOutput; + for (const auto &output : outputs) { + if (!output->isConnected() || !output->isEnabled() || !output->currentMode()) { + continue; + } + + // Prefer laptop screen + if (output->type() == KScreen::Output::Panel) { + osdOutput = output; + break; + } + + // Fallback to primary + if (output->isPrimary()) { + osdOutput = output; + break; + } + } + // no laptop or primary screen, just take the first usable one + if (!osdOutput) { + for (const auto &output : outputs) { + if (output->isConnected() && output->isEnabled() && output->currentMode()) { + osdOutput = output; + break; + } + } + } + + if (!osdOutput) { + // huh!? + return; + } + + KScreen::Osd* osd = nullptr; + if (m_osds.contains(osdOutput->name())) { + osd = m_osds.value(osdOutput->name()); + } else { + osd = new KScreen::Osd(osdOutput, this); + m_osds.insert(osdOutput->name(), osd); + } + action->setOsd(osd); + osd->showActionSelector(); + m_cleanupTimer->start(); + } + ); + + return action; +} + + +} + +#include "osdmanager.moc" diff --git a/kded/qml/Osd.qml b/kded/qml/Osd.qml new file mode 100644 --- /dev/null +++ b/kded/qml/Osd.qml @@ -0,0 +1,64 @@ +/* + * Copyright 2014 Martin Klapetek + * Copyright 2016 Sebastian Kügler + * + * 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, see . + */ + +import QtQuick 2.0 +import QtQuick.Window 2.2 +import org.kde.plasma.core 2.0 as PlasmaCore + +PlasmaCore.Dialog { + id: root + location: PlasmaCore.Types.Floating + type: PlasmaCore.Dialog.OnScreenDisplay + outputOnly: true + + // OSD Timeout in msecs - how long it will stay on the screen + property int timeout: 5000 + + // Icon name to display + property string icon + property string infoText + property string outputName + property string modeName + property bool animateOpacity: false + property string itemSource + property QtObject osdItem + + Behavior on opacity { + SequentialAnimation { + // prevent press and hold from flickering + PauseAnimation { duration: root.timeout * 0.8 } + + NumberAnimation { + duration: root.timeout * 0.2 + easing.type: Easing.InQuad + } + } + enabled: root.timeout > 0 && root.animateOpacity + } + + mainItem: Loader { + source: itemSource + onItemChanged: { + if (item != undefined) { + item.rootItem = root; + root.osdItem = item + } + } + + } +} diff --git a/kded/qml/OsdItem.qml b/kded/qml/OsdItem.qml new file mode 100644 --- /dev/null +++ b/kded/qml/OsdItem.qml @@ -0,0 +1,56 @@ +/* + * Copyright 2014 Martin Klapetek + * Copyright 2016 Sebastian Kügler + * + * 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, see . + */ + +import QtQuick 2.5 +import QtQuick.Window 2.2 + +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.extras 2.0 as PlasmaExtras + +Item { + property QtObject rootItem + + height: Math.min(units.gridUnit * 15, Screen.desktopAvailableHeight / 5) + width: height + + PlasmaCore.IconItem { + id: icon + height: parent.height - label.height - ((units.smallSpacing/2) * 3) + width: parent.width + source: rootItem.icon + } + + PlasmaExtras.Heading { + id: label + anchors { + bottom: parent.bottom + left: parent.left + right: parent.right + margins: Math.floor(units.smallSpacing / 2) + } + + text: rootItem.infoText + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.WordWrap + maximumLineCount: 2 + elide: Text.ElideLeft + minimumPointSize: theme.defaultFont.pointSize + fontSizeMode: Text.HorizontalFit + } + Component.onCompleted: print("osditem loaded..." + root.infoText); +} diff --git a/kded/qml/OsdSelector.qml b/kded/qml/OsdSelector.qml new file mode 100644 --- /dev/null +++ b/kded/qml/OsdSelector.qml @@ -0,0 +1,116 @@ +/* + * Copyright 2017 Daniel Vrátil + * + * 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, see . + */ + +import QtQuick 2.5 +import QtQuick.Window 2.2 + +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.extras 2.0 as PlasmaExtras + +import org.kde.KScreen 1.0 + +Item { + id: root + property QtObject rootItem + + signal clicked(int actionId) + + height: Math.min(units.gridUnit * 15, Screen.desktopAvailableHeight / 5) + width: buttonRow.width + + PlasmaComponents.ButtonRow { + id: buttonRow + + exclusive: false + + height: parent.height - label.height - ((units.smallSpacing/2) * 3) + width: (actionRepeater.count * height) + ((actionRepeater.count - 1) * buttonRow.spacing); + + Repeater { + id: actionRepeater + model: [ + { + iconSource: "osd-shutd-laptop", + label: i18n("Switch to external screen"), + action: OsdAction.SwitchToExternal + }, + { + iconSource: "osd-shutd-screen", + label: i18n("Switch to laptop screen"), + action: OsdAction.SwitchToInternal + }, + { + iconSource: "osd-duplicate", + label: i18n("Unify outputs"), + action: OsdAction.Clonse + }, + { + iconSource: "osd-sbs-left", + label: i18n("Extend to left"), + action: OsdAction.ExtendLeft + }, + { + iconSource: "osd-sbs-sright", + label: i18n("Extend to right"), + action: OsdAction.ExtendRight + }, + { + iconSource: "dialog-cancel", + label: i18n("Leave unchanged"), + action: OsdAction.NoAction + } + ] + delegate: PlasmaComponents.Button { + PlasmaCore.IconItem { + source: modelData.iconSource + height: buttonRow.height - ((units.smallSpacing / 2) * 3) + width: height + anchors.centerIn: parent + } + height: parent.height + width: height + + onHoveredChanged: rootItem.infoText = (hovered ? modelData.label : "") + + onClicked: root.clicked(modelData.action) + } + } + } + + // TODO: keep? remove? + PlasmaExtras.Heading { + id: label + anchors { + bottom: parent.bottom + left: parent.left + right: parent.right + margins: Math.floor(units.smallSpacing / 2) + } + + text: rootItem.infoText + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.WordWrap + maximumLineCount: 2 + elide: Text.ElideLeft + minimumPointSize: theme.defaultFont.pointSize + fontSizeMode: Text.HorizontalFit + } + + Component.onCompleted: print("OsdSelector loaded..."); +} + diff --git a/kded/qml/OutputIdentifier.qml b/kded/qml/OutputIdentifier.qml new file mode 100644 --- /dev/null +++ b/kded/qml/OutputIdentifier.qml @@ -0,0 +1,57 @@ +/* + * Copyright 2016 Sebastian Kügler + * + * 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, see . + */ + +import QtQuick 2.5 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 + +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.components 2.0 as PlasmaComponents + +ColumnLayout { + + property QtObject rootItem + + property string outputName: rootItem ? rootItem.outputName : "" + property string modeName: rootItem ? rootItem.modeName : "" + + PlasmaComponents.Label { + id: displayName + + Layout.maximumWidth: Screen.width * 0.8 + Layout.maximumHeight: Screen.height * 0.8 + Layout.margins: units.largeSpacing + Layout.bottomMargin: units.smallSpacing + + text: root.outputName + font.pointSize: theme.defaultFont.pointSize * 3 + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.WordWrap + maximumLineCount: 2 + elide: Text.ElideLeft + } + + PlasmaComponents.Label { + id: modeLabel; + + Layout.fillWidth: true + Layout.bottomMargin: units.largeSpacing + + text: root.modeName; + horizontalAlignment: Text.AlignHCenter; + } +} diff --git a/kded/serializer.cpp b/kded/serializer.cpp --- a/kded/serializer.cpp +++ b/kded/serializer.cpp @@ -256,6 +256,7 @@ output->setPrimary(info[QStringLiteral("primary")].toBool()); output->setEnabled(info[QStringLiteral("enabled")].toBool()); output->setRotation(static_cast(info[QStringLiteral("rotation")].toInt())); + output->setScale(info.value(QStringLiteral("scale"), 1).toInt()); const QVariantMap modeInfo = info[QStringLiteral("mode")].toMap(); const QVariantMap modeSize = modeInfo[QStringLiteral("size")].toMap(); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(kded) \ No newline at end of file +add_subdirectory(kded) +add_subdirectory(osd) diff --git a/tests/osd/CMakeLists.txt b/tests/osd/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/tests/osd/CMakeLists.txt @@ -0,0 +1,23 @@ +include_directories( + ${CMAKE_SOURCE_DIR}/kcm/src + ${CMAKE_BINARY_DIR}/kded +) + +add_executable(osdtest main.cpp + osdtest.cpp + ../../kded/osd.cpp + ../../kded/osdmanager.cpp + ../../kcm/src/utils.cpp +) + +target_link_libraries(osdtest Qt5::Core + Qt5::DBus + Qt5::Quick + Qt5::Qml + KF5::Screen + KF5::I18n + KF5::Declarative +) + +add_test(kscreen-kded-osdtest osdtest) +ecm_mark_as_test(osdtest) diff --git a/tests/osd/main.cpp b/tests/osd/main.cpp new file mode 100644 --- /dev/null +++ b/tests/osd/main.cpp @@ -0,0 +1,64 @@ +/************************************************************************************* + * Copyright 2014-2016 by Sebastian Kügler * + * * + * 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 "osdtest.h" + +#include +#include + +int main(int argc, char **argv) +{ + QGuiApplication app(argc, argv); + + QCommandLineOption dbus = QCommandLineOption(QStringList() << QStringLiteral("d") << "dbus", + QStringLiteral("Call over dbus")); + QCommandLineOption outputid = QCommandLineOption(QStringList() << QStringLiteral("o") << "outputidentifiers", + QStringLiteral("Show output identifier")); + QCommandLineOption icon = QCommandLineOption(QStringList() << QStringLiteral("i") << "icon", + QStringLiteral("Icon to use for OSD"), QStringLiteral("preferences-desktop-display-randr")); + QCommandLineOption message = QCommandLineOption(QStringList() << QStringLiteral("m") << "message", + QStringLiteral("Icon to use for OSD"), QStringLiteral("OSD Test")); + QCommandLineOption selector = QCommandLineOption({ QStringLiteral("s"), QStringLiteral("selector") }, + QStringLiteral("Show new screen action selector")); + KScreen::OsdTest osdtest; + QCommandLineParser parser; + parser.addHelpOption(); + parser.addOption(dbus); + parser.addOption(outputid); + parser.addOption(icon); + parser.addOption(message); + parser.addOption(selector); + parser.process(app); + + + + if (parser.isSet(dbus)) { + osdtest.setUseDBus(true); + } + if (parser.isSet(outputid)) { + osdtest.showOutputIdentifiers(); + } else if (parser.isSet(selector)) { + osdtest.showActionSelector(); + } else { + osdtest.showGenericOsd(parser.value(icon), parser.value(message)); + } + if (parser.isSet(outputid)) { + } + + return app.exec(); +} diff --git a/tests/osd/osdtest.h b/tests/osd/osdtest.h new file mode 100644 --- /dev/null +++ b/tests/osd/osdtest.h @@ -0,0 +1,48 @@ +/************************************************************************************* + * Copyright 2016 Sebastian Kügler * + * * + * 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, write to the Free Software * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * + *************************************************************************************/ + +#ifndef KSCREEN_OSDTEST_H +#define KSCREEN_OSDTEST_H + +#include + + +namespace KScreen +{ + +class OsdTest : public QObject +{ + Q_OBJECT + +public: + explicit OsdTest(QObject *parent = nullptr); + virtual ~OsdTest(); + + void setUseDBus(bool yesno); + + void showGenericOsd(const QString &icon, const QString &message); + void showOutputIdentifiers(); + void showActionSelector(); + +private: + bool m_useDBus = false; +}; + +} // namespace + +#endif // KSCREEN_OSDTEST_H diff --git a/tests/osd/osdtest.cpp b/tests/osd/osdtest.cpp new file mode 100644 --- /dev/null +++ b/tests/osd/osdtest.cpp @@ -0,0 +1,93 @@ +/************************************************************************************* + * Copyright 2016 Sebastian Kügler * + * * + * 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, write to the Free Software * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * + *************************************************************************************/ + +#include "osdtest.h" +#include "../../kded/osdmanager.h" + +#include +#include +#include +#include +#include + +Q_LOGGING_CATEGORY(KSCREEN_KDED, "kscreen.kded") + +namespace KScreen { +OsdTest::OsdTest(QObject *parent) + : QObject(parent) +{ +} + +OsdTest::~OsdTest() +{ +} + +void OsdTest::showOutputIdentifiers() +{ + if (!m_useDBus) { + QTimer::singleShot(5500, qApp, &QCoreApplication::quit); + KScreen::OsdManager::self()->showOutputIdentifiers(); + } else { + QDBusMessage msg = QDBusMessage::createMethodCall( + QLatin1Literal("org.kde.kscreen.osdService"), + QLatin1Literal("/org/kde/kscreen/osdService"), + QLatin1Literal("org.kde.kscreen.osdService"), + QLatin1Literal("showOutputIdentifiers") + ); + //msg << icon << text; + QDBusConnection::sessionBus().asyncCall(msg); + + qCWarning(KSCREEN_KDED) << "Sent dbus message."; + QTimer::singleShot(500, qApp, &QCoreApplication::quit); + } +} + + +void OsdTest::setUseDBus(bool yesno) +{ + m_useDBus = yesno; +} + +void OsdTest::showGenericOsd(const QString& icon, const QString& message) +{ + if (!m_useDBus) { + QTimer::singleShot(5500, qApp, &QCoreApplication::quit); + KScreen::OsdManager::self()->showOsd(!icon.isEmpty() ? icon : QStringLiteral("preferences-desktop-display-randr"), + !message.isEmpty() ? message : QStringLiteral("On-Screen-Display")); + } else { + qCWarning(KSCREEN_KDED) << "Implement me."; + QTimer::singleShot(100, qApp, &QCoreApplication::quit); + } +} + +void OsdTest::showActionSelector() +{ + if (!m_useDBus) { + auto action = KScreen::OsdManager::self()->showActionSelector(); + connect(action, &KScreen::OsdAction::selected, + [](KScreen::OsdAction::Action action) { + qCDebug(KSCREEN_KDED) << "Selected action:" << action; + qApp->quit(); + }); + } else { + qCWarning(KSCREEN_KDED) << "Implement me."; + QTimer::singleShot(100, qApp, &QCoreApplication::quit); + } +} + +} // ns