From e0748ceff9a87171a77e8ed81eb87a08b6c6d606 Mon Sep 17 00:00:00 2001 From: Joshua Date: Sun, 15 Dec 2024 16:55:59 +0100 Subject: [PATCH] Small Stuff --- src/GameBoard.java | 21 ++++++++++++++------- src/JoinGame.java | 2 ++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/GameBoard.java b/src/GameBoard.java index 1337b5b..fc85c47 100644 --- a/src/GameBoard.java +++ b/src/GameBoard.java @@ -2,8 +2,6 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseAdapter; import java.util.List; /** @@ -38,7 +36,7 @@ public class GameBoard extends JPanel { JLabel frameTitle = new JLabel("GameBoard"); JLabel kontextText = new JLabel(kT1); - JButton backButton = new JButton(backButtonIcon); + JButton giveUpButton = new JButton("Aufgeben"); // Eigene ModulButtons /** @@ -54,7 +52,14 @@ public class GameBoard extends JPanel { buildPanel(frame, semesterCounter); List shipsP1 =p1.getBoard().getShips(); List shipsP2 =p2.getBoard().getShips(); - backButton.addActionListener(e -> frame.showPanel("MainMenu")); + + //TODO Bei aufgeben muss (noch nicht existierende Funktion im Backend aufgerufen werden) + giveUpButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + frame.showPanel("MainMenu"); + } + }); } /* TODO löschen falls nicht gebraucht @@ -66,7 +71,7 @@ public class GameBoard extends JPanel { } */ - // Timer für pulsierenden Effekt + // Timer für pulsierenden SchwarzGrau-Effekt Timer timer = new Timer(10, new ActionListener() { private int grayValue = 50; // Start-Grauwert (0 = Schwarz, 255 = Weiß) private boolean increasing = false; // Richtung des Pulsierens @@ -130,7 +135,7 @@ public class GameBoard extends JPanel { headerPanel.setLayout(new BorderLayout()); headerPanel.add(kontextText, BorderLayout.WEST); kontextText.setFont(new Font("Roboto", Font.BOLD, 30)); //TODO setFont fixen - headerPanel.add(backButton, BorderLayout.EAST); + headerPanel.add(giveUpButton, BorderLayout.EAST); JPanel leftButtonsPanel = new JPanel(); leftButtonsPanel.setLayout(new GridLayout(7, 1)); // 6 Buttons untereinander @@ -172,12 +177,14 @@ public class GameBoard extends JPanel { ownBoardPanel.resetAllShips(); } }); - + //TODO buttons erst nach fertigem setzten ausblenden lassen readyButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { kontextText.setText(kT2); p1.ready(); + readyButton.setEnabled(false); + resetButton.setEnabled(false); } }); diff --git a/src/JoinGame.java b/src/JoinGame.java index 76ad2c7..d33d4d6 100644 --- a/src/JoinGame.java +++ b/src/JoinGame.java @@ -8,6 +8,8 @@ import java.net.InetSocketAddress; /** * Das JoinGame Panel dient zum setzten des Ports/IP-Adresse. * Anschließend kann das Verbinden Panel gezeigt werden. + * 51525 + * ssh.lgc.sh */ public class JoinGame extends JPanel { // Grafiken