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

…nder OSX (refs #10761)
qgis · Jul 27, 2014 · acc0f9b5269933057fa005d95e832ed8067d4e1a · acc0f9b
1 parent 642ff94
commit acc0f9b5269933057fa005d95e832ed8067d4e1a
Unified Split

Showing with 15 additions and 3 deletions.

+4 −0 src/app/composer/qgscomposer.cpp

+8 −0 src/app/qgisapp.cpp

+3 −3 src/ui/qgisapp.ui
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -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 );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -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

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -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"/>