From aba58d90851816974610b02fe95a6e4e1bd6472a Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sat, 18 Jan 2020 20:34:10 -0500 Subject: [PATCH] Second pass at fixing display of Preferences menu shortcut on macOS. The previous fix didn't work 100% of the time either. --- oscar/mainwindow.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index f7187a17..d356c44e 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -128,15 +128,8 @@ void MainWindow::SetupGUI() setWindowTitle(getMainWindowTitle()); #ifdef Q_OS_MAC - ui->action_About->setMenuRole(QAction::ApplicationSpecificRole); - ui->action_Preferences->setMenuRole(QAction::ApplicationSpecificRole); - - // For some reason, setShortcuts won't change the text of the menu item unless Qt has had a chance - // to do something first. Without the processEvents() call it still installs the shortcut, but - // not visible. (Any preceding UI such as QMessageBox seems to have the same effect.) - QApplication::processEvents(); - - ui->action_Preferences->setShortcuts(QKeySequence::Preferences); + ui->action_About->setMenuRole(QAction::AboutRole); + ui->action_Preferences->setMenuRole(QAction::PreferencesRole); #endif ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode());