Skip to content

Commit

Permalink
On Mac use Close for quit action (conflicts with app menu's quit acti…
Browse files Browse the repository at this point in the history
…on and key sequence)
  • Loading branch information
dakcarto committed Mar 7, 2013
1 parent 2fe847c commit 290f8fd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/app/composer/qgscomposer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
Expand Down Expand Up @@ -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 );
Expand Down

0 comments on commit 290f8fd

Please sign in to comment.