Skip to content
Permalink
Browse files

Disable preview modes under OSX due to issues with QGraphicsEffects u…

…nder OSX (refs #10761)
  • Loading branch information
nyalldawson committed Jul 27, 2014
1 parent 642ff94 commit acc0f9b5269933057fa005d95e832ed8067d4e1a
Showing with 15 additions and 3 deletions.
  1. +4 −0 src/app/composer/qgscomposer.cpp
  2. +8 −0 src/app/qgisapp.cpp
  3. +3 −3 src/ui/qgisapp.ui
@@ -299,12 +299,16 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
QShortcut* ctrlEquals = new QShortcut( QKeySequence( "Ctrl+=" ), this );
connect( ctrlEquals, SIGNAL( activated() ), mActionZoomIn, SLOT( trigger() ) );

#ifndef Q_WS_MAC
//disabled for OSX - see #10761
//also see http://qt-project.org/forums/viewthread/3630 QGraphicsEffects are not well supported on OSX
QMenu *previewMenu = viewMenu->addMenu( "Preview" );
previewMenu->addAction( mActionPreviewModeOff );
previewMenu->addAction( mActionPreviewModeGrayscale );
previewMenu->addAction( mActionPreviewModeMono );
previewMenu->addAction( mActionPreviewProtanope );
previewMenu->addAction( mActionPreviewDeuteranope );
#endif

viewMenu->addSeparator();
viewMenu->addAction( mActionZoomIn );
@@ -1468,6 +1468,14 @@ void QgisApp::createMenus()
mSettingsMenu->insertSeparator( before );
}


#ifdef Q_WS_MAC
//disabled for OSX - see #10761
//also see http://qt-project.org/forums/viewthread/3630 QGraphicsEffects are not well supported on OSX
mMenuPreviewMode->menuAction()->setVisible( false );
#endif


#ifdef Q_WS_MAC

// keep plugins from hijacking About and Preferences application menus
@@ -17,7 +17,7 @@
<x>0</x>
<y>0</y>
<width>1050</width>
<height>21</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="mProjectMenu">
@@ -87,7 +87,7 @@
<addaction name="mActionDecorationNorthArrow"/>
<addaction name="mActionDecorationCopyright"/>
</widget>
<widget class="QMenu" name="menuPreview_Mode">
<widget class="QMenu" name="mMenuPreviewMode">
<property name="title">
<string>Preview Mode</string>
</property>
@@ -114,7 +114,7 @@
<addaction name="mActionZoomActualSize"/>
<addaction name="separator"/>
<addaction name="menuDecorations"/>
<addaction name="menuPreview_Mode"/>
<addaction name="mMenuPreviewMode"/>
<addaction name="mActionMapTips"/>
<addaction name="mActionNewBookmark"/>
<addaction name="mActionShowBookmarks"/>

0 comments on commit acc0f9b

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