Skip to content
Permalink
Browse files
On Mac use Close for quit action (conflicts with app menu's quit acti…
…on and key sequence)
  • Loading branch information
dakcarto committed Mar 7, 2013
1 parent 2fe847c commit 290f8fd5b8a3952edf9a231ba89019b3a730e301
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/app/composer/qgscomposer.cpp
@@ -167,6 +167,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
mActionAddArrow->setCheckable( true );

#ifdef Q_WS_MAC
mActionQuit->setText( tr( "Close" ) );
mActionQuit->setShortcut( QKeySequence::Close );
QMenu *appMenu = menuBar()->addMenu( tr( "QGIS" ) );
appMenu->addAction( mQgis->actionAbout() );
appMenu->addAction( mQgis->actionOptions() );
@@ -250,7 +252,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
connect( mWindowMenu, SIGNAL( aboutToShow() ), this, SLOT( populateWindowMenu() ) );
menuBar()->addMenu( mWindowMenu );

mHelpMenu = new QMenu( tr( "Help" ) );
mHelpMenu = new QMenu( tr( "Help" ), this );
mHelpMenu->setObjectName( "mHelpMenu" );
connect( mHelpMenu, SIGNAL( aboutToShow() ), this, SLOT( populateHelpMenu() ) );
menuBar()->addMenu( mHelpMenu );

0 comments on commit 290f8fd

Please sign in to comment.