From 4b7ee9928d6f70370cf4f149a6fb4863f8e4e0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 15 Mar 2012 12:13:51 +0100 Subject: [PATCH] Rename "Configure Window Behavior" to "Window Manager Settings" The context menu entry to "Configure Window Behavior" opens the configuration of the window manager and not about the window. In the past the shown configuration dialog only contained entries affecting the window behavior but that is no longer true for the complete KDE 4.x series since Desktop Effects had been added to the menu. This change in naming reflects the situation and should help to remove confusion. At the same time the entry is moved into the advanced section. FEATURE: 249486 FIXED-IN: 4.9.0 REVIEW: 104284 --- useractions.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/useractions.cpp b/useractions.cpp index dfb6fd4174..4a06f5a30b 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -123,6 +123,14 @@ QMenu* Workspace::clientPopup() action = advanced_popup->addAction(i18n("S&pecial Application Settings...")); action->setIcon(KIcon("preferences-system-windows-actions")); action->setData(Options::ApplicationRulesOp); + if (!KGlobal::config()->isImmutable() && + !KAuthorized::authorizeControlModules(Workspace::configModules(true)).isEmpty()) { + advanced_popup->addSeparator(); + action = advanced_popup->addAction(i18nc("Entry in context menu of window decoration to open the configuration module of KWin", + "Window &Manager Settings...")); + action->setIcon(KIcon("configure")); + connect(action, SIGNAL(triggered()), this, SLOT(configureWM())); + } mMoveOpAction = popup->addAction(i18n("&Move")); mMoveOpAction->setIcon(KIcon("transform-move")); @@ -199,14 +207,6 @@ QMenu* Workspace::clientPopup() popup->addSeparator(); - if (!KGlobal::config()->isImmutable() && - !KAuthorized::authorizeControlModules(Workspace::configModules(true)).isEmpty()) { - action = popup->addAction(i18n("Configur&e Window Behavior...")); - action->setIcon(KIcon("configure")); - connect(action, SIGNAL(triggered()), this, SLOT(configureWM())); - popup->addSeparator(); - } - mCloseOpAction = popup->addAction(i18n("&Close")); mCloseOpAction->setIcon(KIcon("window-close")); kaction = qobject_cast(keys->action("Window Close"));