From a6fb597dde142e1321040c5c33be18c76ce16d69 Mon Sep 17 00:00:00 2001 From: hantengc Date: Mon, 24 Nov 2025 10:15:55 +0800 Subject: [PATCH 1/2] modify the tray menu text --- src/modules/notificationitem/dbusmenu.cpp | 2 +- src/ui/classic/xcbtraywindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/notificationitem/dbusmenu.cpp b/src/modules/notificationitem/dbusmenu.cpp index 10e33c50b..cf484ba75 100644 --- a/src/modules/notificationitem/dbusmenu.cpp +++ b/src/modules/notificationitem/dbusmenu.cpp @@ -250,7 +250,7 @@ void DBusMenu::fillLayoutProperties( case BII_Configure: /* this icon sucks on KDE, why configure doesn't have "configure" */ appendProperty(properties, propertyNames, "label", - dbus::Variant(_("Configure"))); + dbus::Variant(_("Input Method Settings"))); if (isKDE()) { properties.emplace_back("icon-name", dbus::Variant("configure")); diff --git a/src/ui/classic/xcbtraywindow.cpp b/src/ui/classic/xcbtraywindow.cpp index 3ad3d5017..5de47955e 100644 --- a/src/ui/classic/xcbtraywindow.cpp +++ b/src/ui/classic/xcbtraywindow.cpp @@ -35,7 +35,7 @@ XCBTrayWindow::XCBTrayWindow(XCBUI *ui) : XCBWindow(ui, 48, 48) { } groupAction_.setShortText(_("Group")); groupAction_.setMenu(&groupMenu_); - configureAction_.setShortText(_("Configure")); + configureAction_.setShortText(_("Input Method Settings")); restartAction_.setShortText(_("Restart")); exitAction_.setShortText(_("Exit")); menu_.addAction(&groupAction_); From 3244e49c602628a2f28cdfbb7a5883d3ebdb19a2 Mon Sep 17 00:00:00 2001 From: hantengc Date: Mon, 24 Nov 2025 10:17:21 +0800 Subject: [PATCH 2/2] adjust registration order By referring to other OS, such as Windows and Mac, found that the settings function is always placed at the bottom. So did the same on fcitx5 --- src/modules/notificationitem/dbusmenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/notificationitem/dbusmenu.cpp b/src/modules/notificationitem/dbusmenu.cpp index cf484ba75..3cd15c1f1 100644 --- a/src/modules/notificationitem/dbusmenu.cpp +++ b/src/modules/notificationitem/dbusmenu.cpp @@ -189,10 +189,10 @@ void DBusMenu::fillLayoutItem( if (hasAction) { appendSubItem(subLayoutItems, BII_Separator2, depth, propertyNames); } - appendSubItem(subLayoutItems, BII_Configure, depth, propertyNames); if (parent_->instance()->canRestart()) { appendSubItem(subLayoutItems, BII_Restart, depth, propertyNames); } + appendSubItem(subLayoutItems, BII_Configure, depth, propertyNames); if (parent_->instance()->canRestart() && getDesktopType() != DesktopType::DEEPIN) { appendSubItem(subLayoutItems, BII_Exit, depth, propertyNames);