Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: delay the lock action too from contextmenu containments action

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-20 00:51:14 +03:00
parent b12438f7a6
commit ca07409ebc
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
plasma/containmentactions/contextmenu/menu.cpp
View file

@ -37,6 +37,19 @@
#include "kworkspace/kworkspace.h"
#include "screensaver_interface.h"
// this short delay is due to two issues:
// a) KWorkSpace's DBus alls are all syncronous
// b) the destrution of the menu that this action is in is delayed
//
// (a) leads to the menu hanging out where everyone can see it because the even loop doesn't get
// returned to allowing it to close.
//
// (b) leads to a 0ms timer not working since a 0ms timer just appends to the event queue, and then
// the menu closing event gets appended to that.
//
// ergo a timer with small timeout
static const int s_actiondelay = 10; // ms
ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
: Plasma::ContainmentActions(parent, args),
@ -49,10 +62,6 @@ ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
{
}
ContextMenu::~ContextMenu()
{
}
void ContextMenu::init(const KConfigGroup &config)
{
Plasma::Containment *c = containment();
@ -91,7 +100,7 @@ void ContextMenu::init(const KConfigGroup &config)
} else if (!m_lockScreenAction) {
m_lockScreenAction = new QAction(i18n("Lock Screen"), this);
m_lockScreenAction->setIcon(KIcon("system-lock-screen"));
connect(m_lockScreenAction, SIGNAL(triggered(bool)), this, SLOT(lockScreen()));
connect(m_lockScreenAction, SIGNAL(triggered(bool)), this, SLOT(startLockScreen()));
m_logoutAction = new QAction(i18n("Leave..."), this);
m_logoutAction->setIcon(KIcon("system-shutdown"));
@ -168,11 +177,15 @@ QAction *ContextMenu::action(const QString &name)
return 0;
}
void ContextMenu::startLockScreen()
{
QTimer::singleShot(s_actiondelay, this, SLOT(lockScreen()));
}
void ContextMenu::lockScreen()
{
QString interface("org.freedesktop.ScreenSaver");
org::freedesktop::ScreenSaver screensaver(interface, "/ScreenSaver",
QDBusConnection::sessionBus());
org::freedesktop::ScreenSaver screensaver(interface, "/ScreenSaver", QDBusConnection::sessionBus());
if (screensaver.isValid()) {
screensaver.Lock();
}
@ -180,18 +193,7 @@ void ContextMenu::lockScreen()
void ContextMenu::startLogout()
{
// this short delay is due to two issues:
// a) KWorkSpace's DBus alls are all syncronous
// b) the destrution of the menu that this action is in is delayed
//
// (a) leads to the menu hanging out where everyone can see it because
// the even loop doesn't get returned to allowing it to close.
//
// (b) leads to a 0ms timer not working since a 0ms timer just appends to
// the event queue, and then the menu closing event gets appended to that.
//
// ergo a timer with small timeout
QTimer::singleShot(10, this, SLOT(logout()));
QTimer::singleShot(s_actiondelay, this, SLOT(logout()));
}
void ContextMenu::logout()

2
plasma/containmentactions/contextmenu/menu.h
View file

@ -28,7 +28,6 @@ class ContextMenu : public Plasma::ContainmentActions
Q_OBJECT
public:
ContextMenu(QObject* parent, const QVariantList& args);
~ContextMenu();
void init(const KConfigGroup&);
@ -41,6 +40,7 @@ public:
void save(KConfigGroup &config);
public slots:
void startLockScreen();
void lockScreen();
void startLogout();
void logout();