Changeset 1048 in josm for trunk/src

Timestamp:

2008-10-21T20:44:31+02:00 (16 years ago)

Author:

cbrill

Message:

fix bug #1655 (disable splash screen)

Patch by mcdmx@…

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• SplashScreen.java (modified) (3 diffs)
• preferences/DrawingPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -122 +122 @@
                 }
 
-                SplashScreen splash = new SplashScreen();
-                splash.setStatus(tr("Reading preferences"));
                 // get the preferences.
                 final File prefDir = new File(Main.pref.getPreferencesDir());
@@ -161 +159 @@
                         Main.pref.save();
                 }
+                SplashScreen splash = new SplashScreen(Main.pref.getBoolean("draw.splashscreen", true));
+
                 String language = null;
                 if(args.containsKey("language"))

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -34 +34 @@
 
         private JLabel status;
+        private boolean visible;
 
         private Runnable closerRunner;
 
-        public SplashScreen() {
+        public SplashScreen(boolean visible) {
                 super();
+                this.visible=visible;
+
+                if (!visible)
+                        return;
 
                 // Add a nice border to the main splash screen
@@ -126 +131 @@
          */
         public void setStatus(String message) {
+                if (!visible)
+                        return;
                 status.setText(message + " ...");
         }
@@ -133 +140 @@
          */
         public void closeSplash() {
+                if (!visible)
+                        return;
                 try {
                         SwingUtilities.invokeAndWait(closerRunner);

trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

@@ -30 +30 @@
         private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
         private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
+        private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
 
         public void addGui(PreferenceDialog gui) {
@@ -132 +133 @@
                 inactive.setSelected(Main.pref.getBoolean("draw.data.inactive_color", true));
                 gui.display.add(inactive, GBC.eop().insets(20,0,0,0));
+
+                // Show splash screen on startup
+                showSplashScreen.setToolTipText(tr("Show splash screen at startup"));
+                showSplashScreen.setSelected(Main.pref.getBoolean("draw.splashscreen", true));
+                gui.display.add(showSplashScreen, GBC.eop().insets(20, 0, 0, 0));
         }
 
@@ -148 +154 @@
                 Main.pref.put("draw.data.inactive_color", inactive.isSelected());
                 Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
+                Main.pref.put("draw.splashscreen", showSplashScreen.isSelected());
                 int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
                 if(virtualNodes.isSelected()) { if (vn < 1) vn = 8; }