Skip to content

Commit acc0f9b

Browse files
committed
Disable preview modes under OSX due to issues with QGraphicsEffects under OSX (refs #10761)
1 parent 642ff94 commit acc0f9b

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

src/app/composer/qgscomposer.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,16 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
299299
QShortcut* ctrlEquals = new QShortcut( QKeySequence( "Ctrl+=" ), this );
300300
connect( ctrlEquals, SIGNAL( activated() ), mActionZoomIn, SLOT( trigger() ) );
301301

302+
#ifndef Q_WS_MAC
303+
//disabled for OSX - see #10761
304+
//also see http://qt-project.org/forums/viewthread/3630 QGraphicsEffects are not well supported on OSX
302305
QMenu *previewMenu = viewMenu->addMenu( "Preview" );
303306
previewMenu->addAction( mActionPreviewModeOff );
304307
previewMenu->addAction( mActionPreviewModeGrayscale );
305308
previewMenu->addAction( mActionPreviewModeMono );
306309
previewMenu->addAction( mActionPreviewProtanope );
307310
previewMenu->addAction( mActionPreviewDeuteranope );
311+
#endif
308312

309313
viewMenu->addSeparator();
310314
viewMenu->addAction( mActionZoomIn );

src/app/qgisapp.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,14 @@ void QgisApp::createMenus()
14681468
mSettingsMenu->insertSeparator( before );
14691469
}
14701470

1471+
1472+
#ifdef Q_WS_MAC
1473+
//disabled for OSX - see #10761
1474+
//also see http://qt-project.org/forums/viewthread/3630 QGraphicsEffects are not well supported on OSX
1475+
mMenuPreviewMode->menuAction()->setVisible( false );
1476+
#endif
1477+
1478+
14711479
#ifdef Q_WS_MAC
14721480

14731481
// keep plugins from hijacking About and Preferences application menus

src/ui/qgisapp.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<x>0</x>
1818
<y>0</y>
1919
<width>1050</width>
20-
<height>21</height>
20+
<height>25</height>
2121
</rect>
2222
</property>
2323
<widget class="QMenu" name="mProjectMenu">
@@ -87,7 +87,7 @@
8787
<addaction name="mActionDecorationNorthArrow"/>
8888
<addaction name="mActionDecorationCopyright"/>
8989
</widget>
90-
<widget class="QMenu" name="menuPreview_Mode">
90+
<widget class="QMenu" name="mMenuPreviewMode">
9191
<property name="title">
9292
<string>Preview Mode</string>
9393
</property>
@@ -114,7 +114,7 @@
114114
<addaction name="mActionZoomActualSize"/>
115115
<addaction name="separator"/>
116116
<addaction name="menuDecorations"/>
117-
<addaction name="menuPreview_Mode"/>
117+
<addaction name="mMenuPreviewMode"/>
118118
<addaction name="mActionMapTips"/>
119119
<addaction name="mActionNewBookmark"/>
120120
<addaction name="mActionShowBookmarks"/>

0 commit comments

Comments
 (0)