From f1a06ed44014e2a88678073a8fa5d9022fdb1e93 Mon Sep 17 00:00:00 2001
From: Tobias Pietzsch <tobias.pietzsch@gmail.com>
Date: Sun, 26 Nov 2017 23:59:23 +0100
Subject: [PATCH] Set "apple.laf.useScreenMenuBar" if indicated by
ij.Prefs.setIJMenuBar==true
---
src/main/java/bdv/ij/BigDataBrowserPlugIn.java | 3 +++
src/main/java/bdv/ij/BigDataViewerPlugIn.java | 3 +++
src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java | 2 ++
src/main/java/bdv/ij/ExportImagePlusPlugIn.java | 3 +++
src/main/java/bdv/ij/ExportSpimFusionPlugIn.java | 3 +++
src/main/java/bdv/ij/ExportSpimSequencePlugIn.java | 3 +++
src/main/java/bdv/ij/ImportPlugIn.java | 3 +++
src/main/java/bdv/ij/OpenImagePlusPlugIn.java | 3 +++
src/main/java/bdv/ij/OpenImarisPlugIn.java | 3 +++
9 files changed, 26 insertions(+)
diff --git a/src/main/java/bdv/ij/BigDataBrowserPlugIn.java b/src/main/java/bdv/ij/BigDataBrowserPlugIn.java
index f2607f2..59667f0 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 f37c3de..53f6ffa 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 18e7055..7ea1e1d 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 3297fbc..2a257e0 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 058f70c..73c9e3a 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 e38c645..44bbdf3 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 2dbe3e3..f1ba7af 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 ba26555..eb1cd98 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 9db0ce1..91bf5b8 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 )
--
GitLab