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

Backport

Browse Source 
BUG:180272

svn path=/branches/KDE/4.2/kdelibs/; revision=910419
This commit is contained in:
Beat Wolf 2009-01-13 11:28:56 +00:00
parent e4171154f9
commit 5f71a0228b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
containment.cpp
View File

@ -539,11 +539,26 @@ void ContainmentPrivate::appletActions(KMenu &desktopMenu, Applet *applet, bool
KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu); KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu);
containmentActions(*containmentMenu); containmentActions(*containmentMenu);
if (!containmentMenu->isEmpty()) { if (!containmentMenu->isEmpty()) {
if (!desktopMenu.isEmpty()) { int enabled = 0;
//count number of real actions
foreach(QAction *action, containmentMenu->actions()) {
if(action->isEnabled() && !action->isSeparator()) {
enabled++;
}
}
if (enabled > 0) {
desktopMenu.addSeparator(); desktopMenu.addSeparator();
} }
desktopMenu.addMenu(containmentMenu); //if there is only one, don't create a submenu
if(enabled < 2) {
foreach(QAction *action, containmentMenu->actions()) {
desktopMenu.addAction(action);
}
} else {
desktopMenu.addMenu(containmentMenu);
}
} }
if (static_cast<Corona*>(q->scene())->immutability() == Mutable) { if (static_cast<Corona*>(q->scene())->immutability() == Mutable) {