From 210ed00a3107a7dc10b4b9d5db09844e3711747c Mon Sep 17 00:00:00 2001 From: Oliver Bock Date: Tue, 19 May 2009 23:54:02 +0200 Subject: [PATCH] Disable menu bar toggle on Mac OS X * It's pointless anyway * Avoids shortcut ambiguities --- src/pulsatingscience.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pulsatingscience.cpp b/src/pulsatingscience.cpp index c355c0b..5ad367f 100644 --- a/src/pulsatingscience.cpp +++ b/src/pulsatingscience.cpp @@ -33,6 +33,10 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent) animControl->setShortcut(QKeySequence(tr("Alt+A"))); ui.menuView->addAction(animControl); +#ifdef __APPLE__ + ui.actionMenu_bar->setEnabled(false); +#endif + // inital status (based on GUI) m_permanentOrbits = ui.actionPermanent_orbits->isChecked(); m_rotationAxesVisible = ui.actionRotationAxes->isChecked(); @@ -349,12 +353,13 @@ void PulsatingScience::on_actionFullscreen_toggled(bool checked) window()->setWindowState(windowState() | Qt::WindowFullScreen); // assuming text being black setBackgroundRole(QPalette::Text); - +#ifndef __APPLE__ if(m_menuBarVisible) { on_actionMenu_bar_toggled(false); // keep visibility setting m_menuBarVisible = true; } +#endif if(m_statusBarVisible) ui.statusbar->hide(); if(m_animControlVisible && !m_animControlFloating) { ui.dockAnimControl->hide(); @@ -365,9 +370,10 @@ void PulsatingScience::on_actionFullscreen_toggled(bool checked) else { window()->setWindowState(windowState() & ~Qt::WindowFullScreen); setBackgroundRole(QPalette::Window); - +#ifndef __APPLE__ if(m_menuBarVisible) on_actionMenu_bar_toggled(true); - if(m_statusBarVisible) ui.statusbar->show(); +#endif + if(m_statusBarVisible) ui.statusbar->show(); if(m_animControlVisible && !m_animControlFloating) ui.dockAnimControl->show(); } } -- GitLab