From c959d12c28f637427b1a72bb4b65868a60701db9 Mon Sep 17 00:00:00 2001 From: Jean-Yves Tinevez Date: Wed, 9 Oct 2024 15:46:59 +0200 Subject: [PATCH] Move import and export plugins to submenus in the main File menu. --- src/main/java/org/mastodon/mamut/MainWindow.java | 4 ++++ .../mamut/io/exporter/mamut/MamutExporterPlugin.java | 7 ++++--- .../mamut/io/importer/graphml/GraphMLImporterPlugin.java | 7 ++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mastodon/mamut/MainWindow.java b/src/main/java/org/mastodon/mamut/MainWindow.java index 887cc6bb1..7037106e1 100644 --- a/src/main/java/org/mastodon/mamut/MainWindow.java +++ b/src/main/java/org/mastodon/mamut/MainWindow.java @@ -38,6 +38,7 @@ import static org.mastodon.app.MastodonIcons.TAGS_ICON_MEDIUM; import static org.mastodon.app.MastodonIcons.TRACKSCHEME_ICON_MEDIUM; import static org.mastodon.app.ui.ViewMenuBuilder.item; +import static org.mastodon.app.ui.ViewMenuBuilder.menu; import static org.mastodon.app.ui.ViewMenuBuilder.separator; import static org.mastodon.mamut.MamutMenuBuilder.fileMenu; @@ -320,6 +321,9 @@ public static void addMenus( final ViewMenu menu, final ActionMap actionMap ) item( ProjectActions.SAVE_PROJECT ), item( ProjectActions.SAVE_PROJECT_AS ), separator(), + menu( "Import" ), + menu( "Export" ), + separator(), item( ProjectActions.FIX_DATASET_PATH ), separator(), // item( ProjectActions.IMPORT_TGMM ), diff --git a/src/main/java/org/mastodon/mamut/io/exporter/mamut/MamutExporterPlugin.java b/src/main/java/org/mastodon/mamut/io/exporter/mamut/MamutExporterPlugin.java index 4ac3edf67..efa1d8ca5 100644 --- a/src/main/java/org/mastodon/mamut/io/exporter/mamut/MamutExporterPlugin.java +++ b/src/main/java/org/mastodon/mamut/io/exporter/mamut/MamutExporterPlugin.java @@ -35,7 +35,7 @@ import java.awt.Image; import java.io.File; import java.io.IOException; -import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +45,7 @@ import org.mastodon.app.MastodonIcons; import org.mastodon.app.ui.ViewMenuBuilder; import org.mastodon.mamut.KeyConfigScopes; +import org.mastodon.mamut.MamutMenuBuilder; import org.mastodon.mamut.ProjectModel; import org.mastodon.mamut.io.importer.trackmate.MamutExporter; import org.mastodon.mamut.plugin.MamutPlugin; @@ -92,8 +93,8 @@ public Map< String, String > getMenuTexts() @Override public List< ViewMenuBuilder.MenuItem > getMenuItems() { - return Arrays.asList( - menu( "Plugins", menu( "Exports", item( EXPORT_MAMUT ) ) ) ); + return Collections.singletonList( + MamutMenuBuilder.fileMenu( menu( "Export", item( EXPORT_MAMUT ) ) ) ); } @Override diff --git a/src/main/java/org/mastodon/mamut/io/importer/graphml/GraphMLImporterPlugin.java b/src/main/java/org/mastodon/mamut/io/importer/graphml/GraphMLImporterPlugin.java index 900a1314c..96c2d8b83 100644 --- a/src/main/java/org/mastodon/mamut/io/importer/graphml/GraphMLImporterPlugin.java +++ b/src/main/java/org/mastodon/mamut/io/importer/graphml/GraphMLImporterPlugin.java @@ -33,7 +33,7 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,6 +43,7 @@ import org.mastodon.app.MastodonIcons; import org.mastodon.app.ui.ViewMenuBuilder; import org.mastodon.mamut.KeyConfigScopes; +import org.mastodon.mamut.MamutMenuBuilder; import org.mastodon.mamut.ProjectModel; import org.mastodon.mamut.plugin.MamutPlugin; import org.mastodon.ui.keymap.KeyConfigContexts; @@ -91,8 +92,8 @@ public Map< String, String > getMenuTexts() @Override public List< ViewMenuBuilder.MenuItem > getMenuItems() { - return Arrays.asList( - menu( "Plugins", menu( "Imports", item( IMPORT_GRAPHML ) ) ) ); + return Collections.singletonList( + MamutMenuBuilder.fileMenu( menu( "Import", item( IMPORT_GRAPHML ) ) ) ); } @Override