diff --git a/src/main/java/de/mannheim/th/chess/ui/MainFrame.java b/src/main/java/de/mannheim/th/chess/ui/MainFrame.java index 0f25218..96235ee 100644 --- a/src/main/java/de/mannheim/th/chess/ui/MainFrame.java +++ b/src/main/java/de/mannheim/th/chess/ui/MainFrame.java @@ -23,10 +23,11 @@ import javax.swing.JFileChooser; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Font; +import java.awt.Graphics; import java.awt.Color; public class MainFrame extends JFrame { - + private ArrayList spiele = new ArrayList<>(); private static final long serialVersionUID = 1L; @@ -59,19 +60,20 @@ public class MainFrame extends JFrame { setTitle("Schach"); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setBounds(100, 100, 500, 500); - + contentPane = new JPanel(); - contentPane.setBackground(Color.GRAY); - contentPane.setForeground(Color.GRAY); + contentPane.setBackground(new Color(90, 90, 90)); + contentPane.setForeground(Color.BLACK); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); setContentPane(contentPane); - + contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS)); contentPane.add(Box.createVerticalStrut(10)); JLabel lblNewLabel = new JLabel("Schach"); + lblNewLabel.setForeground(Color.BLACK); lblNewLabel.setFont(new Font("Serif", Font.BOLD, 60)); lblNewLabel.setAlignmentX(Component.CENTER_ALIGNMENT); contentPane.add(lblNewLabel); @@ -86,6 +88,7 @@ public class MainFrame extends JFrame { contentPane.add(Box.createVerticalStrut(75)); JButton btnNewButton = new JButton("Neues Spiel starten"); + btnNewButton.setBackground(Color.LIGHT_GRAY); btnNewButton.setForeground(Color.BLACK); btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16)); @@ -94,45 +97,48 @@ public class MainFrame extends JFrame { @Override public void actionPerformed(ActionEvent e) { - + SpielFrame sp = new SpielFrame(); spiele.add(sp); - + } - + }); contentPane.add(btnNewButton); contentPane.add(Box.createVerticalStrut(15)); JButton btnNewButton_1 = new JButton("Vergangenes Spiel laden"); + btnNewButton_1.setBackground(Color.LIGHT_GRAY); btnNewButton_1.setForeground(Color.BLACK); btnNewButton_1.setFont(new Font("Tahoma", Font.BOLD, 16)); btnNewButton_1.setAlignmentX(Component.CENTER_ALIGNMENT); btnNewButton_1.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - JFileChooser dateiWaehler = new JFileChooser(); - JFrame jfFile = new JFrame(); - int auswahl = dateiWaehler.showOpenDialog(jfFile); + JFileChooser dateiWaehler = new JFileChooser(); + JFrame jfFile = new JFrame(); + int auswahl = dateiWaehler.showOpenDialog(jfFile); + + if (auswahl == JFileChooser.APPROVE_OPTION) { + File ausgewaehlteDatei = dateiWaehler.getSelectedFile(); + JOptionPane.showMessageDialog(jfFile, "Gewählte Datei:\n" + ausgewaehlteDatei.getAbsolutePath()); + + // Uebergabe zu Logik zum extrahieren der Daten + } + } - if (auswahl == JFileChooser.APPROVE_OPTION) { - File ausgewaehlteDatei = dateiWaehler.getSelectedFile(); - JOptionPane.showMessageDialog(jfFile,"Gewählte Datei:\n" + ausgewaehlteDatei.getAbsolutePath()); - - //Uebergabe zu Logik zum extrahieren der Daten - } - } - }); - + contentPane.add(btnNewButton_1); contentPane.add(Box.createVerticalStrut(15)); JButton btnNewButton_2 = new JButton("Spiel beenden"); + btnNewButton_2.setBackground(Color.LIGHT_GRAY); btnNewButton_2.setForeground(Color.BLACK); btnNewButton_2.setFont(new Font("Tahoma", Font.BOLD, 16)); @@ -143,9 +149,9 @@ public class MainFrame extends JFrame { public void actionPerformed(ActionEvent e) { System.exit(0); } - + }); - + contentPane.add(btnNewButton_2); setVisible(true); } diff --git a/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java b/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java index a34c04e..73f190c 100644 --- a/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java +++ b/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java @@ -50,6 +50,7 @@ public class SpielFrame extends JFrame { setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setBounds(100, 100, 1920, 1080); setTitle("Spiel"); + setAlwaysOnTop(true); JPanel contentPane = new JPanel(); contentPane.setLayout(new BorderLayout()); @@ -87,6 +88,7 @@ public class SpielFrame extends JFrame { logger.info("Dunkles Feld erstellt."+i); b.setBackground(new Color(65, 65, 65)); } + b.setForeground(Color.WHITE); b.setBorderPainted(false);