Skip to content
Snippets Groups Projects
Commit 32e4ae48 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

Better splash and icons management

parent 94e54f69
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ import java.util.List; ...@@ -23,7 +23,6 @@ import java.util.List;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.ImageIcon;
import javax.swing.JCheckBoxMenuItem; import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
...@@ -136,11 +135,11 @@ public class DataBrowser extends JPanel { ...@@ -136,11 +135,11 @@ public class DataBrowser extends JPanel {
private final BasicBooleanTargetController booleanScalarController; private final BasicBooleanTargetController booleanScalarController;
private final MarkerEnabledMenuItem markerEnabledMenuItem; private final MarkerEnabledMenuItem markerEnabledMenuItem;
public static final Splash SPLASH = new Splash( public static final Splash SPLASH;
new ImageIcon(DataBrowser.class.getResource("DataBrowserSplash.jpg")), Color.WHITE); static {
{ SPLASH = new Splash(ICONS.getIcon("Application.Splash"), Color.BLACK);
SPLASH.setTitle("DataBrowser"); SPLASH.setTitle("DataBrowser");
SPLASH.setCopyright("(c) Synchrotron Soleil 2012"); SPLASH.setCopyright("\u00a9 SOLEIL Synchrotron");
SPLASH.setMessage("Starting application..."); SPLASH.setMessage("Starting application...");
SPLASH.progress(0); SPLASH.progress(0);
SPLASH.setAlwaysOnTop(true); SPLASH.setAlwaysOnTop(true);
......
Application.Icon.16 = org/cdma/gui/databrowser/icons/cow16.png Application.Icon.16 = org/cdma/gui/databrowser/icons/cow16.png
Application.Icon.24 = org/cdma/gui/databrowser/icons/cow24.png Application.Icon.24 = org/cdma/gui/databrowser/icons/cow24.png
Application.Icon.32 = org/cdma/gui/databrowser/icons/cow32.png Application.Icon.32 = org/cdma/gui/databrowser/icons/cow32.png
Application.Splash = org/cdma/gui/databrowser/icons/splash-11986-2.png
View.Tree = org/cdma/gui/databrowser/icons/tree.gif View.Tree = org/cdma/gui/databrowser/icons/tree.gif
View.DisplayManager = com/famfamfam/silk/table.png View.DisplayManager = com/famfamfam/silk/table.png
......
databrowser-gui/src/main/resources/org/cdma/gui/databrowser/icons/splash-11986-2.png

640 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment