Index: src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- src/org/openstreetmap/josm/gui/GettingStarted.java (revision 1353)
+++ src/org/openstreetmap/josm/gui/GettingStarted.java (working copy)
@@ -189,10 +189,14 @@
public GettingStarted() {
super(new BorderLayout());
- final LinkGeneral lg = new LinkGeneral(tr("Download \"Message of the day\""));
+ final LinkGeneral lg = new LinkGeneral(
+ "\n" +
+ "JOSM - " +
+ tr("Java OpenStreetMap Editor") +
+ "
\n" +
+ tr("Downloading \"Message of the day\"") +
+ "
");
JScrollPane scroller = new JScrollPane(lg);
- // panel.add(GBC.glue(0,1), GBC.eol());
- //panel.setMinimumSize(new Dimension(400, 600));
Component linkGeneral = new LinkGeneral(content);
scroller.setViewportBorder(new EmptyBorder(10,100,10,100));
add(scroller, BorderLayout.CENTER);
Index: src/org/openstreetmap/josm/Main.java
===================================================================
--- src/org/openstreetmap/josm/Main.java (revision 1353)
+++ src/org/openstreetmap/josm/Main.java (working copy)
@@ -113,6 +113,11 @@
* The main menu bar at top of screen.
*/
public final MainMenu menu;
+
+ /**
+ * The MOTD Layer.
+ */
+ private GettingStarted gettingStarted=new GettingStarted();
/**
* Print a debug message if debugging is on.
@@ -144,7 +149,7 @@
map.fillPanel(panel);
else {
old.destroy();
- panel.add(new GettingStarted(), BorderLayout.CENTER);
+ panel.add(gettingStarted, BorderLayout.CENTER);
}
panel.setVisible(true);
redoUndoListener.commandChanged(0,0);
@@ -173,8 +178,7 @@
// platform = determinePlatformHook();
platform.startupHook();
contentPane.add(panel, BorderLayout.CENTER);
- if(splash != null) splash.setStatus(tr("Download \"Message of the day\""));
- panel.add(new GettingStarted(), BorderLayout.CENTER);
+ panel.add(gettingStarted, BorderLayout.CENTER);
if(splash != null) splash.setStatus(tr("Creating main GUI"));
menu = new MainMenu();
@@ -273,11 +277,11 @@
UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
- String geometry = Main.pref.get("gui.geometry");
+ String geometry = Main.pref.get("gui.geometry");
if (args.containsKey("geometry")) {
geometry = args.get("geometry").iterator().next();
- }
- if (geometry.length() != 0) {
+ }
+ if (geometry.length() != 0) {
final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(geometry);
if (m.matches()) {
int w = Integer.valueOf(m.group(1));
@@ -292,10 +296,10 @@
y = screenDimension.height - y - h;
}
bounds = new Rectangle(x,y,w,h);
- if(!Main.pref.get("gui.geometry").equals(geometry)) {
- // remember this geometry
- Main.pref.put("gui.geometry", geometry);
- }
+ if(!Main.pref.get("gui.geometry").equals(geometry)) {
+ // remember this geometry
+ Main.pref.put("gui.geometry", geometry);
+ }
} else
System.out.println("Ignoring malformed geometry: "+geometry);
}
@@ -410,16 +414,16 @@
}
static public void saveGuiGeometry() {
- // if the gui.geometry preference is already set,
- // save the current window geometry
- String curGeometryPref = pref.get("gui.geometry");
- if(curGeometryPref.length() != 0) {
- Rectangle bounds = parent.getBounds();
- pref.put("gui.geometry",
- (int)bounds.getWidth() +
- "x" + (int)bounds.getHeight() +
- "+" + (int)bounds.getX() +
- "+" + (int)bounds.getY());
- }
+ // if the gui.geometry preference is already set,
+ // save the current window geometry
+ String curGeometryPref = pref.get("gui.geometry");
+ if(curGeometryPref.length() != 0) {
+ Rectangle bounds = parent.getBounds();
+ pref.put("gui.geometry",
+ (int)bounds.getWidth() +
+ "x" + (int)bounds.getHeight() +
+ "+" + (int)bounds.getX() +
+ "+" + (int)bounds.getY());
+ }
}
}