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

Add KAcceleratorManager

Browse Source 
This way containment context menus and PlasmaComponents Menu get accelerators assigned to by default.

CHANGELOG: Most (context) menus have accelerators (Alt+letter shortcuts) now

BUG: 361915

Differential Revision: https://phabricator.kde.org/D5057
This commit is contained in:
Kai Uwe Broulik 2017-03-16 11:47:42 +01:00
parent 76af5399dd
commit ff78b9e531
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/declarativeimports/plasmacomponents/CMakeLists.txt
View File

@ -16,6 +16,7 @@ target_link_libraries(plasmacomponentsplugin
Qt5::Quick Qt5::Quick
Qt5::Qml Qt5::Qml
Qt5::Gui Qt5::Gui
KF5::WidgetsAddons # for KAcceleratorManager
KF5::Declarative KF5::Declarative
KF5::Plasma KF5::Plasma
KF5::IconThemes KF5::IconThemes

3
src/declarativeimports/plasmacomponents/qmenu.cpp
View File

@ -25,6 +25,8 @@
#include <QQuickItem> #include <QQuickItem>
#include <QScreen> #include <QScreen>
#include <KAcceleratorManager>
#include "plasmacomponentsplugin.h" #include "plasmacomponentsplugin.h"
QMenuProxy::QMenuProxy(QObject *parent) QMenuProxy::QMenuProxy(QObject *parent)
: QObject(parent), : QObject(parent),
@ -34,6 +36,7 @@ QMenuProxy::QMenuProxy(QObject *parent)
{ {
if (qobject_cast<QApplication *>(QCoreApplication::instance())) { if (qobject_cast<QApplication *>(QCoreApplication::instance())) {
m_menu = new QMenu(0); m_menu = new QMenu(0);
KAcceleratorManager::manage(m_menu);
connect(m_menu, &QMenu::triggered, this, &QMenuProxy::itemTriggered); connect(m_menu, &QMenu::triggered, this, &QMenuProxy::itemTriggered);
connect(m_menu, &QMenu::aboutToHide, [ = ]() { connect(m_menu, &QMenu::aboutToHide, [ = ]() {
m_status = DialogStatus::Closed; m_status = DialogStatus::Closed;

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

@ -29,6 +29,7 @@
#include <QMimeData> #include <QMimeData>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <KAcceleratorManager>
#include <kauthorized.h> #include <kauthorized.h>
#include <QDebug> #include <QDebug>
#include <klocalizedstring.h> #include <klocalizedstring.h>
@ -1017,6 +1018,8 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
return; return;
} }
KAcceleratorManager::manage(desktopMenu);
desktopMenu->popup(pos); desktopMenu->popup(pos);
event->setAccepted(true); event->setAccepted(true);
} }