Skip to content
Permalink
Browse files

Merge pull request #170 from dakcarto/fix-about-hijack

Better fix for #5754. More of a hack but works well.
  • Loading branch information
timlinux committed Jun 11, 2012
2 parents 014b9ac + e0b899e commit cc9b8983bc5b9fe37a3233d60fe73c564b758f2b
Showing with 5 additions and 9 deletions.
  1. +5 −8 src/app/qgisapp.cpp
  2. +0 −1 src/app/qgisapp.h
@@ -928,12 +928,6 @@ void QgisApp::createActions()
connect( mActionCustomization, SIGNAL( triggered() ), this, SLOT( customize() ) );

#ifdef Q_WS_MAC
// copy of Options action that gets moved to app Preferences...
mActionOptionsMac = new QAction( mActionOptions->text(), this );
mActionOptionsMac->setMenuRole( QAction::NoRole );
mActionOptionsMac->setIcon( mActionOptions->icon() );
connect( mActionOptionsMac, SIGNAL( triggered() ), this, SLOT( options() ) );

// Window Menu Items

mActionWindowMinimize = new QAction( tr( "Minimize" ), this );
@@ -1164,8 +1158,11 @@ void QgisApp::createMenus()
}

#ifdef Q_WS_MAC
// copy back the Options action after assigned to app Preferences...
mSettingsMenu->addAction( mActionOptionsMac );

// keep plugins from hijacking About and Preferences application menus
// these duplicate actions will be moved to application menus by Qt
mFileMenu->addAction( mActionAbout );
mFileMenu->addAction( mActionOptions );

// Window Menu

@@ -978,7 +978,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
// actions for menus and toolbars -----------------

#ifdef Q_WS_MAC
QAction *mActionOptionsMac;
QAction *mActionWindowMinimize;
QAction *mActionWindowZoom;
QAction *mActionWindowSeparator1;

0 comments on commit cc9b898

Please sign in to comment.
You can’t perform that action at this time.