[plasma/kwin] /: Unify name for the "window menu" and its button
Nate Graham
null at kde.org
Thu May 29 15:22:20 BST 2025
Git commit 3156e90b35fbeae000186eb92397cdf5c011476b by Nate Graham, on behalf of John Veness.
Committed on 29/05/2025 at 14:22.
Pushed by ngraham into branch 'master'.
Unify name for the "window menu" and its button
This commit unifies the user-visible name for what I've called the
"window menu", and its associated button. This is the button that is
by default in the top-left of a window with the application's icon,
and that shows the menu with Maximize, Minimize, Close etc. when clicked.
At least at some point in the past, this was simply called the "Menu
button" and that text was still in use in some places. More recently the
name for the button (shown in the tooltip and in the Titlebar Buttons KCM)
was changed to "More actions for this window". The keyboard shortcuts KCM
called it "Window Operations Menu". The window behavior KCM called it the
"Actions Menu".
Now let's unify on "window menu".
BUG: 499700
BUG: 504807
FIXED-IN: 6.5.0
M +1 -1 autotests/integration/globalshortcuts_test.cpp
M +2 -1 doc/kwindecoration/index.docbook
M +11 -1 doc/windowbehaviour/index.docbook
M +1 -1 src/kcms/decoration/declarative-plugin/buttonsmodel.cpp
M +1 -1 src/kcms/decoration/kwindecorationsettings.kcfg
M +2 -2 src/kcms/decoration/ui/ConfigureTitlebar.qml
M +3 -3 src/kcms/options/actions.ui
M +6 -6 src/kcms/options/mouse.ui
M +6 -6 src/useractions.cpp
M +1 -2 src/workspace.h
https://invent.kde.org/plasma/kwin/-/commit/3156e90b35fbeae000186eb92397cdf5c011476b
diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp
index 1541b2744d8..8e946e99677 100644
--- a/autotests/integration/globalshortcuts_test.cpp
+++ b/autotests/integration/globalshortcuts_test.cpp
@@ -209,7 +209,7 @@ void GlobalShortcutsTest::testRepeatedTrigger()
void GlobalShortcutsTest::testUserActionsMenu()
{
- // this test tries to trigger the user actions menu with Alt+F3
+ // this test tries to trigger the window menu with Alt+F3
// the problem here is that pressing F3 consumes modifiers as it's part of the
// Ctrl+alt+F3 keysym for vt switching. xkbcommon considers all modifiers as consumed
// which a transformation to any keysym would cause
diff --git a/doc/kwindecoration/index.docbook b/doc/kwindecoration/index.docbook
index ed6e25c68c3..b2fe949f404 100644
--- a/doc/kwindecoration/index.docbook
+++ b/doc/kwindecoration/index.docbook
@@ -7,6 +7,7 @@
<article id="kwindecoration" lang="&language;">
<articleinfo>
+<title>Window Decorations</title>
<authorgroup>
<author>&Rik.Hemsley; &Rik.Hemsley.mail;</author>
<author>&Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail;</author>
@@ -135,7 +136,7 @@ buttons until you have the order that makes you comfortable.
</mediaobject>
</screenshot>
-<para>Enable <guilabel>Close windows by double clicking the menu button</guilabel>
+<para>Enable <guilabel>Close windows by double clicking the window menu button</guilabel>
to have an additional option to the Close button or if you have removed the Close button from the titlebar.
</para>
diff --git a/doc/windowbehaviour/index.docbook b/doc/windowbehaviour/index.docbook
index c29905e15b7..3ac69256bef 100644
--- a/doc/windowbehaviour/index.docbook
+++ b/doc/windowbehaviour/index.docbook
@@ -575,7 +575,7 @@ Closes the window.
</varlistentry>
<varlistentry>
-<term><guilabel>Show actions menu</guilabel></term>
+<term><guilabel>Window menu</guilabel></term>
<listitem>
<para>
Will bring up a small submenu where you can choose window related
@@ -849,6 +849,16 @@ Makes the window less transparent.
</listitem>
</varlistentry>
+<varlistentry>
+<term><guilabel>Window menu</guilabel></term>
+<listitem>
+<para>
+Will bring up a small submenu where you can choose window related
+commands (&ie; Move to Desktop, Move to Screen, Maximize, Minimize, Close, &etc;).
+</para>
+</listitem>
+</varlistentry>
+
<varlistentry>
<term><guilabel>Do nothing</guilabel></term>
<listitem>
diff --git a/src/kcms/decoration/declarative-plugin/buttonsmodel.cpp b/src/kcms/decoration/declarative-plugin/buttonsmodel.cpp
index 504c1622a15..588faf654ff 100644
--- a/src/kcms/decoration/declarative-plugin/buttonsmodel.cpp
+++ b/src/kcms/decoration/declarative-plugin/buttonsmodel.cpp
@@ -52,7 +52,7 @@ static QString buttonToName(DecorationButtonType type)
{
switch (type) {
case DecorationButtonType::Menu:
- return i18n("More actions for this window");
+ return i18n("Window menu");
case DecorationButtonType::ApplicationMenu:
return i18n("Application menu");
case DecorationButtonType::OnAllDesktops:
diff --git a/src/kcms/decoration/kwindecorationsettings.kcfg b/src/kcms/decoration/kwindecorationsettings.kcfg
index b014ea012b7..2d75a11b9ab 100644
--- a/src/kcms/decoration/kwindecorationsettings.kcfg
+++ b/src/kcms/decoration/kwindecorationsettings.kcfg
@@ -22,7 +22,7 @@
<default>true</default>
</entry>
<entry name="closeOnDoubleClickOnMenu" key="CloseOnDoubleClickOnMenu" type="Bool">
- <label>Close windows by double clicking the menu button</label>
+ <label>Close windows by double clicking the window menu button</label>
<default>false</default>
</entry>
<entry name="showToolTips" key="ShowToolTips" type="Bool">
diff --git a/src/kcms/decoration/ui/ConfigureTitlebar.qml b/src/kcms/decoration/ui/ConfigureTitlebar.qml
index 1ea30d52f35..93a7d0d5397 100644
--- a/src/kcms/decoration/ui/ConfigureTitlebar.qml
+++ b/src/kcms/decoration/ui/ConfigureTitlebar.qml
@@ -32,7 +32,7 @@ KCM.AbstractKCM {
footer: ColumnLayout {
QQC2.CheckBox {
id: closeOnDoubleClickOnMenuCheckBox
- text: i18nc("checkbox label", "Close windows by double clicking the menu button")
+ text: i18nc("checkbox label", "Close windows by double clicking the window menu button")
checked: kcm.settings.closeOnDoubleClickOnMenu
onToggled: {
kcm.settings.closeOnDoubleClickOnMenu = checked;
@@ -49,7 +49,7 @@ KCM.AbstractKCM {
Layout.fillWidth: true
id: infoLabel
type: Kirigami.MessageType.Information
- text: i18nc("popup tip", "Click and hold on the menu button to show the menu.")
+ text: i18nc("popup tip", "Click and hold on the window menu button to show the menu.")
showCloseButton: true
visible: false
}
diff --git a/src/kcms/options/actions.ui b/src/kcms/options/actions.ui
index 8f3bbd55f7a..2861ee4e34f 100644
--- a/src/kcms/options/actions.ui
+++ b/src/kcms/options/actions.ui
@@ -329,7 +329,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -404,7 +404,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -479,7 +479,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
diff --git a/src/kcms/options/mouse.ui b/src/kcms/options/mouse.ui
index 41067ec01c6..8e777dd70cc 100644
--- a/src/kcms/options/mouse.ui
+++ b/src/kcms/options/mouse.ui
@@ -254,7 +254,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -311,7 +311,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -359,7 +359,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -416,7 +416,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -464,7 +464,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
@@ -521,7 +521,7 @@
</item>
<item>
<property name="text">
- <string>Show actions menu</string>
+ <string>Window menu</string>
</property>
</item>
<item>
diff --git a/src/useractions.cpp b/src/useractions.cpp
index 7691e5eb035..f46128599e4 100644
--- a/src/useractions.cpp
+++ b/src/useractions.cpp
@@ -13,7 +13,7 @@
This file contains things relevant to direct user actions, such as
responses to global keyboard shortcuts, or selecting actions
- from the window operations menu.
+ from the window menu.
*/
@@ -156,12 +156,12 @@ void UserActionsMenu::helperDialog(const QString &message)
QAction *action = Workspace::self()->findChild<QAction *>(name);
Q_ASSERT(action != nullptr);
const auto shortcuts = KGlobalAccel::self()->shortcut(action);
- return QStringLiteral("%1 (%2)").arg(action->text(), shortcuts.isEmpty() ? QString() : shortcuts.first().toString(QKeySequence::NativeText));
+ return QStringLiteral("%1").arg(shortcuts.isEmpty() ? QString() : shortcuts.first().toString(QKeySequence::NativeText));
};
if (message == QLatin1StringView("noborderaltf3")) {
args << QStringLiteral("--msgbox") << i18n("You have selected to show a window without its border.\n"
"Without the border, you will not be able to enable the border "
- "again using the mouse: use the window operations menu instead, "
+ "again using the mouse: use the window menu instead, "
"activated using the %1 keyboard shortcut.",
shortcut(QStringLiteral("Window Operations Menu")));
type = QStringLiteral("altf3warning");
@@ -169,7 +169,7 @@ void UserActionsMenu::helperDialog(const QString &message)
args << QStringLiteral("--msgbox") << i18n("You have selected to show a window in fullscreen mode.\n"
"If the application itself does not have an option to turn the fullscreen "
"mode off you will not be able to disable it "
- "again using the mouse: use the window operations menu instead, "
+ "again using the mouse: use the window menu instead, "
"activated using the %1 keyboard shortcut.",
shortcut(QStringLiteral("Window Operations Menu")));
type = QStringLiteral("altf3warning");
@@ -726,7 +726,7 @@ void UserActionsMenu::slotWindowOperation(QAction *action)
helperDialog(type);
}
// need to delay performing the window operation as we need to have the
- // user actions menu closed before we destroy the decoration. Otherwise Qt crashes
+ // window menu closed before we destroy the decoration. Otherwise Qt crashes
QMetaObject::invokeMethod(
workspace(), [c, op]() {
workspace()->performWindowOperation(c, op);
@@ -884,7 +884,7 @@ void Workspace::initShortcuts()
// PLEASE NOTE: Never change the ID of an existing shortcut! It will cause users'
// custom shortcuts to be lost. Instead, only change the description
- initShortcut("Window Operations Menu", i18n("Window Operations Menu"),
+ initShortcut("Window Operations Menu", i18n("Window Menu"),
Qt::ALT | Qt::Key_F3, &Workspace::slotWindowOperations);
initShortcut("Window Close", i18n("Close Window"),
Qt::ALT | Qt::Key_F4, &Workspace::slotWindowClose);
diff --git a/src/workspace.h b/src/workspace.h
index 5c14124d3ba..a1376294e6e 100644
--- a/src/workspace.h
+++ b/src/workspace.h
@@ -289,8 +289,7 @@ public:
#endif
/**
- * Shows the menu operations menu for the window and makes it active if
- * it's not already.
+ * Shows the window menu and makes it active if it's not already.
*/
void showWindowMenu(const QRect &pos, Window *cl);
UserActionsMenu *userActionsMenu() const
More information about the kde-doc-english
mailing list