scripting: Rename ScreenEdgeItem to ScreenEdgeHandler
ScreenEdgeItem is not an item, so rename it to something else. "Handler" is inspired by QtQuick, e.g. TapHandler.
This commit is contained in:
parent
5942c13eba
commit
70a063a34c
5 changed files with 23 additions and 23 deletions
|
@ -1,9 +1,9 @@
|
||||||
import QtQuick 2.0;
|
import QtQuick 2.0;
|
||||||
import org.kde.kwin 3.0;
|
import org.kde.kwin 3.0;
|
||||||
|
|
||||||
ScreenEdgeItem {
|
ScreenEdgeHandler {
|
||||||
edge: ScreenEdgeItem.LeftEdge
|
edge: ScreenEdgeHandler.LeftEdge
|
||||||
mode: ScreenEdgeItem.Touch
|
mode: ScreenEdgeHandler.Touch
|
||||||
onActivated: {
|
onActivated: {
|
||||||
Workspace.slotToggleShowDesktop();
|
Workspace.slotToggleShowDesktop();
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,7 +139,7 @@ target_sources(kwin PRIVATE
|
||||||
screenedge.cpp
|
screenedge.cpp
|
||||||
scripting/dbuscall.cpp
|
scripting/dbuscall.cpp
|
||||||
scripting/desktopbackgrounditem.cpp
|
scripting/desktopbackgrounditem.cpp
|
||||||
scripting/screenedgeitem.cpp
|
scripting/screenedgehandler.cpp
|
||||||
scripting/scriptedeffect.cpp
|
scripting/scriptedeffect.cpp
|
||||||
scripting/scripting.cpp
|
scripting/scripting.cpp
|
||||||
scripting/scripting_logging.cpp
|
scripting/scripting_logging.cpp
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
#include "screenedgeitem.h"
|
#include "screenedgehandler.h"
|
||||||
|
|
||||||
#include <config-kwin.h>
|
#include <config-kwin.h>
|
||||||
|
|
||||||
|
@ -18,20 +18,20 @@
|
||||||
namespace KWin
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
ScreenEdgeItem::ScreenEdgeItem(QObject *parent)
|
ScreenEdgeHandler::ScreenEdgeHandler(QObject *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
, m_enabled(true)
|
, m_enabled(true)
|
||||||
, m_edge(NoEdge)
|
, m_edge(NoEdge)
|
||||||
, m_action(new QAction(this))
|
, m_action(new QAction(this))
|
||||||
{
|
{
|
||||||
connect(m_action, &QAction::triggered, this, &ScreenEdgeItem::activated);
|
connect(m_action, &QAction::triggered, this, &ScreenEdgeHandler::activated);
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenEdgeItem::~ScreenEdgeItem()
|
ScreenEdgeHandler::~ScreenEdgeHandler()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEdgeItem::setEnabled(bool enabled)
|
void ScreenEdgeHandler::setEnabled(bool enabled)
|
||||||
{
|
{
|
||||||
if (m_enabled == enabled) {
|
if (m_enabled == enabled) {
|
||||||
return;
|
return;
|
||||||
|
@ -42,7 +42,7 @@ void ScreenEdgeItem::setEnabled(bool enabled)
|
||||||
Q_EMIT enabledChanged();
|
Q_EMIT enabledChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEdgeItem::setEdge(Edge edge)
|
void ScreenEdgeHandler::setEdge(Edge edge)
|
||||||
{
|
{
|
||||||
if (m_edge == edge) {
|
if (m_edge == edge) {
|
||||||
return;
|
return;
|
||||||
|
@ -53,7 +53,7 @@ void ScreenEdgeItem::setEdge(Edge edge)
|
||||||
Q_EMIT edgeChanged();
|
Q_EMIT edgeChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEdgeItem::enableEdge()
|
void ScreenEdgeHandler::enableEdge()
|
||||||
{
|
{
|
||||||
if (!m_enabled || m_edge == NoEdge) {
|
if (!m_enabled || m_edge == NoEdge) {
|
||||||
return;
|
return;
|
||||||
|
@ -70,7 +70,7 @@ void ScreenEdgeItem::enableEdge()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEdgeItem::disableEdge()
|
void ScreenEdgeHandler::disableEdge()
|
||||||
{
|
{
|
||||||
if (!m_enabled || m_edge == NoEdge) {
|
if (!m_enabled || m_edge == NoEdge) {
|
||||||
return;
|
return;
|
||||||
|
@ -87,7 +87,7 @@ void ScreenEdgeItem::disableEdge()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ScreenEdgeItem::borderActivated(ElectricBorder edge)
|
bool ScreenEdgeHandler::borderActivated(ElectricBorder edge)
|
||||||
{
|
{
|
||||||
if (edge != static_cast<ElectricBorder>(m_edge) || !m_enabled) {
|
if (edge != static_cast<ElectricBorder>(m_edge) || !m_enabled) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -96,7 +96,7 @@ bool ScreenEdgeItem::borderActivated(ElectricBorder edge)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEdgeItem::setMode(Mode mode)
|
void ScreenEdgeHandler::setMode(Mode mode)
|
||||||
{
|
{
|
||||||
if (m_mode == mode) {
|
if (m_mode == mode) {
|
||||||
return;
|
return;
|
|
@ -25,13 +25,13 @@ namespace KWin
|
||||||
*
|
*
|
||||||
* Example usage:
|
* Example usage:
|
||||||
* @code
|
* @code
|
||||||
* ScreenEdgeItem {
|
* ScreenEdgeHandler {
|
||||||
* edge: ScreenEdgeItem.LeftEdge
|
* edge: ScreenEdgeHandler.LeftEdge
|
||||||
* onActivated: doSomething()
|
* onActivated: doSomething()
|
||||||
* }
|
* }
|
||||||
* @endcode
|
* @endcode
|
||||||
*/
|
*/
|
||||||
class ScreenEdgeItem : public QObject
|
class ScreenEdgeHandler : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
/**
|
/**
|
||||||
|
@ -68,8 +68,8 @@ public:
|
||||||
Touch
|
Touch
|
||||||
};
|
};
|
||||||
Q_ENUM(Mode)
|
Q_ENUM(Mode)
|
||||||
explicit ScreenEdgeItem(QObject *parent = nullptr);
|
explicit ScreenEdgeHandler(QObject *parent = nullptr);
|
||||||
~ScreenEdgeItem() override;
|
~ScreenEdgeHandler() override;
|
||||||
bool isEnabled() const;
|
bool isEnabled() const;
|
||||||
Edge edge() const;
|
Edge edge() const;
|
||||||
Mode mode() const
|
Mode mode() const
|
||||||
|
@ -101,12 +101,12 @@ private:
|
||||||
QAction *m_action;
|
QAction *m_action;
|
||||||
};
|
};
|
||||||
|
|
||||||
inline bool ScreenEdgeItem::isEnabled() const
|
inline bool ScreenEdgeHandler::isEnabled() const
|
||||||
{
|
{
|
||||||
return m_enabled;
|
return m_enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline ScreenEdgeItem::Edge ScreenEdgeItem::edge() const
|
inline ScreenEdgeHandler::Edge ScreenEdgeHandler::edge() const
|
||||||
{
|
{
|
||||||
return m_edge;
|
return m_edge;
|
||||||
}
|
}
|
|
@ -14,7 +14,7 @@
|
||||||
#include "dbuscall.h"
|
#include "dbuscall.h"
|
||||||
#include "desktopbackgrounditem.h"
|
#include "desktopbackgrounditem.h"
|
||||||
#include "kwinquickeffect.h"
|
#include "kwinquickeffect.h"
|
||||||
#include "screenedgeitem.h"
|
#include "screenedgehandler.h"
|
||||||
#include "scripting_logging.h"
|
#include "scripting_logging.h"
|
||||||
#include "scriptingutils.h"
|
#include "scriptingutils.h"
|
||||||
#include "virtualdesktopmodel.h"
|
#include "virtualdesktopmodel.h"
|
||||||
|
@ -676,7 +676,7 @@ void KWin::Scripting::init()
|
||||||
qmlRegisterType<DesktopBackgroundItem>("org.kde.kwin", 3, 0, "DesktopBackground");
|
qmlRegisterType<DesktopBackgroundItem>("org.kde.kwin", 3, 0, "DesktopBackground");
|
||||||
qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnail");
|
qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnail");
|
||||||
qmlRegisterType<DBusCall>("org.kde.kwin", 3, 0, "DBusCall");
|
qmlRegisterType<DBusCall>("org.kde.kwin", 3, 0, "DBusCall");
|
||||||
qmlRegisterType<ScreenEdgeItem>("org.kde.kwin", 3, 0, "ScreenEdgeItem");
|
qmlRegisterType<ScreenEdgeHandler>("org.kde.kwin", 3, 0, "ScreenEdgeHandler");
|
||||||
qmlRegisterType<WindowModel>("org.kde.kwin", 3, 0, "WindowModel");
|
qmlRegisterType<WindowModel>("org.kde.kwin", 3, 0, "WindowModel");
|
||||||
qmlRegisterType<WindowFilterModel>("org.kde.kwin", 3, 0, "WindowFilterModel");
|
qmlRegisterType<WindowFilterModel>("org.kde.kwin", 3, 0, "WindowFilterModel");
|
||||||
qmlRegisterType<VirtualDesktopModel>("org.kde.kwin", 3, 0, "VirtualDesktopModel");
|
qmlRegisterType<VirtualDesktopModel>("org.kde.kwin", 3, 0, "VirtualDesktopModel");
|
||||||
|
|
Loading…
Reference in a new issue