don't make a submenu if there are no items in the top menu

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=778473
This commit is contained in:
Aaron J. Seigo 2008-02-23 18:02:42 +00:00
parent 2b68bb49ee
commit 4b193edf0e

View File

@ -267,17 +267,17 @@ void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent* event)
hasEntries = true;
}
actions = contextActions();
if (actions.count() > 0) {
QList<QAction*> containmentActions = contextActions();
if (containmentActions.count() > 0) {
hasEntries = true;
QMenu *containmentActionMenu = &desktopMenu;
if (actions.count() > 2) {
if (actions.count() > 0 && containmentActions.count() > 2) {
containmentActionMenu = new KMenu(i18n("%1 Options", name()), &desktopMenu);
desktopMenu.addMenu(containmentActionMenu);
}
foreach(QAction* action, actions) {
foreach(QAction* action, containmentActions) {
containmentActionMenu->addAction(action);
}
}