Use the helper icon everywhere we can.

Author: tinevez

src/main/java/fiji/plugin/trackmate/helper/TrackMateParameterSweepResultsPlugin.java

@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -31,10 +31,10 @@
 
 import fiji.plugin.trackmate.Logger;
 import fiji.plugin.trackmate.gui.Fonts;
-import fiji.plugin.trackmate.gui.Icons;
 import fiji.plugin.trackmate.helper.ctc.CTCTrackingMetricsType;
 import fiji.plugin.trackmate.helper.spt.SPTTrackingMetricsType;
 import fiji.plugin.trackmate.helper.ui.CrawlerResultsPanel;
+import fiji.plugin.trackmate.helper.ui.components.GuiUtils;
 import fiji.plugin.trackmate.util.TMUtils;
 import fiji.util.gui.GenericDialogPlus;
 import ij.IJ;
@@ -51,9 +51,9 @@ public class TrackMateParameterSweepResultsPlugin implements PlugIn
 	public void run( final String arg )
 	{
 		final GenericDialogPlus dialog = new GenericDialogPlus( "TrackMate-Helper results inspector" );
-		dialog.setIconImage( Icons.TRACKMATE_ICON.getImage() );
+		dialog.setIconImage( GuiUtils.HELPER_ICON_BIG.getImage() );
 
-		dialog.addImage( Icons.TRACKMATE_ICON );
+		dialog.addImage( GuiUtils.HELPER_ICON );
 		dialog.addToSameRow();
 		dialog.addMessage( "TrackMate-Helper results inspector", Fonts.BIG_FONT );
 		dialog.addMessage( "v" + VersionUtils.getVersion( TrackMateParameterSweepPlugin.class ), Fonts.SMALL_FONT );
@@ -122,7 +122,7 @@ public void windowClosing( final java.awt.event.WindowEvent e )
 				crawler.stopWatching();
 			}
 		} );
-		frame.setIconImage( Icons.TRACKMATE_ICON.getImage() );
+		frame.setIconImage( GuiUtils.HELPER_ICON_BIG.getImage() );
 		frame.getContentPane().add( panel );
 		frame.setSize( 800, 400 );
 		frame.setLocationRelativeTo( null );

src/main/java/fiji/plugin/trackmate/helper/model/ParameterSweepModelIO.java

@@ -47,14 +47,14 @@
 import com.google.gson.JsonSerializer;
 
 import fiji.plugin.trackmate.detection.SpotDetectorFactoryBase;
-import fiji.plugin.trackmate.gui.Icons;
 import fiji.plugin.trackmate.helper.model.detector.DetectorSweepModel;
 import fiji.plugin.trackmate.helper.model.parameter.AbstractArrayParamSweepModel.ArrayRangeType;
 import fiji.plugin.trackmate.helper.model.parameter.AbstractParamSweepModel;
 import fiji.plugin.trackmate.helper.model.parameter.AbstractParamSweepModelIO;
 import fiji.plugin.trackmate.helper.model.parameter.EnumParamSweepModel;
 import fiji.plugin.trackmate.helper.model.parameter.InfoParamSweepModel;
 import fiji.plugin.trackmate.helper.model.tracker.TrackerSweepModel;
+import fiji.plugin.trackmate.helper.ui.components.GuiUtils;
 import fiji.plugin.trackmate.providers.DetectorProvider;
 import fiji.plugin.trackmate.providers.TrackerProvider;
 import fiji.plugin.trackmate.tracking.SpotTrackerFactory;
@@ -131,7 +131,7 @@ public static ParameterSweepModel readFrom( final File modelFile )
 					+ " "
 					+ modelFile;
 			final String title = "TrackMate-Helper error";
-			JOptionPane.showMessageDialog( null, msg, title, JOptionPane.ERROR_MESSAGE, Icons.TRACKMATE_ICON );
+			JOptionPane.showMessageDialog( null, msg, title, JOptionPane.ERROR_MESSAGE, GuiUtils.HELPER_ICON );
 			e.printStackTrace();
 		}
 		catch ( final FileNotFoundException e )

src/main/java/fiji/plugin/trackmate/helper/ui/ParameterSweepController.java

@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -29,12 +29,12 @@
 
 import org.scijava.Cancelable;
 
-import fiji.plugin.trackmate.gui.Icons;
 import fiji.plugin.trackmate.helper.HelperRunner;
 import fiji.plugin.trackmate.helper.HelperRunner.Builder;
 import fiji.plugin.trackmate.helper.ResultsCrawler;
 import fiji.plugin.trackmate.helper.model.ParameterSweepModel;
 import fiji.plugin.trackmate.helper.model.ParameterSweepModelIO;
+import fiji.plugin.trackmate.helper.ui.components.GuiUtils;
 import fiji.plugin.trackmate.util.EverythingDisablerAndReenabler;
 import ij.ImagePlus;
 
@@ -79,7 +79,7 @@ public void windowClosing( final java.awt.event.WindowEvent e )
 				crawler.stopWatching();
 			}
 		} );
-		frame.setIconImage( Icons.TRACKMATE_ICON.getImage() );
+		frame.setIconImage( GuiUtils.HELPER_ICON_BIG.getImage() );
 		frame.getContentPane().add( gui );
 		frame.setSize( 600, 700 );
 		frame.setLocationRelativeTo( null );
@@ -97,7 +97,7 @@ private void resetParameters()
 				+ "<p>"
 				+ "and relaunching this user interface. Are you sure?";
 		final String title = "Reset parameters";
-		final int answer = JOptionPane.showConfirmDialog( frame, toHtml( msg ), title, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, Icons.TRACKMATE_ICON );
+		final int answer = JOptionPane.showConfirmDialog( frame, toHtml( msg ), title, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, GuiUtils.HELPER_ICON );
 		if ( answer != JOptionPane.YES_OPTION )
 			return;
 
@@ -108,7 +108,7 @@ private void resetParameters()
 		if ( file.exists() )
 		{
 			final String msg2 = "Could not delete the file: " + file;
-			JOptionPane.showMessageDialog( frame, toHtml( msg2 ), title, JOptionPane.ERROR_MESSAGE, Icons.TRACKMATE_ICON );
+			JOptionPane.showMessageDialog( frame, toHtml( msg2 ), title, JOptionPane.ERROR_MESSAGE, GuiUtils.HELPER_ICON );
 			return;
 		}
 
@@ -132,7 +132,7 @@ private void resetParameters()
 		if ( newRunner == null )
 		{
 			final String msg3 = builder.getErrorMessage();
-			JOptionPane.showMessageDialog( frame, toHtml( msg3 ), title, JOptionPane.ERROR_MESSAGE, Icons.TRACKMATE_ICON );
+			JOptionPane.showMessageDialog( frame, toHtml( msg3 ), title, JOptionPane.ERROR_MESSAGE, GuiUtils.HELPER_ICON );
 			return;
 		}
 

src/main/java/fiji/plugin/trackmate/helper/ui/components/GuiUtils.java

@@ -32,6 +32,8 @@ public class GuiUtils
 
 	public static final ImageIcon HELPER_ICON = new ImageIcon( GuiUtils.class.getResource( "/images/TrackMate-Helper-logo-64px.png" ) );
 
+	public static final ImageIcon HELPER_ICON_BIG = new ImageIcon( GuiUtils.class.getResource( "/images/TrackMate-Helper-logo.png" ) );
+
 	public static void changeFont( final Component component, final Font font )
 	{
 		component.setFont( font );