[Arianne-commits] stendhal/src/games/stendhal/client/gui StendhalFirstScreen.java, 1.86, 1.87

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8153/src/games/stendhal/client/gui

Modified Files:
	StendhalFirstScreen.java 
Log Message:
Changed to use Actions


Index: StendhalFirstScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/StendhalFirstScreen.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** StendhalFirstScreen.java	28 Jul 2013 11:12:41 -0000	1.86
--- StendhalFirstScreen.java	28 Jul 2013 12:53:58 -0000	1.87
***************
*** 30,34 ****
  import java.awt.PointerInfo;
  import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
  import java.awt.event.KeyEvent;
  import java.awt.event.WindowAdapter;
--- 30,33 ----
***************
*** 36,39 ****
--- 35,40 ----
  import java.net.URL;
  
+ import javax.swing.AbstractAction;
+ import javax.swing.Action;
  import javax.swing.ImageIcon;
  import javax.swing.JButton;
***************
*** 110,114 ****
  			{
  				setOpaque(true);
! 				setPreferredSize(new Dimension(640, 480));
  			}
  
--- 111,115 ----
  			{
  				setOpaque(true);
! 				setPreferredSize(new Dimension(background.getWidth(this), background.getHeight(this)));
  			}
  
***************
*** 122,183 ****
  
  		//
! 		// loginButton
  		//
  		loginButton = new JButton();
  		loginButton.setFont(font);
- 		loginButton.setText("Login to "
- 				+ ClientGameConfiguration.get("GAME_NAME"));
- 		loginButton.setMnemonic(KeyEvent.VK_L);
- 		loginButton.setToolTipText("Press this button to login to a "
- 				+ ClientGameConfiguration.get("GAME_NAME") + " server");
- 		loginButton.addActionListener(new ActionListener() {
  
- 			@Override
- 			public void actionPerformed(final ActionEvent e) {
- 				login();
- 			}
- 		});
  		//
! 		// createAccountButton
  		//
! 		createAccountButton = new JButton();
! 		createAccountButton.setFont(font);
! 		createAccountButton.setText("Create an account");
! 		createAccountButton.setMnemonic(KeyEvent.VK_A);
! 		createAccountButton.setToolTipText("Press this button to create an account on a "
! 				+ ClientGameConfiguration.get("GAME_NAME") + " server.");
! 		createAccountButton.setEnabled(true);
! 		createAccountButton.addActionListener(new ActionListener() {
  			@Override
! 			public void actionPerformed(final ActionEvent e) {
! 				createAccount();
  			}
! 		});
  		//
! 		// creaditButton
  		//
! 		helpButton = new JButton();
! 		helpButton.setFont(font);
! 		helpButton.setText("Help");
! 		helpButton.setMnemonic(KeyEvent.VK_H);
! 		helpButton.addActionListener(new ActionListener() {
  			@Override
! 			public void actionPerformed(final ActionEvent e) {
! 				showHelp();
  			}
! 		});
  		//
! 		// creaditButton
  		//
! 		creditButton = new JButton();
! 		creditButton.setFont(font);
! 		creditButton.setText("Credits");
! 		creditButton.setMnemonic(KeyEvent.VK_C);
! 		creditButton.addActionListener(new ActionListener() {
  			@Override
! 			public void actionPerformed(final ActionEvent e) {
! 				showCredits();
  			}
! 		});
  
  		addWindowListener(new WindowAdapter() {
--- 123,189 ----
  
  		//
! 		// Login
  		//
+ 		Action loginAction = new AbstractAction("Login to "
+ 				+ ClientGameConfiguration.get("GAME_NAME")) {
+ 			@Override
+ 			public void actionPerformed(ActionEvent e) {
+ 				new LoginDialog(StendhalFirstScreen.this, client).setVisible(true);
+ 			}
+ 		};
+ 		loginAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_L);
+ 		loginAction.putValue(Action.SHORT_DESCRIPTION, "Press this button to login to a "
+ 				+ ClientGameConfiguration.get("GAME_NAME") + " server");
+ 		
  		loginButton = new JButton();
+ 		loginButton.setAction(loginAction);
  		loginButton.setFont(font);
  
  		//
! 		// Create account
  		//
! 		Action createAccountAction = new AbstractAction("Create an account") {
  			@Override
! 			public void actionPerformed(ActionEvent e) {
! 				new CreateAccountDialog(StendhalFirstScreen.this, client);
  			}
! 		};
! 		createAccountAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A);
! 		createAccountAction.putValue(Action.SHORT_DESCRIPTION, "Press this button to create an account on a "
! 				+ ClientGameConfiguration.get("GAME_NAME") + " server.");
! 		
! 		createAccountButton = new JButton();
! 		createAccountButton.setFont(font);
! 		createAccountButton.setAction(createAccountAction);
! 
  		//
! 		// Help
  		//
! 		Action helpAction = new AbstractAction("Help") {
  			@Override
! 			public void actionPerformed(ActionEvent e) {
! 				BareBonesBrowserLaunch.openURL("http://stendhalgame.org/wiki/Stendhal_Manual");
  			}
! 		};
! 		helpAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_H);
! 		
! 		helpButton = new JButton();
! 		helpButton.setFont(font);
! 		helpButton.setAction(helpAction);
! 
  		//
! 		// Credits
  		//
! 		Action showCreditsAction = new AbstractAction("Credits") {
  			@Override
! 			public void actionPerformed(ActionEvent e) {
! 				new CreditsDialog(StendhalFirstScreen.this);
  			}
! 		};
! 		showCreditsAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_C);
! 
! 		creditButton = new JButton();
! 		creditButton.setFont(font);
! 		creditButton.setAction(showCreditsAction);
  
  		addWindowListener(new WindowAdapter() {
***************
*** 208,212 ****
  				+ stendhal.VERSION
  				+ " - a multiplayer online game using Arianne");
! 		this.setResizable(false);
  
  		final URL url = DataLoader.getResource(ClientGameConfiguration.get("GAME_ICON"));
--- 214,218 ----
  				+ stendhal.VERSION
  				+ " - a multiplayer online game using Arianne");
! 		setResizable(false);
  
  		final URL url = DataLoader.getResource(ClientGameConfiguration.get("GAME_ICON"));
***************
*** 224,246 ****
  	}
  
- 	private void login() {
- 		new LoginDialog(StendhalFirstScreen.this, client).setVisible(true);
- 	}
- 
- 	private void showCredits() {
- 		new CreditsDialog(StendhalFirstScreen.this);
- 	}
- 
- 	private void showHelp() {
- 		BareBonesBrowserLaunch.openURL("http://stendhalgame.org/wiki/Stendhal_Manual");
- 	}
- 
- 	/**
- 	 * Opens the create account dialog after checking the server version.
- 	 */
- 	private void createAccount() {
- 		new CreateAccountDialog(StendhalFirstScreen.this, client);
- 	}
- 
  	/** Adds Component Without a Layout Manager (Absolute Positioning).
  	 * @param container
--- 230,233 ----
***************
*** 255,258 ****
  		container.add(c);
  	}
- 
  }
--- 242,244 ----