Skip to content

FIX(client, macOS): Move Quit menu to application menu on macOS#7156

Open
maxer137 wants to merge 1 commit intomumble-voip:masterfrom
maxer137:quitmenu
Open

FIX(client, macOS): Move Quit menu to application menu on macOS#7156
maxer137 wants to merge 1 commit intomumble-voip:masterfrom
maxer137:quitmenu

Conversation

@maxer137
Copy link
Copy Markdown
Contributor

@maxer137 maxer137 commented Apr 7, 2026

On macOS, the "Quit Mumble" option was incorrectly placed under the Server menu instead of the standard application menu. This commit adjusts the menu placement so that the quit action appears under the application menu on macOS, aligning with typical macOS UI conventions.

It also disables the custom icon for the preferences option. This too is to align with typical macOS UI conventions.

  • Exclude Quit action from Server menu on macOS
  • Set menuRole of Quit action to QAction::QuitRole in UI file
  • Hide custom preferences icon in menu on macOS

Implements #7151

Checks

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 7, 2026

Walkthrough

This pull request implements macOS-specific UI adjustments to the Mumble client's menu system. The changes hide the settings/config action icon in the menu on macOS, set the Quit action's menu role to QAction::QuitRole, and remove the Quit option from the server context menu on macOS by conditionally excluding it from compilation on that platform.

Possibly related issues

Suggested labels

client, macOS, ui

🚥 Pre-merge checks | ✅ 2
✅ Passed checks (2 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main change: moving the Quit menu to the application menu on macOS following standard conventions.
Description check ✅ Passed The description covers the main changes, provides context about macOS conventions, lists specific modifications, and includes the required commit guidelines checkbox marked as completed.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@src/mumble/MainWindow.ui`:
- Around line 259-261: The tray menu unconditionally adds the Quit action
(qaQuit) while other menus guard it on macOS; update the TrayIcon code to wrap
the creation/adding of qaQuit in a platform guard (`#ifndef` Q_OS_MACOS / `#endif`).
Locate the place where QAction* qaQuit is constructed or added to the
tray/context menu in the TrayIcon implementation (e.g., TrayIcon::... or
createContextMenu) and enclose that block with the same `#ifndef` Q_OS_MACOS used
in MainWindow::... so qaQuit is omitted on macOS for consistency.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: c9a58a27-f13c-4d4b-97ed-3389817184eb

📥 Commits

Reviewing files that changed from the base of the PR and between c73b065 and 7ef078b.

📒 Files selected for processing (2)
  • src/mumble/MainWindow.cpp
  • src/mumble/MainWindow.ui

@maxer137
Copy link
Copy Markdown
Contributor Author

maxer137 commented Apr 7, 2026

Before changes:

Mumble menubar options before commit changes. Shows preferences with blue gear icon. Quit options not present Mumble server menubar options before commit changes. Shows quit option at bottom.
After changes:
Mumble menubar options after commit changes. Shows preferences with default MacOS gear icon. Quit options present Mumble server menubar options after commit changes. Quit option not present.

Copy link
Copy Markdown
Member

@Hartmnt Hartmnt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can ignore the coderabbit suggestion as it is BS

@Hartmnt Hartmnt added macOS ui bug A bug (error) in the software auto-backport-to-1.6.x labels Apr 7, 2026
@Hartmnt Hartmnt added this to the 1.6.0 milestone Apr 7, 2026
@Hartmnt Hartmnt added the client label Apr 7, 2026
On macOS, the "Quit Mumble" option was incorrectly placed under the
Server menu instead of the standard application menu. This commit
adjusts the menu placement so that the quit action appears under the
application menu on macOS, aligning with typical macOS UI conventions.

It also disables the custom icon for the preferences option.
This too is to align with typical macOS UI conventions.

- Exclude Quit action from Server menu on macOS
- Set `menuRole` of Quit action to `QAction::QuitRole` in UI file
- Hide custom preferences icon in menu on macOS

Implements mumble-voip#7151
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants