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

* Client - Fixed that saying "No" to confirm close didn't stop closing the client.

Browse source
This commit is contained in:
LevelX2 2014-05-14 18:45:11 +02:00
parent fc490b4e9e
commit f19d4910d0
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,13 +2,14 @@
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo"> <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties> <Properties>
<Property name="defaultCloseOperation" type="int" value="3"/> <Property name="defaultCloseOperation" type="int" value="0"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1024, 768]"/> <Dimension value="[1024, 768]"/>
</Property> </Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties> </SyntheticProperties>
<AuxValues> <AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
@ -51,7 +52,9 @@
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="10"/> <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="10"/>
</AuxValues> </AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
<Property name="useNullLayout" type="boolean" value="true"/>
</Layout>
</Container> </Container>
<Container class="javax.swing.JToolBar" name="mageToolbar"> <Container class="javax.swing.JToolBar" name="mageToolbar">
<Properties> <Properties>

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

@ -744,7 +744,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
jSeparator8 = new javax.swing.JToolBar.Separator(); jSeparator8 = new javax.swing.JToolBar.Separator();
lblStatus = new javax.swing.JLabel(); lblStatus = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
setMinimumSize(new java.awt.Dimension(1024, 768)); setMinimumSize(new java.awt.Dimension(1024, 768));
desktopPane.setBackground(new java.awt.Color(204, 204, 204)); desktopPane.setBackground(new java.awt.Color(204, 204, 204));
@ -949,6 +949,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
System.exit(0); System.exit(0);
} }
@Override
public void reconnect() { public void reconnect() {
session.disconnect(false); session.disconnect(false);
tablesPane.clearChat(); tablesPane.clearChat();