From 815c7c25a0035db76122b35eb59ec3fa2194322e Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Mon, 27 Apr 2009 17:30:33 +0000 Subject: [PATCH] make the context menus in the taskbar and the window manager consistent again; put Advanced at the bottom of the list since it is, well, advanced, implying that the other options are more common BUG:190823 svn path=/trunk/KDE/kdebase/workspace/; revision=959979 --- useractions.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/useractions.cpp b/useractions.cpp index 170a004e3f..ad1ee7b4a9 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -116,9 +116,6 @@ QMenu* Workspace::clientPopup() action->setIcon( KIcon( "wizard" ) ); action->setData( Options::ApplicationRulesOp ); - action = popup->addMenu( advanced_popup ); - action->setText( i18n("Ad&vanced") ); - trans_popup = 0; if (compositing()){ trans_popup = new QMenu( popup ); @@ -170,6 +167,9 @@ QMenu* Workspace::clientPopup() mShadeOpAction->setCheckable( true ); mShadeOpAction->setData( Options::ShadeOp ); + action = popup->addMenu( advanced_popup ); + action->setText( i18n("Ad&vanced") ); + popup->addSeparator(); if (!KGlobal::config()->isImmutable() && @@ -266,7 +266,7 @@ void Workspace::initDesktopPopup() this, SLOT( desktopPopupAboutToShow() ) ); QAction *action = desk_popup->menuAction(); - popup->insertAction(advanced_popup->menuAction(), action); + popup->insertAction(mMoveOpAction, action); action->setText( i18n("To &Desktop") ); }