commit db1a67feb5e6ae78b7261f773e1b7c4e73eb5cae
parent 2bcf1230412188047356b54fd04bc14a6cb6b7fd
Author: Michael Neuper <michael@michaelneuper.com>
Date: Fri, 12 May 2023 20:12:32 +0200
Fix visual card bug
Diffstat:
| M | src/view/MainUI.form | | | 86 | +++++++++++++++++++++++++++++-------------------------------------------------- |
| M | src/view/MainUI.java | | | 100 | +++++++++++++++++++++++++++++++++++++++++-------------------------------------- |
2 files changed, 83 insertions(+), 103 deletions(-)
diff --git a/src/view/MainUI.form b/src/view/MainUI.form
@@ -15,6 +15,9 @@
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
+ <Events>
+ <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="formKeyPressed"/>
+ </Events>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -25,7 +28,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,-22,0,0,3,-76"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,86,0,0,3,-68"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -47,7 +50,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="54" max="-2" attributes="0"/>
- <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+ <Component id="jButtonMenu" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="310" max="32767" attributes="0"/>
<Component id="jLabelResult" min="-2" pref="300" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="260" max="-2" attributes="0"/>
@@ -64,7 +67,7 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
- <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+ <Component id="jButtonMenu" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="31" max="32767" attributes="0"/>
@@ -81,7 +84,7 @@
<Property name="text" type="java.lang.String" value="WELCOME"/>
</Properties>
</Component>
- <Component class="javax.swing.JButton" name="jButton1">
+ <Component class="javax.swing.JButton" name="jButtonMenu">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="33" green="66" red="0" type="rgb"/>
@@ -97,7 +100,7 @@
</Property>
</Properties>
<Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButtonMenuActionPerformed"/>
</Events>
</Component>
</SubComponents>
@@ -145,7 +148,7 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jButtonSurrender" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
- <Component id="jButtonDeal" pref="250" max="32767" attributes="0"/>
+ <Component id="jButtonDeal" pref="102" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@@ -242,6 +245,9 @@
<Dimension value="[150, 498]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jPanelWestKeyPressed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="West"/>
@@ -274,7 +280,7 @@
<Component id="jLabelCurrentBetAmount" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
<Component id="jButtonChangeBet" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="317" max="32767" attributes="0"/>
+ <EmptySpace pref="169" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -350,7 +356,10 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanelDealer" max="32767" attributes="0"/>
- <Component id="jPanelPlayer" max="32767" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="jPanelPlayer" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ </Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -411,7 +420,7 @@
<Component id="jLabelDealerCard4" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace pref="166" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -495,71 +504,30 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jLabelPlayerCard3" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="32767" attributes="0"/>
- <Component id="jPanelPlayerText" max="32767" attributes="0"/>
- <EmptySpace min="-2" pref="30" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="jLabelPlayerCard4" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="34" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
- <Component id="jPanelPlayerText" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabelPlayer" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
+ <Component id="jLabelPlayerCard4" min="-2" max="-2" attributes="0"/>
<Component id="jLabelPlayerCard2" min="-2" max="-2" attributes="0"/>
<Component id="jLabelPlayerCard1" min="-2" max="-2" attributes="0"/>
<Component id="jLabelPlayerCard3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace pref="87" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanelPlayerText">
- <Properties>
- <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
- <Color blue="33" green="66" red="0" type="rgb"/>
- </Property>
- </Properties>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
- <Component id="jLabelPlayerCard4" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="119" max="32767" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="64" max="-2" attributes="0"/>
- <Component id="jLabelPlayerCard4" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="264" max="32767" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="jLabelPlayerCard4">
- <Properties>
- <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3" name="/assets/cards/back.png"/>
- </Property>
- <Property name="text" type="java.lang.String" value=" "/>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
<Component class="javax.swing.JLabel" name="jLabelPlayer">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
@@ -590,6 +558,14 @@
</Property>
</Properties>
</Component>
+ <Component class="javax.swing.JLabel" name="jLabelPlayerCard4">
+ <Properties>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/assets/cards/back.png"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value=" "/>
+ </Properties>
+ </Component>
</SubComponents>
</Container>
</SubComponents>
diff --git a/src/view/MainUI.java b/src/view/MainUI.java
@@ -3,8 +3,12 @@ package view;
import com.formdev.flatlaf.FlatDarkLaf;
import controller.Controller;
import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
import javax.swing.ImageIcon;
+import javax.swing.JComponent;
import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -36,7 +40,7 @@ public class MainUI extends javax.swing.JFrame {
jPanelNorth = new javax.swing.JPanel();
jLabelResult = new javax.swing.JLabel();
- jButton1 = new javax.swing.JButton();
+ jButtonMenu = new javax.swing.JButton();
jPanelEast = new javax.swing.JPanel();
jButtonHit = new javax.swing.JButton();
jButtonStand = new javax.swing.JButton();
@@ -57,30 +61,34 @@ public class MainUI extends javax.swing.JFrame {
jLabelDealerCard3 = new javax.swing.JLabel();
jLabelDealerCard4 = new javax.swing.JLabel();
jPanelPlayer = new javax.swing.JPanel();
- jPanelPlayerText = new javax.swing.JPanel();
- jLabelPlayerCard4 = new javax.swing.JLabel();
jLabelPlayer = new javax.swing.JLabel();
jLabelPlayerCard2 = new javax.swing.JLabel();
jLabelPlayerCard1 = new javax.swing.JLabel();
jLabelPlayerCard3 = new javax.swing.JLabel();
+ jLabelPlayerCard4 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("librejack");
setIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/assets/icons/heart_cards.png")));
setPreferredSize(new java.awt.Dimension(800, 600));
+ addKeyListener(new java.awt.event.KeyAdapter() {
+ public void keyPressed(java.awt.event.KeyEvent evt) {
+ formKeyPressed(evt);
+ }
+ });
jPanelNorth.setBackground(new java.awt.Color(0, 102, 51));
jLabelResult.setFont(new java.awt.Font("Segoe UI", 0, 48)); // NOI18N
jLabelResult.setText("WELCOME");
- jButton1.setBackground(new java.awt.Color(0, 102, 51));
- jButton1.setForeground(new java.awt.Color(204, 204, 204));
- jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/icons/menu_burger.png"))); // NOI18N
- jButton1.setBorder(null);
- jButton1.addActionListener(new java.awt.event.ActionListener() {
+ jButtonMenu.setBackground(new java.awt.Color(0, 102, 51));
+ jButtonMenu.setForeground(new java.awt.Color(204, 204, 204));
+ jButtonMenu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/icons/menu_burger.png"))); // NOI18N
+ jButtonMenu.setBorder(null);
+ jButtonMenu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- jButton1ActionPerformed(evt);
+ jButtonMenuActionPerformed(evt);
}
});
@@ -90,7 +98,7 @@ public class MainUI extends javax.swing.JFrame {
jPanelNorthLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanelNorthLayout.createSequentialGroup()
.addGap(54, 54, 54)
- .addComponent(jButton1)
+ .addComponent(jButtonMenu)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 310, Short.MAX_VALUE)
.addComponent(jLabelResult, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(260, 260, 260))
@@ -104,7 +112,7 @@ public class MainUI extends javax.swing.JFrame {
.addComponent(jLabelResult, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanelNorthLayout.createSequentialGroup()
.addGap(32, 32, 32)
- .addComponent(jButton1)))
+ .addComponent(jButtonMenu)))
.addContainerGap(31, Short.MAX_VALUE))
);
@@ -186,7 +194,7 @@ public class MainUI extends javax.swing.JFrame {
.addGap(18, 18, 18)
.addComponent(jButtonSurrender)
.addGap(18, 18, 18)
- .addComponent(jButtonDeal, javax.swing.GroupLayout.DEFAULT_SIZE, 250, Short.MAX_VALUE)
+ .addComponent(jButtonDeal, javax.swing.GroupLayout.DEFAULT_SIZE, 102, Short.MAX_VALUE)
.addContainerGap())
);
@@ -195,6 +203,11 @@ public class MainUI extends javax.swing.JFrame {
jPanelWest.setBackground(new java.awt.Color(0, 102, 51));
jPanelWest.setForeground(new java.awt.Color(0, 204, 51));
jPanelWest.setPreferredSize(new java.awt.Dimension(150, 498));
+ jPanelWest.addKeyListener(new java.awt.event.KeyAdapter() {
+ public void keyPressed(java.awt.event.KeyEvent evt) {
+ jPanelWestKeyPressed(evt);
+ }
+ });
jLabelBalance.setBackground(new java.awt.Color(102, 102, 0));
jLabelBalance.setFont(new java.awt.Font("Segoe UI", 0, 24)); // NOI18N
@@ -241,7 +254,7 @@ public class MainUI extends javax.swing.JFrame {
.addComponent(jLabelCurrentBetAmount)
.addGap(32, 32, 32)
.addComponent(jButtonChangeBet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(317, Short.MAX_VALUE))
+ .addContainerGap(169, Short.MAX_VALUE))
);
getContentPane().add(jPanelWest, java.awt.BorderLayout.WEST);
@@ -280,7 +293,7 @@ public class MainUI extends javax.swing.JFrame {
.addComponent(jLabelDealerCard3)
.addGap(18, 18, 18)
.addComponent(jLabelDealerCard4)))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(166, Short.MAX_VALUE))
);
jPanelDealerTextLayout.setVerticalGroup(
jPanelDealerTextLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -311,28 +324,6 @@ public class MainUI extends javax.swing.JFrame {
jPanelPlayer.setBackground(new java.awt.Color(0, 102, 51));
- jPanelPlayerText.setBackground(new java.awt.Color(0, 102, 51));
-
- jLabelPlayerCard4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/cards/back.png"))); // NOI18N
- jLabelPlayerCard4.setText(" ");
-
- javax.swing.GroupLayout jPanelPlayerTextLayout = new javax.swing.GroupLayout(jPanelPlayerText);
- jPanelPlayerText.setLayout(jPanelPlayerTextLayout);
- jPanelPlayerTextLayout.setHorizontalGroup(
- jPanelPlayerTextLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanelPlayerTextLayout.createSequentialGroup()
- .addGap(14, 14, 14)
- .addComponent(jLabelPlayerCard4)
- .addContainerGap(119, Short.MAX_VALUE))
- );
- jPanelPlayerTextLayout.setVerticalGroup(
- jPanelPlayerTextLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanelPlayerTextLayout.createSequentialGroup()
- .addGap(64, 64, 64)
- .addComponent(jLabelPlayerCard4)
- .addContainerGap(264, Short.MAX_VALUE))
- );
-
jLabelPlayer.setFont(new java.awt.Font("Segoe UI", 0, 30)); // NOI18N
jLabelPlayer.setText("You");
@@ -343,6 +334,9 @@ public class MainUI extends javax.swing.JFrame {
jLabelPlayerCard3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/cards/back.png"))); // NOI18N
+ jLabelPlayerCard4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/cards/back.png"))); // NOI18N
+ jLabelPlayerCard4.setText(" ");
+
javax.swing.GroupLayout jPanelPlayerLayout = new javax.swing.GroupLayout(jPanelPlayer);
jPanelPlayer.setLayout(jPanelPlayerLayout);
jPanelPlayerLayout.setHorizontalGroup(
@@ -357,24 +351,22 @@ public class MainUI extends javax.swing.JFrame {
.addComponent(jLabelPlayerCard1)))
.addGap(18, 18, 18)
.addComponent(jLabelPlayerCard3)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanelPlayerText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGap(30, 30, 30))
+ .addGap(18, 18, 18)
+ .addComponent(jLabelPlayerCard4)
+ .addContainerGap(34, Short.MAX_VALUE))
);
jPanelPlayerLayout.setVerticalGroup(
jPanelPlayerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelPlayerLayout.createSequentialGroup()
- .addComponent(jPanelPlayerText, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(jPanelPlayerLayout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabelPlayer)
.addGap(18, 18, 18)
.addGroup(jPanelPlayerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabelPlayerCard4)
.addComponent(jLabelPlayerCard2)
.addComponent(jLabelPlayerCard1)
.addComponent(jLabelPlayerCard3))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(87, Short.MAX_VALUE))
);
javax.swing.GroupLayout jPanelCenterLayout = new javax.swing.GroupLayout(jPanelCenter);
@@ -382,7 +374,9 @@ public class MainUI extends javax.swing.JFrame {
jPanelCenterLayout.setHorizontalGroup(
jPanelCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanelDealer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanelPlayer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanelCenterLayout.createSequentialGroup()
+ .addComponent(jPanelPlayer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE))
);
jPanelCenterLayout.setVerticalGroup(
jPanelCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -438,9 +432,20 @@ public class MainUI extends javax.swing.JFrame {
jLabelCurrentBetAmount.setText("R " + Double.toString(game.getBet()));
}//GEN-LAST:event_jButtonChangeBetActionPerformed
- private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+ private void jButtonMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonMenuActionPerformed
new MenuUI().setVisible(true);
- }//GEN-LAST:event_jButton1ActionPerformed
+ }//GEN-LAST:event_jButtonMenuActionPerformed
+
+ private void formKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_formKeyPressed
+// System.out.println(evt.getKeyCode());
+ if (evt.getKeyCode() == java.awt.event.KeyEvent.VK_F1) {
+ // open rules section when F1 is pressed
+ new RulesUI().setVisible(true);
+ }
+ }//GEN-LAST:event_formKeyPressed
+
+ private void jPanelWestKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jPanelWestKeyPressed
+ }//GEN-LAST:event_jPanelWestKeyPressed
/**
* @param args the command line arguments
@@ -485,11 +490,11 @@ public class MainUI extends javax.swing.JFrame {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton jButton1;
private javax.swing.JButton jButtonChangeBet;
private javax.swing.JButton jButtonDeal;
private javax.swing.JButton jButtonDoubleDown;
private javax.swing.JButton jButtonHit;
+ private javax.swing.JButton jButtonMenu;
private javax.swing.JButton jButtonStand;
private javax.swing.JButton jButtonSurrender;
private javax.swing.JLabel jLabelBalance;
@@ -512,7 +517,6 @@ public class MainUI extends javax.swing.JFrame {
private javax.swing.JPanel jPanelEast;
private javax.swing.JPanel jPanelNorth;
private javax.swing.JPanel jPanelPlayer;
- private javax.swing.JPanel jPanelPlayerText;
private javax.swing.JPanel jPanelWest;
// End of variables declaration//GEN-END:variables
}