diff --git a/src/de/jaujau/gui/Dashboard_GUI.java b/src/de/jaujau/gui/Dashboard_GUI.java index 7accde5..2cfa036 100644 --- a/src/de/jaujau/gui/Dashboard_GUI.java +++ b/src/de/jaujau/gui/Dashboard_GUI.java @@ -32,12 +32,12 @@ import javax.swing.JButton; public class Dashboard_GUI extends JPanel{ private static final long serialVersionUID = -7380187913989942586L; - JPanel panelCont = new JPanel(); - JPanel highscore = new JPanel(); - JPanel game = new JPanel(); - JPanel start = new JPanel(); - CardLayout cl = new CardLayout(); - Spielerverwaltung spielerverwaltung = new Spielerverwaltung(); + private JPanel panelCont = new JPanel(); + private JPanel highscore = new JPanel(); + private JPanel game = new JPanel(); + private JPanel start = new JPanel(); + private CardLayout cl = new CardLayout(); + private Spielerverwaltung spielerverwaltung = new Spielerverwaltung(); private final JPanel panel = new JPanel(); private final JPanel panel_1 = new JPanel(); private JComboBox spielername = new JComboBox(); @@ -46,10 +46,10 @@ public class Dashboard_GUI extends JPanel{ private final JPanel spielfeld = new JPanel(); private final JPanel player_hand = new JPanel(); private final JPanel gegner_hand = new JPanel(); - JLabel ziehstapel = new JLabel(""); - JPanel spielerkarten = new JPanel(); - JLabel labelsspieler[] = new JLabel[32]; - JLabel labelsgegner[] = new JLabel[32]; + private JLabel ziehstapel = new JLabel(""); + private JPanel spielerkarten = new JPanel(); + private JLabel labelsspieler[] = new JLabel[32]; + private JLabel labelsgegner[] = new JLabel[32]; private Spiel aktuellesSpiel; private JLabel label_aktuellerSpieler; private Texturenpakete texturenpakete; @@ -57,22 +57,23 @@ public class Dashboard_GUI extends JPanel{ private final JPanel info_panel = new JPanel(); private final JPanel rechts = new JPanel(); private final JPanel mitte = new JPanel(); - JLabel ablagestapel = new JLabel(""); - JButton aussetzen = new JButton("Aussetzen"); - JPanel mitte_unten = new JPanel(); - JPanel mitte_center = new JPanel(); + private JLabel ablagestapel = new JLabel(""); + private JButton aussetzen = new JButton("Aussetzen"); + private JPanel mitte_unten = new JPanel(); + private JPanel mitte_center = new JPanel(); private JPanel mitte_oben = new JPanel(); private JButton btnherz = new JButton("Herz"); private JButton btnpik = new JButton("Pik"); private JButton btnkaro = new JButton("Karo"); private JButton btnkreuz = new JButton("Kreuz"); private final JLabel label_final = new JLabel("Spiel beendet"); - private final JScrollPane gegnerkartenpane = new JScrollPane(); - private final JPanel gegnerkarten = new JPanel(); - private final JButton getname = new JButton("setzen"); - private final JPanel panel_3 = new JPanel(); + private JScrollPane gegnerkartenpane = new JScrollPane(); + private JPanel gegnerkarten = new JPanel(); + private JButton getname = new JButton("setzen"); + private JPanel panel_3 = new JPanel(); private final JLabel level_beschreibung = new JLabel("Aktuelles Level:"); - private final JLabel level_count = new JLabel("0"); + private JLabel level_count = new JLabel("0"); + private final JLabel lblNewLabel_2 = new JLabel(""); //Moving Image @@ -228,8 +229,11 @@ public class Dashboard_GUI extends JPanel{ mitte.add(mitte_oben, BorderLayout.NORTH); mitte_oben.setLayout(new BorderLayout(0, 0)); + start.setBackground(Color.WHITE); + start.setForeground(Color.WHITE); panelCont.add(start, "3"); start.setLayout(new BorderLayout(0, 0)); + panel.setBackground(Color.WHITE); panel.setPreferredSize(new Dimension(10, 30)); start.add(panel, BorderLayout.NORTH); @@ -246,8 +250,10 @@ public class Dashboard_GUI extends JPanel{ getspielername(); } }); + panel_1.setBackground(Color.WHITE); start.add(panel_1, BorderLayout.CENTER); panel_1.setLayout(new BorderLayout(0, 0)); + panel_3.setBackground(Color.WHITE); panel_3.setPreferredSize(new Dimension(100, 50)); panel_1.add(panel_3, BorderLayout.NORTH); @@ -259,6 +265,12 @@ public class Dashboard_GUI extends JPanel{ level_count.setFont(new Font("Tahoma", Font.PLAIN, 22)); panel_3.add(level_count); + lblNewLabel_2.setBackground(Color.LIGHT_GRAY); + lblNewLabel_2.setHorizontalTextPosition(SwingConstants.CENTER); + lblNewLabel_2.setHorizontalAlignment(SwingConstants.CENTER); + lblNewLabel_2.setIcon(new ImageIcon(Dashboard_GUI.class.getResource("/img/jaujau.gif"))); + + panel_1.add(lblNewLabel_2, BorderLayout.CENTER); start.add(panel_2, BorderLayout.SOUTH); @@ -307,7 +319,7 @@ public class Dashboard_GUI extends JPanel{ - public void renderStart(){ + private void renderStart(){ spielername.removeAllItems(); for(int i = 0; i