From 1b9f46f48216df8d4c51914e58c4118eb6560791 Mon Sep 17 00:00:00 2001 From: Patryk Rus Date: Tue, 8 Dec 2015 21:30:49 -0500 Subject: [PATCH] Look I maded a new label --- .../i18n/megamek/client/messages.properties | 1 + MegaMek/mmconf/clientsettings.xml | 14 +++++++------ .../client/ui/swing/ConnectDialog.java | 21 ++++++++++++++++++- .../common/preference/ClientPreferences.java | 9 ++++++++ .../common/preference/IClientPreferences.java | 5 +++++ 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/MegaMek/i18n/megamek/client/messages.properties b/MegaMek/i18n/megamek/client/messages.properties index f3139e16..eab74880 100644 --- a/MegaMek/i18n/megamek/client/messages.properties +++ b/MegaMek/i18n/megamek/client/messages.properties @@ -2118,6 +2118,7 @@ MegaMek.serverPassL=Server Password: MegaMek.metaserverL=Serverbrowser URL: MegaMek.registerC=Register Game MegaMek.serverAddrL=Server Address: +MegaMek.ConnectAsInvis=Connect as invisible? MegaMek.welcome.message=MegaMek is a complex application -- if you ever need any help you\r\nshould start by reading the documentation, accessible through the\r\nHelp menu.\n\ \nWould you like to view the documentation now?\n MegaMek.hostNewGame.label=Start a New Game... MegaMek.hostScenario.label=Start a Scenario... diff --git a/MegaMek/mmconf/clientsettings.xml b/MegaMek/mmconf/clientsettings.xml index f9ff42f1..555c1ef6 100644 --- a/MegaMek/mmconf/clientsettings.xml +++ b/MegaMek/mmconf/clientsettings.xml @@ -1,19 +1,21 @@ - + - - + + + - - - + + + + diff --git a/MegaMek/src/megamek/client/ui/swing/ConnectDialog.java b/MegaMek/src/megamek/client/ui/swing/ConnectDialog.java index 0d91cbec..120af670 100644 --- a/MegaMek/src/megamek/client/ui/swing/ConnectDialog.java +++ b/MegaMek/src/megamek/client/ui/swing/ConnectDialog.java @@ -26,13 +26,16 @@ public class ConnectDialog extends JDialog implements ActionListener { private static final long serialVersionUID = 5895056240077042429L; public String playerName; public String serverAddr; + public String spectateValue; public int port; private JLabel yourNameL; private JLabel serverAddrL; private JLabel portL; + private JLabel SpectateConnectL; private JTextField yourNameF; private JTextField serverAddrF; private JTextField portF; + private JTextField SpectateConnectF; private JButton okayB; private JButton cancelB; @@ -44,6 +47,8 @@ public ConnectDialog(JFrame frame) { Messages.getString("MegaMek.serverAddrL"), SwingConstants.RIGHT); //$NON-NLS-1$ portL = new JLabel( Messages.getString("MegaMek.portL"), SwingConstants.RIGHT); //$NON-NLS-1$ + SpectateConnectL = new JLabel( + Messages.getString("MegaMek.ConnectAsInvis"), SwingConstants.RIGHT); //$NON-NLS-1$ yourNameF = new JTextField(PreferenceManager.getClientPreferences() .getLastPlayerName(), 16); yourNameF.addActionListener(this); @@ -54,6 +59,9 @@ public ConnectDialog(JFrame frame) { .getLastConnectPort() + "", 4); //$NON-NLS-1$ portF.addActionListener(this); + SpectateConnectF = new JTextField(PreferenceManager.getClientPreferences() + .getSpectateConnect(), 16); + SpectateConnectF.addActionListener(this); okayB = new JButton(Messages.getString("Okay")); //$NON-NLS-1$ okayB.setActionCommand("done"); //$NON-NLS-1$ okayB.addActionListener(this); @@ -68,7 +76,7 @@ public ConnectDialog(JFrame frame) { c.fill = GridBagConstraints.NONE; c.weightx = 0.0; c.weighty = 0.0; - c.insets = new Insets(5, 5, 5, 5); + c.insets = new Insets(6, 6, 6, 6); c.gridwidth = 1; c.anchor = GridBagConstraints.EAST; gridbag.setConstraints(yourNameL, c); @@ -93,6 +101,14 @@ public ConnectDialog(JFrame frame) { c.anchor = GridBagConstraints.WEST; gridbag.setConstraints(portF, c); getContentPane().add(portF); + c.gridwidth = 1; + c.anchor = GridBagConstraints.EAST; + gridbag.setConstraints(SpectateConnectL, c); + getContentPane().add(SpectateConnectL); + c.gridwidth = GridBagConstraints.REMAINDER; + c.anchor = GridBagConstraints.WEST; + gridbag.setConstraints(SpectateConnectF, c); + getContentPane().add(SpectateConnectF); c.ipadx = 20; c.ipady = 5; c.gridwidth = 1; @@ -114,6 +130,7 @@ public void actionPerformed(ActionEvent e) { try { playerName = yourNameF.getText(); serverAddr = serverAddrF.getText(); + spectateValue = SpectateConnectF.getText(); port = Integer.decode(portF.getText().trim()).intValue(); } catch (NumberFormatException ex) { System.err.println(ex.getMessage()); @@ -125,6 +142,8 @@ public void actionPerformed(ActionEvent e) { PreferenceManager.getClientPreferences().setLastConnectAddr( serverAddr); PreferenceManager.getClientPreferences().setLastConnectPort(port); + + PreferenceManager.getClientPreferences().setSpectateConnect(spectateValue); } setVisible(false); } diff --git a/MegaMek/src/megamek/common/preference/ClientPreferences.java b/MegaMek/src/megamek/common/preference/ClientPreferences.java index 41e0eb0a..1f9380b8 100644 --- a/MegaMek/src/megamek/common/preference/ClientPreferences.java +++ b/MegaMek/src/megamek/common/preference/ClientPreferences.java @@ -35,6 +35,7 @@ class ClientPreferences extends PreferenceStoreProxy implements store.setDefault(MAX_PATHFINDER_TIME, MovePath.DEFAULT_PATHFINDER_TIME_LIMIT); store.setDefault(DATA_DIRECTORY, "data"); + store.setDefault(SPECTATE_CONNECT, "No"); store.setDefault(LOG_DIRECTORY, "logs"); store.setDefault(MECH_DIRECTORY, store.getDefaultString(DATA_DIRECTORY) + File.separator + "mechfiles"); @@ -90,6 +91,10 @@ public int getLastConnectPort() { public String getLastPlayerName() { return store.getString(LAST_PLAYER_NAME); } + + public String getSpectateConnect() { + return store.getString(SPECTATE_CONNECT); + } public String getLastServerPass() { return store.getString(LAST_SERVER_PASS); @@ -218,6 +223,10 @@ public void setLastPlayerColor(int colorIndex) { public void setLastPlayerName(String name) { store.setValue(LAST_PLAYER_NAME, name); } + + public void setSpectateConnect(String Value) { + store.setValue(SPECTATE_CONNECT, Value); + } public void setLastServerPass(String serverPass) { store.setValue(LAST_SERVER_PASS, serverPass); diff --git a/MegaMek/src/megamek/common/preference/IClientPreferences.java b/MegaMek/src/megamek/common/preference/IClientPreferences.java index 5eceef58..84702c10 100644 --- a/MegaMek/src/megamek/common/preference/IClientPreferences.java +++ b/MegaMek/src/megamek/common/preference/IClientPreferences.java @@ -28,6 +28,7 @@ public interface IClientPreferences extends IPreferenceStore { public static final String LAST_PLAYER_CATEGORY = "LastPlayerCategory"; public static final String LAST_PLAYER_COLOR = "LastPlayerColor"; public static final String LAST_PLAYER_NAME = "LastPlayerName"; + public static final String SPECTATE_CONNECT = "SpectateConnect"; public static final String LAST_SERVER_PASS = "LastServerPass"; public static final String LAST_SERVER_PORT = "LastServerPort"; public static final String LOCALE = "Locale"; @@ -72,6 +73,8 @@ public interface IClientPreferences extends IPreferenceStore { String getLastPlayerName(); + String getSpectateConnect(); + String getLastServerPass(); int getLastServerPort(); @@ -138,6 +141,8 @@ public interface IClientPreferences extends IPreferenceStore { void setLastPlayerName(String name); + void setSpectateConnect(String Value); + void setLastServerPass(String serverPass); void setLastServerPort(int port);