From b7ecfb3ebff5d102815bcba3f442b70356fa2194 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 10 Apr 2022 21:00:05 -0400 Subject: [PATCH] Finally, set the correct menu roles on macOS "Configure Wine..." was accidentally picked up as the preferences, but now the real settings window is in the preferences' role. --- src/launcherwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/launcherwindow.cpp b/src/launcherwindow.cpp index 8a4e073..2bd56a4 100644 --- a/src/launcherwindow.cpp +++ b/src/launcherwindow.cpp @@ -55,7 +55,7 @@ LauncherWindow::LauncherWindow(LauncherCore& core, QWidget* parent) : QMainWindo QAction* settingsAction = fileMenu->addAction("Configure Astra..."); settingsAction->setIcon(QIcon::fromTheme("configure")); - settingsAction->setMenuRole(QAction::MenuRole::NoRole); + settingsAction->setMenuRole(QAction::MenuRole::PreferencesRole); connect(settingsAction, &QAction::triggered, [=] { auto window = new SettingsWindow(0, *this, this->core, this); connect(&this->core, &LauncherCore::settingsChanged, window, &SettingsWindow::reloadControls); @@ -75,6 +75,7 @@ LauncherWindow::LauncherWindow(LauncherCore& core, QWidget* parent) : QMainWindo fileMenu->addSeparator(); wineCfg = fileMenu->addAction("Configure Wine..."); + wineCfg->setMenuRole(QAction::MenuRole::NoRole); wineCfg->setIcon(QIcon::fromTheme("configure")); connect(wineCfg, &QAction::triggered, [=] { this->core.launchExternalTool(currentProfile(), {"winecfg.exe"});