github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some name changes MAGE to XMage.

Browse source
This commit is contained in:
LevelX2 2014-05-27 00:14:51 +02:00
parent 1a4ed7223c
commit 5481841b9f
6 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -168,7 +168,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
*/ */
public MageFrame() { public MageFrame() {
setTitle("Mage, version " + version); setTitle("XMage, version " + version);
clientId = UUID.randomUUID(); clientId = UUID.randomUUID();
EDTExceptionHandler.registerExceptionHandler(); EDTExceptionHandler.registerExceptionHandler();

5
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
View file

@ -2,7 +2,8 @@
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo"> <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
<Properties> <Properties>
<Property name="title" type="java.lang.String" value="About MAGE"/> <Property name="maximizable" type="boolean" value="true"/>
<Property name="title" type="java.lang.String" value="About XMage"/>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@ -71,7 +72,7 @@
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel1"> <Component class="javax.swing.JLabel" name="jLabel1">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="MAGE client"/> <Property name="text" type="java.lang.String" value="XMage client"/>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="lblVersion"> <Component class="javax.swing.JLabel" name="lblVersion">

5
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
View file

@ -74,7 +74,8 @@ public class AboutDialog extends MageDialog {
jLabel3 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel();
jLabel4 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel();
setTitle("About MAGE"); setMaximizable(true);
setTitle("About XMage");
btnOk.setText("OK"); btnOk.setText("OK");
btnOk.addActionListener(new java.awt.event.ActionListener() { btnOk.addActionListener(new java.awt.event.ActionListener() {
@ -83,7 +84,7 @@ public class AboutDialog extends MageDialog {
} }
}); });
jLabel1.setText("MAGE client"); jLabel1.setText("XMage client");
lblVersion.setText("0.0.0"); lblVersion.setText("0.0.0");

17
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form
View file

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo"> <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
<Properties> <Properties>
@ -36,10 +36,6 @@
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="txtPort" min="-2" pref="71" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="131" max="-2" attributes="0"/>
</Group>
<Component id="txtUserName" alignment="0" pref="382" max="32767" attributes="0"/> <Component id="txtUserName" alignment="0" pref="382" max="32767" attributes="0"/>
<Component id="chkAutoConnect" alignment="0" pref="382" max="32767" attributes="0"/> <Component id="chkAutoConnect" alignment="0" pref="382" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
@ -47,7 +43,13 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/> <Component id="jButton1" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Component id="jProxySettingsButton" alignment="0" min="-2" max="-2" attributes="0"/> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="txtPort" alignment="0" min="-2" pref="71" max="-2" attributes="0"/>
<Component id="jProxySettingsButton" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group> </Group>
</Group> </Group>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
@ -91,14 +93,13 @@
<Component id="btnCancel" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnCancel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btnConnect" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnConnect" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="8" max="-2" attributes="0"/> <EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
<Component id="lblStatus" min="-2" max="-2" attributes="0"/> <Component id="lblStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

2
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
View file

@ -424,7 +424,7 @@ public class ConnectDialog extends MageDialog {
} }
String selectedServer = (String) JOptionPane.showInputDialog(null, String selectedServer = (String) JOptionPane.showInputDialog(null,
"Choose MAGE Public Server:", "Input", "Choose XMage Public Server:", "Input",
JOptionPane.INFORMATION_MESSAGE, null, servers.toArray(), JOptionPane.INFORMATION_MESSAGE, null, servers.toArray(),
servers.get(0)); servers.get(0));
if (selectedServer != null) { if (selectedServer != null) {

2
Utils/mtg-sets-data.txt
View file

@ -85,11 +85,11 @@ Ninth Edition|9ED|
Nemesis|NMS| Nemesis|NMS|
Odyssey|ODY| Odyssey|ODY|
Onslaught|ONS| Onslaught|ONS|
Portal Second Age|PO2|
Prophecy|PCY| Prophecy|PCY|
Planar Chaos|PLC| Planar Chaos|PLC|
Planeshift|PLS| Planeshift|PLS|
Portal|POR| Portal|POR|
Portal Second Age|PO2|
Portal Three Kingdoms|PTK| Portal Three Kingdoms|PTK|
Premium Deck Series: Fire and Lightning|PD2| Premium Deck Series: Fire and Lightning|PD2|
Premium Deck Series: Slivers|PDS| Premium Deck Series: Slivers|PDS|