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

action order nearer to menu

Browse Source 
still catalog actions by type
the order is still not exactly the same, but that's not possible, since the action order is decided in the context menu plugin and there are some actions only in the toolbox

CCBUG:338585
This commit is contained in:
Marco Martin 2014-08-29 13:24:17 +02:00
parent d8b2ef147f
commit 727755d28a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,13 +638,17 @@ QList<QObject *> ContainmentInterface::actions() const
//use a multimap to sort by action type
QMultiMap<int, QObject *> actions;
int i = 0;
foreach (QAction *a, m_containment->actions()->actions()) {
//FIXME QML visualizations don't support menus for now, *and* there is no way to
//distinguish them on QML side
if (!a->menu()) {
actions.insert(a->data().toInt(), a);
actions.insert(a->data().toInt()*100 + i, a);
++i;
}
}
i = 0;
foreach (QAction *a, m_containment->corona()->actions()->actions()) {
if (a->objectName() == QStringLiteral("lock widgets") || a->menu()) {
//It is up to the Containment to decide if the user is allowed or not
@ -653,7 +657,8 @@ QList<QObject *> ContainmentInterface::actions() const
//one
continue;
}
actions.insert(a->data().toInt(), a);
actions.insert(a->data().toInt()*100 + i, a);
++i;
}
return actions.values();
}