diff --git a/src/main/java/bdv/ij/BigDataBrowserPlugIn.java b/src/main/java/bdv/ij/BigDataBrowserPlugIn.java index f2607f25e4d3cde7b25fa17f910868b29b9a8838..59667f02bf399ae98d384b7d8f13f3548620f9c6 100644 --- a/src/main/java/bdv/ij/BigDataBrowserPlugIn.java +++ b/src/main/java/bdv/ij/BigDataBrowserPlugIn.java @@ -53,6 +53,9 @@ public class BigDataBrowserPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + BufferedImage image = null; try { diff --git a/src/main/java/bdv/ij/BigDataViewerPlugIn.java b/src/main/java/bdv/ij/BigDataViewerPlugIn.java index f37c3de3516fca75724bb04f639cfc3ac7b20f59..53f6ffa91c1c324be16a9a0ed6f98d81f4f0dc34 100644 --- a/src/main/java/bdv/ij/BigDataViewerPlugIn.java +++ b/src/main/java/bdv/ij/BigDataViewerPlugIn.java @@ -26,6 +26,9 @@ public class BigDataViewerPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + File file = null; if ( Prefs.useJFileChooser ) diff --git a/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java b/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java index 18e7055590cfef8e0a5d59527b4668553de477b2..7ea1e1dbbc4cb3e98795203e1502cd01d857bb8f 100644 --- a/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java +++ b/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java @@ -70,6 +70,8 @@ public class ExportCellVoyagerPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); final Parameters params = getParameters( sourcePath ); if ( params == null ) diff --git a/src/main/java/bdv/ij/ExportImagePlusPlugIn.java b/src/main/java/bdv/ij/ExportImagePlusPlugIn.java index 3297fbced20d150e38a3fddf7382e4c931dde114..2a257e023bf2c4f2f3e2e18537c99bab79e92c21 100644 --- a/src/main/java/bdv/ij/ExportImagePlusPlugIn.java +++ b/src/main/java/bdv/ij/ExportImagePlusPlugIn.java @@ -67,6 +67,9 @@ public class ExportImagePlusPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + // get the current image final ImagePlus imp = WindowManager.getCurrentImage(); diff --git a/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java b/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java index 058f70c985c22961474d00479522a9aae46f1287..73c9e3a64e212e67ef87ca6df2db021a859a90cb 100644 --- a/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java +++ b/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java @@ -97,6 +97,9 @@ public class ExportSpimFusionPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + final Parameters params = getParameters(); // cancelled diff --git a/src/main/java/bdv/ij/ExportSpimSequencePlugIn.java b/src/main/java/bdv/ij/ExportSpimSequencePlugIn.java index e38c6452c047f7b19458f78003eac958d137df9e..44bbdf36a75ef6d92fe446551506b6a898f4854c 100644 --- a/src/main/java/bdv/ij/ExportSpimSequencePlugIn.java +++ b/src/main/java/bdv/ij/ExportSpimSequencePlugIn.java @@ -52,6 +52,9 @@ public class ExportSpimSequencePlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + final Parameters params = getParameters(); // cancelled diff --git a/src/main/java/bdv/ij/ImportPlugIn.java b/src/main/java/bdv/ij/ImportPlugIn.java index 2dbe3e32da728f65389782b4191bb1beeea636e2..f1ba7af8268efd5ea7d661030989761f44f119f0 100644 --- a/src/main/java/bdv/ij/ImportPlugIn.java +++ b/src/main/java/bdv/ij/ImportPlugIn.java @@ -64,6 +64,9 @@ public class ImportPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + final GenericDialogPlus gd = new GenericDialogPlus( "Import from BigDataViewer file" ); gd.addFileField( "xml file", xmlFile ); final TextField tfXmlFile = (TextField) gd.getStringFields().lastElement(); diff --git a/src/main/java/bdv/ij/OpenImagePlusPlugIn.java b/src/main/java/bdv/ij/OpenImagePlusPlugIn.java index ba265551a302ee4c2032c71bd64fecba4abdacb0..eb1cd985175bd3f59de2adef70aa6ea5d58c2b2c 100644 --- a/src/main/java/bdv/ij/OpenImagePlusPlugIn.java +++ b/src/main/java/bdv/ij/OpenImagePlusPlugIn.java @@ -59,6 +59,9 @@ public class OpenImagePlusPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + // get the current image final ImagePlus imp = WindowManager.getCurrentImage(); diff --git a/src/main/java/bdv/ij/OpenImarisPlugIn.java b/src/main/java/bdv/ij/OpenImarisPlugIn.java index 9db0ce1137e3a04061e11efdfe988c6a6080cde3..91bf5b85a41eb8bd7cb69d44d3d0dbde392529cd 100644 --- a/src/main/java/bdv/ij/OpenImarisPlugIn.java +++ b/src/main/java/bdv/ij/OpenImarisPlugIn.java @@ -35,6 +35,9 @@ public class OpenImarisPlugIn implements Command @Override public void run() { + if ( ij.Prefs.setIJMenuBar ) + System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + File file = null; if ( Prefs.useJFileChooser )