alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move contextualActionsAboutToShow to Applet

Browse Source 
Applet contains the menu actions, therefore reloading the menu should
happen in Applet not AppletInterface. With AppletInterface being a dumb
wrapper.

This exposes functionality to anyone who overrides Applet, but also will
also allows system tray to emit this signal without having to use
private API.

Change-Id: I95e65de315744a78a82ebba2a954e4f3ae1bd7b2
REVIEW: 127217
This commit is contained in:
David Edmundson 2016-02-29 11:59:10 +00:00
parent e1e58332e7
commit 88ec6de113
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasma/applet.h
View File

@ -426,6 +426,13 @@ Q_SIGNALS:
void userConfiguringChanged(bool configuring); void userConfiguringChanged(bool configuring);
//ACTIONS //ACTIONS
/**
* Emitted just before the contextual actions are about to show
* For instance just before the context menu containing the actions
* added with setAction() is shown
*/
void contextualActionsAboutToShow();
/** /**
* Emitted when activation is requested due to, for example, a global * Emitted when activation is requested due to, for example, a global
* keyboard shortcut. By default the wiget is given focus. * keyboard shortcut. By default the wiget is given focus.

3
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -71,6 +71,9 @@ AppletInterface::AppletInterface(DeclarativeAppletScript *script, const QVariant
connect(applet(), &Plasma::Applet::userConfiguringChanged, connect(applet(), &Plasma::Applet::userConfiguringChanged,
this, &AppletInterface::userConfiguringChanged); this, &AppletInterface::userConfiguringChanged);
connect(applet(), &Plasma::Applet::contextualActionsAboutToShow,
this, &AppletInterface::contextualActionsAboutToShow);
connect(applet(), &Plasma::Applet::statusChanged, connect(applet(), &Plasma::Applet::statusChanged,
this, &AppletInterface::statusChanged); this, &AppletInterface::statusChanged);

4
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -924,7 +924,6 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
if (AppletInterface *ai = qobject_cast<AppletInterface *>(appletObject)) { if (AppletInterface *ai = qobject_cast<AppletInterface *>(appletObject)) {
if (ai->isVisible() && ai->contains(ai->mapFromItem(this, event->posF()))) { if (ai->isVisible() && ai->contains(ai->mapFromItem(this, event->posF()))) {
applet = ai->applet(); applet = ai->applet();
emit ai->contextualActionsAboutToShow();
break; break;
} else { } else {
ai = 0; ai = 0;
@ -938,9 +937,10 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
m_contextMenu = &desktopMenu; m_contextMenu = &desktopMenu;
if (applet) { if (applet) {
emit applet->contextualActionsAboutToShow();
addAppletActions(desktopMenu, applet, event); addAppletActions(desktopMenu, applet, event);
} else { } else {
emit contextualActionsAboutToShow(); emit m_containment->contextualActionsAboutToShow();
addContainmentActions(desktopMenu, event); addContainmentActions(desktopMenu, event);
} }