Author: dbkr
Date: 2006-08-27 01:09:10 +0000 (Sun, 27 Aug 2006)
New Revision: 10275
Modified:
trunk/apps/Freemail/src/freemailgui/SetupWizard.java
trunk/apps/Freemail/src/freemailgui/WizardChooseUsername.java
Log:
Hooray! Sensible layout!
Modified: trunk/apps/Freemail/src/freemailgui/SetupWizard.java
===================================================================
--- trunk/apps/Freemail/src/freemailgui/SetupWizard.java 2006-08-27
00:10:41 UTC (rev 10274)
+++ trunk/apps/Freemail/src/freemailgui/SetupWizard.java 2006-08-27
01:09:10 UTC (rev 10275)
@@ -22,7 +22,7 @@
private JPanel subpanel;
private final JButton backbutton;
private final JButton cancelbutton;
- private final JButton nextbutton;
+ public final JButton nextbutton;
private ResourceBundle bundle;
private final JLabel logolabel;
private int currentstep;
Modified: trunk/apps/Freemail/src/freemailgui/WizardChooseUsername.java
===================================================================
--- trunk/apps/Freemail/src/freemailgui/WizardChooseUsername.java
2006-08-27 00:10:41 UTC (rev 10274)
+++ trunk/apps/Freemail/src/freemailgui/WizardChooseUsername.java
2006-08-27 01:09:10 UTC (rev 10275)
@@ -2,14 +2,16 @@
import javax.swing.JPanel;
import javax.swing.JLabel;
-import javax.swing.BoxLayout;
import javax.swing.SwingConstants;
import javax.swing.BorderFactory;
import javax.swing.Box;
+import javax.swing.JTextField;
+import javax.swing.JPasswordField;
+import java.awt.GridLayout;
+import java.awt.Component;
+import java.awt.Dimension;
import java.awt.GridBagLayout;
import java.awt.GridBagConstraints;
-import javax.swing.JTextField;
-import javax.swing.JPasswordField;
import java.util.ResourceBundle;
@@ -22,67 +24,88 @@
public WizardChooseUsername(ResourceBundle bundle) {
super();
- this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ GridBagLayout gb = new GridBagLayout();
+ GridBagConstraints c = new GridBagConstraints();
+ this.setLayout(gb);
- this.add(Box.createVerticalGlue());
+ JLabel infolabel = new
JLabel(bundle.getString("choose_a_username_and_password"),
SwingConstants.CENTER);
+ infolabel.setAlignmentX(JLabel.CENTER_ALIGNMENT);
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ gb.setConstraints(infolabel, c);
+ this.add(infolabel);
- JLabel welcomelabel = new
JLabel(bundle.getString("choose_a_username_and_password"),
SwingConstants.CENTER);
- welcomelabel.setAlignmentX(JLabel.CENTER_ALIGNMENT);
- this.add(welcomelabel);
+ Component vspacer = Box.createRigidArea(new Dimension(15, 15));
+ gb.setConstraints(vspacer, c);
+ this.add(vspacer);
- JPanel usernamebox = new JPanel();
- usernamebox.setBorder(BorderFactory.createEmptyBorder(30, 30,
30, 30));
- GridBagLayout gb = new GridBagLayout();
- GridBagConstraints c = new GridBagConstraints();
- usernamebox.setLayout(gb);
+ Component lspacer = Box.createRigidArea(new Dimension(15, 15));
+ c.gridwidth = 1;
+ gb.setConstraints(lspacer, c);
+ this.add(lspacer);
JLabel usernamelbl = new JLabel(bundle.getString("username")+":
", SwingConstants.RIGHT);
usernamelbl.setAlignmentX(JLabel.RIGHT_ALIGNMENT);
c.gridwidth = 1;
c.fill = GridBagConstraints.NONE;
c.weightx = 0;
+ c.anchor = GridBagConstraints.EAST;
gb.setConstraints(usernamelbl, c);
- usernamebox.add(usernamelbl);
+ this.add(usernamelbl);
this.usernametext = new JTextField();
- c.gridwidth = GridBagConstraints.REMAINDER;
+ c.gridwidth = 1;
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1;
+ c.gridx = GridBagConstraints.RELATIVE;
gb.setConstraints(this.usernametext, c);
- usernamebox.add(this.usernametext);
+ this.add(this.usernametext);
+
+ Component rspacer = Box.createRigidArea(new Dimension(15, 15));
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.fill = GridBagConstraints.NONE;
+ c.weightx = 0;
+ gb.setConstraints(rspacer, c);
+ this.add(rspacer);
-
JLabel passwordlbl = new JLabel(bundle.getString("password")+":
", SwingConstants.RIGHT);
passwordlbl.setAlignmentX(JLabel.RIGHT_ALIGNMENT);
c.gridwidth = 1;
+ c.gridx = 1;
c.fill = GridBagConstraints.NONE;
c.weightx = 0;
gb.setConstraints(passwordlbl, c);
- usernamebox.add(passwordlbl);
+ this.add(passwordlbl);
this.passwordtext = new JPasswordField();
- c.gridwidth = GridBagConstraints.REMAINDER;
+ c.gridwidth = 1;
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1;
+ c.gridx = GridBagConstraints.RELATIVE;
gb.setConstraints(this.passwordtext, c);
- usernamebox.add(this.passwordtext);
+ this.add(this.passwordtext);
+ Component rspacer1 = Box.createRigidArea(new Dimension(15, 15));
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.fill = GridBagConstraints.NONE;
+ c.weightx = 0;
+ gb.setConstraints(rspacer1, c);
+ this.add(rspacer1);
+
JLabel passwordconfirmlbl = new
JLabel(bundle.getString("confirm_password")+": ", SwingConstants.RIGHT);
passwordconfirmlbl.setAlignmentX(JLabel.LEFT_ALIGNMENT);
c.gridwidth = 1;
+ c.gridx = 1;
c.fill = GridBagConstraints.NONE;
c.weightx = 0;
gb.setConstraints(passwordconfirmlbl, c);
- usernamebox.add(passwordconfirmlbl);
+ this.add(passwordconfirmlbl);
this.passwordconfirmtext = new JPasswordField();
- c.gridwidth = GridBagConstraints.REMAINDER;
+ c.gridwidth = 1;
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1;
+ c.gridx = GridBagConstraints.RELATIVE;
gb.setConstraints(this.passwordconfirmtext, c);
- usernamebox.add(this.passwordconfirmtext);
-
- this.add(usernamebox);
- this.add(Box.createVerticalGlue());
+ this.add(this.passwordconfirmtext);
}
}
