External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI: draft panel - added new timer (bigger size, diff color), migrated form structure to layout managers;

Browse source
This commit is contained in:
Oleg Agafonov 2023-12-15 13:03:09 +04:00
parent 2541f67793
commit c10ed215ab
3 changed files with 621 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage.Client/src/main/java/mage/client/draft/DraftGrid.java
View file

@ -46,7 +46,18 @@ public class DraftGrid extends javax.swing.JPanel implements CardEventProducer {
// ENABLE picks and other actions // ENABLE picks and other actions
cardEventSource.addListener(event -> { cardEventSource.addListener(event -> {
if (this.parentPanel == null) { if (this.parentPanel == null) {
this.parentPanel = (DraftPanel) this.getParent(); // find draft panel
DraftPanel found = null;
for(Component p = this; p != null; p = p.getParent()) {
if (p instanceof DraftPanel) {
found = (DraftPanel) p;
}
}
if (found != null) {
this.parentPanel = found;
} else {
throw new IllegalArgumentException("Wrong code usage: can't find DraftPanel from a DraftGrid - check form structure.");
}
} }
if (event.getEventType() == ClientEventType.CARD_DOUBLE_CLICK if (event.getEventType() == ClientEventType.CARD_DOUBLE_CLICK

543
Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <Form version="1.2" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents> <NonVisualComponents>
<Component class="javax.swing.JSeparator" name="jSeparator1"> <Component class="javax.swing.JSeparator" name="jSeparator1">
</Component> </Component>
@ -21,34 +21,23 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="panelInfo" min="-2" max="-2" attributes="0"/> <Component id="panelLeft" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Component id="panelRight" max="32767" attributes="0"/>
<Component id="draftPicks" pref="740" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="draftBooster" alignment="0" max="32767" attributes="0"/>
</Group>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="panelInfo" alignment="1" max="32767" attributes="0"/> <Component id="panelLeft" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Component id="panelRight" max="32767" attributes="0"/>
<Component id="draftPicks" pref="0" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="draftBooster" min="-2" max="-2" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="panelInfo"> <Container class="javax.swing.JPanel" name="panelLeft">
<Properties> <Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo">
<BevelBorder/>
</Border>
</Property>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -58,208 +47,248 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" 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="panelCommands" alignment="0" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <Component id="panelInfo" alignment="0" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Component id="panelPacks" alignment="0" max="32767" attributes="0"/>
<Component id="labelCardNumber" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="panelBigCard" pref="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Component id="panelPlayers" max="32767" attributes="0"/>
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Group type="102" alignment="0" attributes="1">
<Component id="labelPack2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="editPack2" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="labelPack1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="editPack1" min="-2" pref="165" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="labelPack3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="editCardNumber" alignment="0" max="32767" attributes="0"/>
<Component id="editPack3" alignment="0" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkPack3" min="-2" max="-2" attributes="0"/>
<Component id="checkPack2" min="-2" max="-2" attributes="0"/>
<Component id="checkPack1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="buttonQuitTournament" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="editTimeRemaining" min="-2" pref="94" max="-2" attributes="0"/>
</Group>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="panelPlayers" alignment="0" max="32767" attributes="0"/>
<Component id="labelMessage" alignment="0" pref="231" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
<Component id="bigCard" alignment="1" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0"> <Component id="panelCommands" min="-2" max="-2" attributes="0"/>
<Component id="buttonQuitTournament" alignment="3" min="-2" max="-2" attributes="0"/> <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="editTimeRemaining" alignment="3" min="-2" pref="20" max="-2" attributes="0"/> <Component id="panelInfo" min="-2" pref="83" max="-2" attributes="0"/>
</Group> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="panelPacks" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Component id="panelPlayers" min="-2" max="-2" attributes="0"/>
<Component id="checkPack1" alignment="0" min="-2" max="-2" attributes="0"/> <EmptySpace pref="112" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Component id="panelBigCard" min="-2" pref="285" max="-2" attributes="0"/>
<Component id="labelPack1" alignment="3" min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="editPack1" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelPack2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="editPack2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="checkPack2" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelPack3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="editPack3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="checkPack3" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelCardNumber" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="editCardNumber" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="labelMessage" min="-2" pref="20" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="panelPlayers" min="-2" pref="148" max="-2" attributes="0"/>
<EmptySpace pref="55" max="32767" attributes="0"/>
<Component id="bigCard" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JButton" name="buttonQuitTournament"> <Container class="javax.swing.JPanel" name="panelCommands">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Quit Tournament"/> <Property name="opaque" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/>
</Properties> </Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonQuitTournamentActionPerformed"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
</Events> <SubComponents>
</Component> <Component class="javax.swing.JButton" name="buttonQuitTournament">
<Component class="javax.swing.JLabel" name="labelPack1"> <Properties>
<Property name="text" type="java.lang.String" value="Quit Tournament"/>
<Property name="focusable" type="boolean" value="false"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonQuitTournamentActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelInfo">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Pack 1:"/> <Property name="opaque" type="boolean" value="false"/>
</Properties> </Properties>
</Component>
<Component class="javax.swing.JTextField" name="editPack1"> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<Properties> <SubComponents>
<Property name="editable" type="boolean" value="false"/> <Component class="javax.swing.JTextField" name="editTimeRemaining">
<Property name="enabled" type="boolean" value="false"/> <Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="editable" type="boolean" value="false"/>
<Dimension value="[130, 22]"/> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
</Property> <Font name="Tahoma" size="36" style="0"/>
</Properties> </Property>
</Component> <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Component class="javax.swing.JCheckBox" name="checkPack1"> <Color blue="0" green="0" id="red" palette="1" red="ff" type="palette"/>
</Component> </Property>
<Component class="javax.swing.JLabel" name="labelPack2"> <Property name="horizontalAlignment" type="int" value="0"/>
<Properties> <Property name="text" type="java.lang.String" value="WAITING"/>
<Property name="text" type="java.lang.String" value="Pack 2:"/> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
</Properties> <Border info="null"/>
</Component> </Property>
<Component class="javax.swing.JTextField" name="editPack2"> <Property name="focusable" type="boolean" value="false"/>
<Properties> <Property name="opaque" type="boolean" value="false"/>
<Property name="editable" type="boolean" value="false"/> </Properties>
<Property name="enabled" type="boolean" value="false"/> <Constraints>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<Dimension value="[130, 22]"/> <BorderConstraints direction="Center"/>
</Property> </Constraint>
</Properties> </Constraints>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="checkPack2"> <Component class="javax.swing.JLabel" name="labelMessage">
</Component> <Properties>
<Component class="javax.swing.JLabel" name="labelPack3"> <Property name="horizontalAlignment" type="int" value="0"/>
<Properties> <Property name="text" type="java.lang.String" value="Waiting start of the draft..."/>
<Property name="text" type="java.lang.String" value="Pack 3:"/> </Properties>
</Properties> <Constraints>
</Component> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<Component class="javax.swing.JTextField" name="editPack3"> <BorderConstraints direction="South"/>
<Properties> </Constraint>
<Property name="editable" type="boolean" value="false"/> </Constraints>
<Property name="enabled" type="boolean" value="false"/> </Component>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> </SubComponents>
<Dimension value="[130, 22]"/> </Container>
</Property> <Container class="javax.swing.JPanel" name="panelPacks">
</Properties>
</Component> <Layout>
<Component class="javax.swing.JCheckBox" name="checkPack3"> <DimensionLayout dim="0">
</Component> <Group type="103" groupAlignment="0" attributes="0">
<Component class="javax.swing.JLabel" name="labelCardNumber"> <Group type="102" alignment="0" attributes="0">
<Properties> <EmptySpace min="-2" max="-2" attributes="0"/>
<Property name="text" type="java.lang.String" value="Card #:"/> <Group type="103" groupAlignment="0" attributes="0">
</Properties> <Component id="panelPack3" alignment="0" max="32767" attributes="0"/>
</Component> <Component id="panelPack1" alignment="0" max="32767" attributes="0"/>
<Component class="javax.swing.JTextField" name="editCardNumber"> <Component id="panelPack2" alignment="0" max="32767" attributes="0"/>
<Properties> <Component id="panelPackCard" alignment="0" max="32767" attributes="0"/>
<Property name="editable" type="boolean" value="false"/> </Group>
<Property name="enabled" type="boolean" value="false"/> <EmptySpace max="-2" attributes="0"/>
</Properties> </Group>
</Component> </Group>
<Component class="javax.swing.JTextField" name="editTimeRemaining"> </DimensionLayout>
<Properties> <DimensionLayout dim="1">
<Property name="editable" type="boolean" value="false"/> <Group type="103" groupAlignment="0" attributes="0">
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor"> <Group type="102" attributes="0">
<Color blue="0" green="0" id="red" palette="1" red="ff" type="palette"/> <EmptySpace max="-2" attributes="0"/>
</Property> <Component id="panelPack1" min="-2" max="-2" attributes="0"/>
<Property name="horizontalAlignment" type="int" value="0"/> <EmptySpace max="-2" attributes="0"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Component id="panelPack2" min="-2" max="-2" attributes="0"/>
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo"> <EmptySpace max="-2" attributes="0"/>
<BevelBorder/> <Component id="panelPack3" min="-2" max="-2" attributes="0"/>
</Border> <EmptySpace max="-2" attributes="0"/>
</Property> <Component id="panelPackCard" min="-2" max="-2" attributes="0"/>
</Properties> <EmptySpace max="-2" attributes="0"/>
</Component> </Group>
<Component class="javax.swing.JLabel" name="labelMessage"> </Group>
<Properties> </DimensionLayout>
<Property name="horizontalAlignment" type="int" value="0"/> </Layout>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <SubComponents>
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo"> <Container class="javax.swing.JPanel" name="panelPack1">
<BevelBorder/>
</Border> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
</Property> <SubComponents>
<Property name="opaque" type="boolean" value="true"/> <Component class="javax.swing.JLabel" name="labelPack1">
</Properties> <Properties>
</Component> <Property name="text" type="java.lang.String" value="Pack 1:"/>
<Component class="mage.client.cards.BigCard" name="bigCard"> </Properties>
<Properties> </Component>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Component class="javax.swing.JTextField" name="editPack1">
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo"> <Properties>
<BevelBorder/> <Property name="editable" type="boolean" value="false"/>
</Border> <Property name="enabled" type="boolean" value="false"/>
</Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
</Properties> <Dimension value="[130, 22]"/>
</Component> </Property>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkPack1">
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelPack2">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="labelPack2">
<Properties>
<Property name="text" type="java.lang.String" value="Pack 2:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="editPack2">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[130, 22]"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkPack2">
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelPack3">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="labelPack3">
<Properties>
<Property name="text" type="java.lang.String" value="Pack 3:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="editPack3">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[130, 22]"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkPack3">
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelPackCard">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="labelCardNumber">
<Properties>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="Card #123"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelPlayers"> <Container class="javax.swing.JPanel" name="panelPlayers">
<Properties> <Properties>
<Property name="opaque" type="boolean" value="false"/> <Property name="opaque" type="boolean" value="false"/>
</Properties> </Properties>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout"> <Layout>
<Property name="useNullLayout" type="boolean" value="true"/> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="panelPlayersLeft" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="labelTableImage" min="-2" pref="53" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="panelPlayersRight" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="panelPlayersLeft" max="32767" attributes="0"/>
<Component id="labelTableImage" max="32767" attributes="0"/>
<Component id="panelPlayersRight" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="panelPlayersLeft"> <Container class="javax.swing.JPanel" name="panelPlayersLeft">
@ -278,11 +307,6 @@
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
</Properties> </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="0" y="5" width="90" height="136"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout"> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="1"/> <Property name="columns" type="int" value="1"/>
@ -295,6 +319,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 1"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -306,6 +333,10 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 2"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -317,6 +348,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 3"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -328,6 +362,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 4"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -339,6 +376,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 5"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -350,6 +390,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 6"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -361,6 +404,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 7"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -372,6 +418,9 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="4"/> <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="player 8"/>
<Property name="alignmentX" type="float" value="1.0"/>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -396,11 +445,6 @@
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
</Properties> </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="95" y="5" width="40" height="136"/>
</Constraint>
</Constraints>
</Component> </Component>
<Container class="javax.swing.JPanel" name="panelPlayersRight"> <Container class="javax.swing.JPanel" name="panelPlayersRight">
<Properties> <Properties>
@ -421,11 +465,6 @@
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
</Properties> </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="140" y="5" width="90" height="136"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout"> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="1"/> <Property name="columns" type="int" value="1"/>
@ -438,6 +477,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 9"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -449,6 +489,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 10"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -460,6 +501,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 11"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -471,6 +513,8 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 12"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -482,6 +526,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 13"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -493,6 +538,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 14"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -504,6 +550,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 15"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -515,6 +562,7 @@
<Font name="Tahoma" size="10" style="0"/> <Font name="Tahoma" size="10" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="player 16"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
<Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/> <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
@ -524,31 +572,74 @@
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="panelBigCard">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="mage.client.cards.BigCard" name="bigCard">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Component class="mage.client.cards.CardsList" name="draftPicks"> <Container class="javax.swing.JPanel" name="panelRight">
</Component>
<Container class="mage.client.draft.DraftGrid" name="draftBooster">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder/>
</Border>
</Property>
</Properties>
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="738" max="32767" attributes="0"/> <Group type="102" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="draftPicks" pref="626" max="32767" attributes="0"/>
<Component id="draftBooster" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="439" max="32767" attributes="0"/> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="draftPicks" pref="0" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="draftBooster" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents>
<Component class="mage.client.cards.CardsList" name="draftPicks">
</Component>
<Container class="mage.client.draft.DraftGrid" name="draftBooster">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder/>
</Border>
</Property>
</Properties>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="624" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="439" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
</Container>
</SubComponents>
</Container> </Container>
</SubComponents> </SubComponents>
</Form> </Form>

427
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -27,6 +27,8 @@
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.List; import java.util.List;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/** /**
* Game GUI: draft panel for drafting game mode only * Game GUI: draft panel for drafting game mode only
@ -91,12 +93,26 @@
private Listener<Event> selectedCardsListener = null; private Listener<Event> selectedCardsListener = null;
private Listener<Event> pickingCardsListener = null; private Listener<Event> pickingCardsListener = null;
private Map<JPanel, List<JLabel>> playerLabels = new LinkedHashMap<>();
/** /**
* Creates new form DraftPanel * Creates new form DraftPanel
*/ */
public DraftPanel() { public DraftPanel() {
initComponents(); initComponents();
// keep player labels for auto-sizing
playerLabels.put(panelPlayersLeft, Arrays.stream(panelPlayersLeft.getComponents())
.filter(c -> c instanceof JLabel)
.map(c -> (JLabel) c)
.collect(Collectors.toList())
);
playerLabels.put(panelPlayersRight, Arrays.stream(panelPlayersRight.getComponents())
.filter(c -> c instanceof JLabel)
.map(c -> (JLabel) c)
.collect(Collectors.toList())
);
draftBooster.setOpaque(false); draftBooster.setOpaque(false);
draftPicks.setSortSetting(SortSettingDraft.getInstance()); draftPicks.setSortSetting(SortSettingDraft.getInstance());
draftPicks.setOpaque(false); draftPicks.setOpaque(false);
@ -109,8 +125,6 @@
addPopupMenuCardPanel(); addPopupMenuCardPanel();
this.add(popupMenuCardPanel); this.add(popupMenuCardPanel);
panelInfo.setOpaque(false);
countdown = new Timer(1000, countdown = new Timer(1000,
e -> { e -> {
if (--timeout > 0) { if (--timeout > 0) {
@ -183,40 +197,80 @@
this.checkPack1.setSelected(draftView.getBoosterNum() > 1); this.checkPack1.setSelected(draftView.getBoosterNum() > 1);
this.checkPack2.setSelected(draftView.getBoosterNum() > 2); this.checkPack2.setSelected(draftView.getBoosterNum() > 2);
this.checkPack3.setSelected(draftView.getBoosterNum() > 3); this.checkPack3.setSelected(draftView.getBoosterNum() > 3);
this.editCardNumber.setText(Integer.toString(draftView.getCardNum())); this.labelCardNumber.setText("Card #" + Integer.toString(draftView.getCardNum()));
packNo = draftView.getBoosterNum(); packNo = draftView.getBoosterNum();
pickNo = draftView.getCardNum(); pickNo = draftView.getCardNum();
setCodes = draftView.getSetCodes(); setCodes = draftView.getSetCodes();
draftLogger.updateDraft(draftId, draftView); draftLogger.updateDraft(draftId, draftView);
int right = draftView.getPlayers().size() / 2;
int left = draftView.getPlayers().size() - right;
int height = left * 18;
labelTableImage.setSize(new Dimension(labelTableImage.getWidth(), height));
// TODO: Can we fix this for Rich Draft where there is no direction? // TODO: Can we fix this for Rich Draft where there is no direction?
Image tableImage = ImageHelper.getImageFromResources(draftView.getBoosterNum() % 2 == 1 ? "/draft/table_left.png" : "/draft/table_right.png"); Image tableImage = ImageHelper.getImageFromResources(draftView.getBoosterNum() % 2 == 1 ? "/draft/table_left.png" : "/draft/table_right.png");
BufferedImage resizedTable = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(tableImage, BufferedImage.TYPE_INT_ARGB), labelTableImage.getWidth(), labelTableImage.getHeight()); BufferedImage resizedTable = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(tableImage, BufferedImage.TYPE_INT_ARGB), labelTableImage.getWidth(), labelTableImage.getHeight());
labelTableImage.setIcon(new ImageIcon(resizedTable)); labelTableImage.setIcon(new ImageIcon(resizedTable));
clearPlayerNames();
int count = 0; int count = 0;
int numberPlayers = draftView.getPlayers().size();
for (String playerName : draftView.getPlayers()) { for (String playerName : draftView.getPlayers()) {
count++; count++;
setPlayerNameToLabel(playerName, count, numberPlayers); setPlayerNameToLabel(playerName, count, draftView.getPlayers().size());
} }
hideUnusedPlayerNames();
// TODO: auto-resize for players list doesn't work with layouts, wtf
int rightAmount = draftView.getPlayers().size() / 2;
int leftAmount = draftView.getPlayers().size() - rightAmount;
int height = leftAmount * 18;
//labelTableImage.setSize(new Dimension(labelTableImage.getWidth(), height));
//panelPlayers.setSize(new Dimension(panelPlayers.getSize().width, height));
} }
private void setPlayerNameToLabel(String name, int index, int players) { private void clearPlayerNames() {
playerLabels.forEach((panel, labels) -> {
labels.forEach(label -> {
label.setText("");
});
});
}
private void hideUnusedPlayerNames() {
int maxPlayersPerPanel = 8;
playerLabels.forEach((panel, labels) -> {
AtomicInteger hiddenCount = new AtomicInteger(0);
labels.forEach(label -> {
if (label.getText().isEmpty()) {
hiddenCount.incrementAndGet();
panel.remove(label);
} else {
panel.add(label);
}
});
// update grid layout
GridLayout gridLayout = (GridLayout) panel.getLayout();
gridLayout.setRows(maxPlayersPerPanel - hiddenCount.get());
});
// fix same grid sizes for good names position
int maxRows = playerLabels.keySet()
.stream()
.mapToInt(panel -> ((GridLayout) panel.getLayout()).getRows())
.max()
.orElse(1);
playerLabels.keySet().forEach(panel -> {
((GridLayout) panel.getLayout()).setRows(maxRows);
});
}
private void setPlayerNameToLabel(String name, int playerNumber, int totalPlayers) {
int tablePosition; int tablePosition;
int right = players / 2; int rightAmount = totalPlayers / 2;
int left = players - right; int leftAmount = totalPlayers - rightAmount;
if (index <= left) { if (playerNumber <= leftAmount) {
// left side down (1 - 8) // left side down (1 - 8)
tablePosition = index; tablePosition = playerNumber;
} else { } else {
// right side up (16 - 9) // right side up (16 - 9)
tablePosition = 9 + right - (index - left); tablePosition = 9 + rightAmount - (playerNumber - leftAmount);
} }
switch (tablePosition) { switch (tablePosition) {
case 1: case 1:
@ -368,6 +422,19 @@
text = text + Integer.toString(second); text = text + Integer.toString(second);
} }
this.editTimeRemaining.setText(text); this.editTimeRemaining.setText(text);
// red color for small time
Color timerColor;
if (s <= 10) {
timerColor = Color.RED;
} else if (s <= 30) {
timerColor = new Color(255, 160, 60); // orange
} else {
timerColor = Color.BLACK;
}
this.editTimeRemaining.setForeground(timerColor);
// warning sound at the end
if (s == 6 && !draftBooster.isEmptyGrid()) { if (s == 6 && !draftBooster.isEmptyGrid()) {
AudioManager.playOnCountdown1(); AudioManager.playOnCountdown1();
} }
@ -522,22 +589,27 @@
private void initComponents() { private void initComponents() {
jSeparator1 = new javax.swing.JSeparator(); jSeparator1 = new javax.swing.JSeparator();
panelInfo = new javax.swing.JPanel(); panelLeft = new javax.swing.JPanel();
panelCommands = new javax.swing.JPanel();
buttonQuitTournament = new javax.swing.JButton(); buttonQuitTournament = new javax.swing.JButton();
panelInfo = new javax.swing.JPanel();
editTimeRemaining = new javax.swing.JTextField();
labelMessage = new javax.swing.JLabel();
panelPacks = new javax.swing.JPanel();
panelPack1 = new javax.swing.JPanel();
labelPack1 = new javax.swing.JLabel(); labelPack1 = new javax.swing.JLabel();
editPack1 = new javax.swing.JTextField(); editPack1 = new javax.swing.JTextField();
checkPack1 = new javax.swing.JCheckBox(); checkPack1 = new javax.swing.JCheckBox();
panelPack2 = new javax.swing.JPanel();
labelPack2 = new javax.swing.JLabel(); labelPack2 = new javax.swing.JLabel();
editPack2 = new javax.swing.JTextField(); editPack2 = new javax.swing.JTextField();
checkPack2 = new javax.swing.JCheckBox(); checkPack2 = new javax.swing.JCheckBox();
panelPack3 = new javax.swing.JPanel();
labelPack3 = new javax.swing.JLabel(); labelPack3 = new javax.swing.JLabel();
editPack3 = new javax.swing.JTextField(); editPack3 = new javax.swing.JTextField();
checkPack3 = new javax.swing.JCheckBox(); checkPack3 = new javax.swing.JCheckBox();
panelPackCard = new javax.swing.JPanel();
labelCardNumber = new javax.swing.JLabel(); labelCardNumber = new javax.swing.JLabel();
editCardNumber = new javax.swing.JTextField();
editTimeRemaining = new javax.swing.JTextField();
labelMessage = new javax.swing.JLabel();
bigCard = new mage.client.cards.BigCard();
panelPlayers = new javax.swing.JPanel(); panelPlayers = new javax.swing.JPanel();
panelPlayersLeft = new javax.swing.JPanel(); panelPlayersLeft = new javax.swing.JPanel();
labelPlayer01 = new javax.swing.JLabel(); labelPlayer01 = new javax.swing.JLabel();
@ -558,13 +630,17 @@
labelPlayer14 = new javax.swing.JLabel(); labelPlayer14 = new javax.swing.JLabel();
labelPlayer15 = new javax.swing.JLabel(); labelPlayer15 = new javax.swing.JLabel();
labelPlayer16 = new javax.swing.JLabel(); labelPlayer16 = new javax.swing.JLabel();
panelBigCard = new javax.swing.JPanel();
bigCard = new mage.client.cards.BigCard();
panelRight = new javax.swing.JPanel();
draftPicks = new mage.client.cards.CardsList(); draftPicks = new mage.client.cards.CardsList();
draftBooster = new mage.client.draft.DraftGrid(); draftBooster = new mage.client.draft.DraftGrid();
panelInfo.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); panelLeft.setFocusable(false);
panelInfo.setFocusable(false); panelLeft.setRequestFocusEnabled(false);
panelInfo.setRequestFocusEnabled(false); panelLeft.setVerifyInputWhenFocusTarget(false);
panelInfo.setVerifyInputWhenFocusTarget(false);
panelCommands.setOpaque(false);
buttonQuitTournament.setText("Quit Tournament"); buttonQuitTournament.setText("Quit Tournament");
buttonQuitTournament.setFocusable(false); buttonQuitTournament.setFocusable(false);
@ -573,43 +649,92 @@
buttonQuitTournamentActionPerformed(evt); buttonQuitTournamentActionPerformed(evt);
} }
}); });
panelCommands.add(buttonQuitTournament);
panelInfo.setOpaque(false);
panelInfo.setLayout(new java.awt.BorderLayout());
editTimeRemaining.setEditable(false);
editTimeRemaining.setFont(new java.awt.Font("Tahoma", 0, 36)); // NOI18N
editTimeRemaining.setForeground(java.awt.Color.red);
editTimeRemaining.setHorizontalAlignment(javax.swing.JTextField.CENTER);
editTimeRemaining.setText("WAITING");
editTimeRemaining.setBorder(null);
editTimeRemaining.setFocusable(false);
editTimeRemaining.setOpaque(false);
panelInfo.add(editTimeRemaining, java.awt.BorderLayout.CENTER);
labelMessage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
labelMessage.setText("Waiting start of the draft...");
panelInfo.add(labelMessage, java.awt.BorderLayout.SOUTH);
panelPack1.setLayout(new javax.swing.BoxLayout(panelPack1, javax.swing.BoxLayout.LINE_AXIS));
labelPack1.setText("Pack 1:"); labelPack1.setText("Pack 1:");
panelPack1.add(labelPack1);
editPack1.setEditable(false); editPack1.setEditable(false);
editPack1.setEnabled(false); editPack1.setEnabled(false);
editPack1.setPreferredSize(new java.awt.Dimension(130, 22)); editPack1.setPreferredSize(new java.awt.Dimension(130, 22));
panelPack1.add(editPack1);
panelPack1.add(checkPack1);
panelPack2.setLayout(new javax.swing.BoxLayout(panelPack2, javax.swing.BoxLayout.LINE_AXIS));
labelPack2.setText("Pack 2:"); labelPack2.setText("Pack 2:");
panelPack2.add(labelPack2);
editPack2.setEditable(false); editPack2.setEditable(false);
editPack2.setEnabled(false); editPack2.setEnabled(false);
editPack2.setPreferredSize(new java.awt.Dimension(130, 22)); editPack2.setPreferredSize(new java.awt.Dimension(130, 22));
panelPack2.add(editPack2);
panelPack2.add(checkPack2);
panelPack3.setLayout(new javax.swing.BoxLayout(panelPack3, javax.swing.BoxLayout.LINE_AXIS));
labelPack3.setText("Pack 3:"); labelPack3.setText("Pack 3:");
panelPack3.add(labelPack3);
editPack3.setEditable(false); editPack3.setEditable(false);
editPack3.setEnabled(false); editPack3.setEnabled(false);
editPack3.setPreferredSize(new java.awt.Dimension(130, 22)); editPack3.setPreferredSize(new java.awt.Dimension(130, 22));
panelPack3.add(editPack3);
panelPack3.add(checkPack3);
labelCardNumber.setText("Card #:"); panelPackCard.setLayout(new java.awt.BorderLayout());
editCardNumber.setEditable(false); labelCardNumber.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
editCardNumber.setEnabled(false); labelCardNumber.setText("Card #123");
panelPackCard.add(labelCardNumber, java.awt.BorderLayout.CENTER);
editTimeRemaining.setEditable(false); javax.swing.GroupLayout panelPacksLayout = new javax.swing.GroupLayout(panelPacks);
editTimeRemaining.setForeground(java.awt.Color.red); panelPacks.setLayout(panelPacksLayout);
editTimeRemaining.setHorizontalAlignment(javax.swing.JTextField.CENTER); panelPacksLayout.setHorizontalGroup(
editTimeRemaining.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); panelPacksLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelPacksLayout.createSequentialGroup()
labelMessage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); .addContainerGap()
labelMessage.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); .addGroup(panelPacksLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
labelMessage.setOpaque(true); .addComponent(panelPack3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelPack1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
bigCard.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); .addComponent(panelPack2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelPackCard, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
panelPacksLayout.setVerticalGroup(
panelPacksLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelPacksLayout.createSequentialGroup()
.addContainerGap()
.addComponent(panelPack1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelPack2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelPack3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelPackCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
panelPlayers.setOpaque(false); panelPlayers.setOpaque(false);
panelPlayers.setLayout(null);
panelPlayersLeft.setFocusable(false); panelPlayersLeft.setFocusable(false);
panelPlayersLeft.setMaximumSize(new java.awt.Dimension(80, 132)); panelPlayersLeft.setMaximumSize(new java.awt.Dimension(80, 132));
@ -622,6 +747,9 @@
labelPlayer01.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer01.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer01.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer01.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer01.setText("player 1");
labelPlayer01.setAlignmentX(1.0F);
labelPlayer01.setAlignmentY(0.0F);
labelPlayer01.setFocusable(false); labelPlayer01.setFocusable(false);
labelPlayer01.setRequestFocusEnabled(false); labelPlayer01.setRequestFocusEnabled(false);
labelPlayer01.setVerifyInputWhenFocusTarget(false); labelPlayer01.setVerifyInputWhenFocusTarget(false);
@ -629,6 +757,10 @@
labelPlayer02.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer02.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer02.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer02.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer02.setText("player 2");
labelPlayer02.setToolTipText("");
labelPlayer02.setAlignmentX(1.0F);
labelPlayer02.setAlignmentY(0.0F);
labelPlayer02.setFocusable(false); labelPlayer02.setFocusable(false);
labelPlayer02.setRequestFocusEnabled(false); labelPlayer02.setRequestFocusEnabled(false);
labelPlayer02.setVerifyInputWhenFocusTarget(false); labelPlayer02.setVerifyInputWhenFocusTarget(false);
@ -636,6 +768,9 @@
labelPlayer03.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer03.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer03.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer03.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer03.setText("player 3");
labelPlayer03.setAlignmentX(1.0F);
labelPlayer03.setAlignmentY(0.0F);
labelPlayer03.setFocusable(false); labelPlayer03.setFocusable(false);
labelPlayer03.setRequestFocusEnabled(false); labelPlayer03.setRequestFocusEnabled(false);
labelPlayer03.setVerifyInputWhenFocusTarget(false); labelPlayer03.setVerifyInputWhenFocusTarget(false);
@ -643,6 +778,9 @@
labelPlayer04.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer04.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer04.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer04.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer04.setText("player 4");
labelPlayer04.setAlignmentX(1.0F);
labelPlayer04.setAlignmentY(0.0F);
labelPlayer04.setFocusable(false); labelPlayer04.setFocusable(false);
labelPlayer04.setRequestFocusEnabled(false); labelPlayer04.setRequestFocusEnabled(false);
labelPlayer04.setVerifyInputWhenFocusTarget(false); labelPlayer04.setVerifyInputWhenFocusTarget(false);
@ -650,6 +788,9 @@
labelPlayer05.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer05.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer05.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer05.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer05.setText("player 5");
labelPlayer05.setAlignmentX(1.0F);
labelPlayer05.setAlignmentY(0.0F);
labelPlayer05.setFocusable(false); labelPlayer05.setFocusable(false);
labelPlayer05.setRequestFocusEnabled(false); labelPlayer05.setRequestFocusEnabled(false);
labelPlayer05.setVerifyInputWhenFocusTarget(false); labelPlayer05.setVerifyInputWhenFocusTarget(false);
@ -657,6 +798,9 @@
labelPlayer06.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer06.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer06.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer06.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer06.setText("player 6");
labelPlayer06.setAlignmentX(1.0F);
labelPlayer06.setAlignmentY(0.0F);
labelPlayer06.setFocusable(false); labelPlayer06.setFocusable(false);
labelPlayer06.setRequestFocusEnabled(false); labelPlayer06.setRequestFocusEnabled(false);
labelPlayer06.setVerifyInputWhenFocusTarget(false); labelPlayer06.setVerifyInputWhenFocusTarget(false);
@ -664,6 +808,9 @@
labelPlayer07.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer07.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer07.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer07.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer07.setText("player 7");
labelPlayer07.setAlignmentX(1.0F);
labelPlayer07.setAlignmentY(0.0F);
labelPlayer07.setFocusable(false); labelPlayer07.setFocusable(false);
labelPlayer07.setRequestFocusEnabled(false); labelPlayer07.setRequestFocusEnabled(false);
labelPlayer07.setVerifyInputWhenFocusTarget(false); labelPlayer07.setVerifyInputWhenFocusTarget(false);
@ -671,14 +818,14 @@
labelPlayer08.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer08.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer08.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); labelPlayer08.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
labelPlayer08.setText("player 8");
labelPlayer08.setAlignmentX(1.0F);
labelPlayer08.setAlignmentY(0.0F);
labelPlayer08.setFocusable(false); labelPlayer08.setFocusable(false);
labelPlayer08.setRequestFocusEnabled(false); labelPlayer08.setRequestFocusEnabled(false);
labelPlayer08.setVerifyInputWhenFocusTarget(false); labelPlayer08.setVerifyInputWhenFocusTarget(false);
panelPlayersLeft.add(labelPlayer08); panelPlayersLeft.add(labelPlayer08);
panelPlayers.add(panelPlayersLeft);
panelPlayersLeft.setBounds(0, 5, 90, 136);
labelTableImage.setBackground(new java.awt.Color(51, 102, 255)); labelTableImage.setBackground(new java.awt.Color(51, 102, 255));
labelTableImage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); labelTableImage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
labelTableImage.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); labelTableImage.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
@ -687,8 +834,6 @@
labelTableImage.setOpaque(true); labelTableImage.setOpaque(true);
labelTableImage.setRequestFocusEnabled(false); labelTableImage.setRequestFocusEnabled(false);
labelTableImage.setVerifyInputWhenFocusTarget(false); labelTableImage.setVerifyInputWhenFocusTarget(false);
panelPlayers.add(labelTableImage);
labelTableImage.setBounds(95, 5, 40, 136);
panelPlayersRight.setFocusable(false); panelPlayersRight.setFocusable(false);
panelPlayersRight.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N panelPlayersRight.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
@ -702,6 +847,7 @@
labelPlayer09.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer09.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer09.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer09.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer09.setText("player 9");
labelPlayer09.setFocusable(false); labelPlayer09.setFocusable(false);
labelPlayer09.setRequestFocusEnabled(false); labelPlayer09.setRequestFocusEnabled(false);
labelPlayer09.setVerifyInputWhenFocusTarget(false); labelPlayer09.setVerifyInputWhenFocusTarget(false);
@ -709,6 +855,7 @@
labelPlayer10.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer10.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer10.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer10.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer10.setText("player 10");
labelPlayer10.setFocusable(false); labelPlayer10.setFocusable(false);
labelPlayer10.setRequestFocusEnabled(false); labelPlayer10.setRequestFocusEnabled(false);
labelPlayer10.setVerifyInputWhenFocusTarget(false); labelPlayer10.setVerifyInputWhenFocusTarget(false);
@ -716,6 +863,7 @@
labelPlayer11.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer11.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer11.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer11.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer11.setText("player 11");
labelPlayer11.setFocusable(false); labelPlayer11.setFocusable(false);
labelPlayer11.setRequestFocusEnabled(false); labelPlayer11.setRequestFocusEnabled(false);
labelPlayer11.setVerifyInputWhenFocusTarget(false); labelPlayer11.setVerifyInputWhenFocusTarget(false);
@ -723,6 +871,8 @@
labelPlayer12.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer12.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer12.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer12.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer12.setText("player 12");
labelPlayer12.setToolTipText("");
labelPlayer12.setFocusable(false); labelPlayer12.setFocusable(false);
labelPlayer12.setRequestFocusEnabled(false); labelPlayer12.setRequestFocusEnabled(false);
labelPlayer12.setVerifyInputWhenFocusTarget(false); labelPlayer12.setVerifyInputWhenFocusTarget(false);
@ -730,6 +880,7 @@
labelPlayer13.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer13.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer13.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer13.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer13.setText("player 13");
labelPlayer13.setFocusable(false); labelPlayer13.setFocusable(false);
labelPlayer13.setRequestFocusEnabled(false); labelPlayer13.setRequestFocusEnabled(false);
labelPlayer13.setVerifyInputWhenFocusTarget(false); labelPlayer13.setVerifyInputWhenFocusTarget(false);
@ -737,6 +888,7 @@
labelPlayer14.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer14.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer14.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer14.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer14.setText("player 14");
labelPlayer14.setFocusable(false); labelPlayer14.setFocusable(false);
labelPlayer14.setRequestFocusEnabled(false); labelPlayer14.setRequestFocusEnabled(false);
labelPlayer14.setVerifyInputWhenFocusTarget(false); labelPlayer14.setVerifyInputWhenFocusTarget(false);
@ -744,6 +896,7 @@
labelPlayer15.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer15.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer15.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer15.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer15.setText("player 15");
labelPlayer15.setFocusable(false); labelPlayer15.setFocusable(false);
labelPlayer15.setRequestFocusEnabled(false); labelPlayer15.setRequestFocusEnabled(false);
labelPlayer15.setVerifyInputWhenFocusTarget(false); labelPlayer15.setVerifyInputWhenFocusTarget(false);
@ -751,87 +904,66 @@
labelPlayer16.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N labelPlayer16.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
labelPlayer16.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); labelPlayer16.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
labelPlayer16.setText("player 16");
labelPlayer16.setFocusable(false); labelPlayer16.setFocusable(false);
labelPlayer16.setRequestFocusEnabled(false); labelPlayer16.setRequestFocusEnabled(false);
labelPlayer16.setVerifyInputWhenFocusTarget(false); labelPlayer16.setVerifyInputWhenFocusTarget(false);
panelPlayersRight.add(labelPlayer16); panelPlayersRight.add(labelPlayer16);
panelPlayers.add(panelPlayersRight); javax.swing.GroupLayout panelPlayersLayout = new javax.swing.GroupLayout(panelPlayers);
panelPlayersRight.setBounds(140, 5, 90, 136); panelPlayers.setLayout(panelPlayersLayout);
panelPlayersLayout.setHorizontalGroup(
javax.swing.GroupLayout panelInfoLayout = new javax.swing.GroupLayout(panelInfo); panelPlayersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
panelInfo.setLayout(panelInfoLayout); .addGroup(panelPlayersLayout.createSequentialGroup()
panelInfoLayout.setHorizontalGroup( .addContainerGap()
panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(panelPlayersLeft, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(panelInfoLayout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(labelTableImage, javax.swing.GroupLayout.PREFERRED_SIZE, 53, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(panelInfoLayout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addContainerGap() .addComponent(panelPlayersRight, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addContainerGap())
.addComponent(labelCardNumber)
.addGroup(panelInfoLayout.createSequentialGroup()
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, panelInfoLayout.createSequentialGroup()
.addComponent(labelPack2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(editPack2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, panelInfoLayout.createSequentialGroup()
.addComponent(labelPack1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(editPack1, javax.swing.GroupLayout.PREFERRED_SIZE, 165, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, panelInfoLayout.createSequentialGroup()
.addComponent(labelPack3)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(editCardNumber)
.addComponent(editPack3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkPack3)
.addComponent(checkPack2)
.addComponent(checkPack1)))
.addGroup(panelInfoLayout.createSequentialGroup()
.addComponent(buttonQuitTournament)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(editTimeRemaining, javax.swing.GroupLayout.PREFERRED_SIZE, 94, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(panelPlayers, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(labelMessage, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 231, Short.MAX_VALUE))))
.addComponent(bigCard, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE))
); );
panelInfoLayout.setVerticalGroup( panelPlayersLayout.setVerticalGroup(
panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) panelPlayersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelInfoLayout.createSequentialGroup() .addGroup(panelPlayersLayout.createSequentialGroup()
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGap(10, 10, 10)
.addComponent(buttonQuitTournament) .addGroup(panelPlayersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(editTimeRemaining, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(panelPlayersLeft, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(labelTableImage, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelPlayersRight, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
panelBigCard.setLayout(new java.awt.BorderLayout());
panelBigCard.add(bigCard, java.awt.BorderLayout.CENTER);
javax.swing.GroupLayout panelLeftLayout = new javax.swing.GroupLayout(panelLeft);
panelLeft.setLayout(panelLeftLayout);
panelLeftLayout.setHorizontalGroup(
panelLeftLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelLeftLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelLeftLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelInfo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelPacks, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelBigCard, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(panelPlayers, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
panelLeftLayout.setVerticalGroup(
panelLeftLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelLeftLayout.createSequentialGroup()
.addComponent(panelCommands, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(panelPacks, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(checkPack1)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(labelPack1)
.addComponent(editPack1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(panelPlayers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelPack2) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 112, Short.MAX_VALUE)
.addComponent(editPack2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(panelBigCard, javax.swing.GroupLayout.PREFERRED_SIZE, 285, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(checkPack2)) .addContainerGap())
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(labelPack3)
.addComponent(editPack3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(checkPack3))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(labelCardNumber)
.addComponent(editCardNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(labelMessage, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelPlayers, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 55, Short.MAX_VALUE)
.addComponent(bigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
); );
draftBooster.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); draftBooster.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
@ -840,41 +972,58 @@
draftBooster.setLayout(draftBoosterLayout); draftBooster.setLayout(draftBoosterLayout);
draftBoosterLayout.setHorizontalGroup( draftBoosterLayout.setHorizontalGroup(
draftBoosterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) draftBoosterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 738, Short.MAX_VALUE) .addGap(0, 624, Short.MAX_VALUE)
); );
draftBoosterLayout.setVerticalGroup( draftBoosterLayout.setVerticalGroup(
draftBoosterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) draftBoosterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 439, Short.MAX_VALUE) .addGap(0, 439, Short.MAX_VALUE)
); );
javax.swing.GroupLayout panelRightLayout = new javax.swing.GroupLayout(panelRight);
panelRight.setLayout(panelRightLayout);
panelRightLayout.setHorizontalGroup(
panelRightLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelRightLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelRightLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(draftPicks, javax.swing.GroupLayout.DEFAULT_SIZE, 626, Short.MAX_VALUE)
.addComponent(draftBooster, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
panelRightLayout.setVerticalGroup(
panelRightLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelRightLayout.createSequentialGroup()
.addContainerGap()
.addComponent(draftPicks, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(draftBooster, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(panelInfo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(panelLeft, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, 0) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(panelRight, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(draftPicks, javax.swing.GroupLayout.DEFAULT_SIZE, 740, Short.MAX_VALUE) .addContainerGap())
.addComponent(draftBooster, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelInfo, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(panelLeft, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(panelRight, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(draftPicks, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(draftBooster, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
); );
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void buttonQuitTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonQuitTournamentActionPerformed private void buttonQuitTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonQuitTournamentActionPerformed
UserRequestMessage message = new UserRequestMessage("Confirm quit tournament", "Are you sure you want to quit the draft tournament?"); UserRequestMessage message = new UserRequestMessage("Confirm quit tournament", "Are you sure you want to quit the draft tournament?");
message.setButton1("No", null); message.setButton1("No", null);
message.setButton2("Yes", PlayerAction.CLIENT_QUIT_DRAFT_TOURNAMENT); message.setButton2("Yes", PlayerAction.CLIENT_QUIT_DRAFT_TOURNAMENT);
message.setTournamentId(draftId); message.setTournamentId(draftId);
MageFrame.getInstance().showUserRequestDialog(message); MageFrame.getInstance().showUserRequestDialog(message);
}//GEN-LAST:event_buttonQuitTournamentActionPerformed }//GEN-LAST:event_buttonQuitTournamentActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private mage.client.cards.BigCard bigCard; private mage.client.cards.BigCard bigCard;
@ -884,7 +1033,6 @@
private javax.swing.JCheckBox checkPack3; private javax.swing.JCheckBox checkPack3;
private mage.client.draft.DraftGrid draftBooster; private mage.client.draft.DraftGrid draftBooster;
private mage.client.cards.CardsList draftPicks; private mage.client.cards.CardsList draftPicks;
private javax.swing.JTextField editCardNumber;
private javax.swing.JTextField editPack1; private javax.swing.JTextField editPack1;
private javax.swing.JTextField editPack2; private javax.swing.JTextField editPack2;
private javax.swing.JTextField editPack3; private javax.swing.JTextField editPack3;
@ -912,10 +1060,19 @@
private javax.swing.JLabel labelPlayer15; private javax.swing.JLabel labelPlayer15;
private javax.swing.JLabel labelPlayer16; private javax.swing.JLabel labelPlayer16;
private javax.swing.JLabel labelTableImage; private javax.swing.JLabel labelTableImage;
private javax.swing.JPanel panelBigCard;
private javax.swing.JPanel panelCommands;
private javax.swing.JPanel panelInfo; private javax.swing.JPanel panelInfo;
private javax.swing.JPanel panelLeft;
private javax.swing.JPanel panelPack1;
private javax.swing.JPanel panelPack2;
private javax.swing.JPanel panelPack3;
private javax.swing.JPanel panelPackCard;
private javax.swing.JPanel panelPacks;
private javax.swing.JPanel panelPlayers; private javax.swing.JPanel panelPlayers;
private javax.swing.JPanel panelPlayersLeft; private javax.swing.JPanel panelPlayersLeft;
private javax.swing.JPanel panelPlayersRight; private javax.swing.JPanel panelPlayersRight;
private javax.swing.JPanel panelRight;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }