yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin] Use KGlobalAccel to register global shortcuts from scripts

Browse source 
This was not yet ported functionality. In addition the usage of
KActionCollection is removed as it's not needed - all it was used
for is setting the object name.
This commit is contained in:
Martin Gräßlin 2013-12-10 09:09:35 +01:00
parent 1e3a6e54ee
commit abdb1937b1
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripting/scriptingutils.h
View file

@ -26,9 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "screenedge.h"
#endif
#include <KDE/KAction>
#include <KDE/KActionCollection>
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <QAction>
#include <QDebug>
#include <QtScript/QScriptEngine>
@ -114,12 +114,10 @@ QScriptValue globalShortcut(QScriptContext *context, QScriptEngine *engine)
qDebug() << "Incorrect number of arguments! Expected: title, text, keySequence, callback";
return engine->undefinedValue();
}
KActionCollection* actionCollection = new KActionCollection(script);
QAction* a = actionCollection->addAction(context->argument(0).toString());
QAction* a = new QAction(script);
a->setObjectName(context->argument(0).toString());
a->setText(context->argument(1).toString());
#if KWIN_QT5_PORTING
a->setGlobalShortcut(KShortcut(context->argument(2).toString()));
#endif
KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << QKeySequence(context->argument(2).toString()));
script->registerShortcut(a, context->argument(3));
return engine->newVariant(true);
}