From cbd391b1b89adf34d498f5c897ea2709d156ce09 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 8 Feb 2015 00:38:04 +0100 Subject: [PATCH] Second attempt based on feedback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re-split the menus, but rename the cockatrice one to “actions” --- cockatrice/src/window_main.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index f398020a..ee482b24 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -306,8 +306,11 @@ void MainWindow::retranslateUi() aSettings->setText(tr("&Settings...")); aExit->setText(tr("&Exit")); +#if defined(__APPLE__) /* For OSX */ + cockatriceMenu->setTitle(tr("A&ctions")); +#else cockatriceMenu->setTitle(tr("&Cockatrice")); - +#endif aAbout->setText(tr("&About Cockatrice")); helpMenu->setTitle(tr("&Help")); @@ -339,12 +342,6 @@ void MainWindow::createActions() connect(aAbout, SIGNAL(triggered()), this, SLOT(actAbout())); #if defined(__APPLE__) /* For OSX */ - aConnect->setMenuRole(QAction::ApplicationSpecificRole); - aDisconnect->setMenuRole(QAction::ApplicationSpecificRole); - aSinglePlayer->setMenuRole(QAction::ApplicationSpecificRole); - aWatchReplay->setMenuRole(QAction::ApplicationSpecificRole); - aDeckEditor->setMenuRole(QAction::ApplicationSpecificRole); - aFullScreen->setMenuRole(QAction::ApplicationSpecificRole); aSettings->setMenuRole(QAction::PreferencesRole); aExit->setMenuRole(QAction::QuitRole); aAbout->setMenuRole(QAction::AboutRole);