From 36b308e61633916e66dd08ad63aee1a2e7b7d27c Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Mon, 2 Dec 2024 01:49:56 +0100 Subject: [PATCH 1/2] fixed TradeMenu formating --- .../pp/monopoly/client/gui/TradeMenu.java | 43 ++++++++----------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java index b731ae3..7efcae4 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java @@ -84,24 +84,6 @@ public class TradeMenu extends Dialog { mainContent.addChild(createMiddleSection()); mainContent.addChild(createTradeColumn("Wähle Zielobjekt:", false)); - Container buttons = mainContent.addChild(new Container(new SpringGridLayout())); - Button cancel = new Button("Abbrechen"); - cancel.addClickCommands(s -> ifTopDialog(() -> { - close(); - app.getGameLogic().playSound(Sound.BUTTON); - })); - - Button trade = new Button("Handeln"); - trade.addClickCommands(s -> ifTopDialog(() -> { - app.getGameLogic().playSound(Sound.BUTTON); - setTrades(); - app.getGameLogic().send(new TradeOffer(tradeHandler)); - close(); - })); - - buttons.addChild(cancel); - buttons.addChild(trade); - return mainContent; } @@ -196,16 +178,30 @@ public class TradeMenu extends Dialog { leftSelectionsField = middleSection.addChild(new TextField("")); leftSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); - Label arrows = middleSection.addChild(new Label("⇅")); - arrows.setFontSize(40); + Container buttons = middleSection.addChild(new Container(new SpringGridLayout())); + Button cancel = new Button("Abbrechen"); + cancel.addClickCommands(s -> ifTopDialog(() -> { + close(); + app.getGameLogic().playSound(Sound.BUTTON); + })); - rightSelectionsField = middleSection.addChild(new TextField("")); - rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); + Button trade = new Button("Handeln"); + trade.addClickCommands(s -> ifTopDialog(() -> { + app.getGameLogic().playSound(Sound.BUTTON); + setTrades(); + app.getGameLogic().send(new TradeOffer(tradeHandler)); + close(); + })); + + buttons.addChild(cancel); + buttons.addChild(trade); Label middleLabelBottom = middleSection.addChild(new Label("Gebäude: Währung: Sonderkarten:")); middleLabelBottom.setFontSize(24); middleLabelBottom.setInsets(new Insets3f(5, 5, 5, 5)); + rightSelectionsField = middleSection.addChild(new TextField("")); + rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); return middleSection; } @@ -217,6 +213,7 @@ public class TradeMenu extends Dialog { private void styleTextField(TextField textField) { textField.setInsets(new Insets3f(5, 10, 5, 10)); textField.setBackground(new QuadBackgroundComponent(ColorRGBA.Black)); + textField.setPreferredSize(new Vector3f(300, 30, 0)); } private void assignSelectors(Selector buildingSelector, Selector specialCardSelector, TextField currencyInput, boolean isLeft) { @@ -281,7 +278,6 @@ public class TradeMenu extends Dialog { } for (String property : leftselBuildings) { buildingText.append(property); - buildingText.append(", "); } } else { if (rightselBuildings.contains(building.getSelectedItem())) { @@ -291,7 +287,6 @@ public class TradeMenu extends Dialog { } for (String property : rightselBuildings) { buildingText.append(property); - buildingText.append(", "); } } From 95dc7b07e2d0a279732b89bf2df0f4f6dc1e012b Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Mon, 2 Dec 2024 02:40:53 +0100 Subject: [PATCH 2/2] fixed typos --- .../main/java/pp/monopoly/client/NetworkSupport.java | 11 ++++++----- .../pp/monopoly/client/gui/popups/WinnerPopUp.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/NetworkSupport.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/NetworkSupport.java index da9198f..5ecd257 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/NetworkSupport.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/NetworkSupport.java @@ -25,7 +25,7 @@ import java.lang.System.Logger.Level; import static pp.monopoly.Resources.lookup; /** - * Manages the network connection for the Battleship application. + * Manages the network connection for the Monopoly application. * Handles connecting to and disconnecting from the server, and sending messages. */ public class NetworkSupport implements MessageListener, ClientStateListener, ServerConnection { @@ -34,9 +34,9 @@ public class NetworkSupport implements MessageListener, ClientStateListe private Client client; /** - * Constructs a NetworkSupport instance for the given Battleship application. + * Constructs a NetworkSupport instance for the given Monopoly application. * - * @param app The Battleship application instance. + * @param app The Monopoly application instance. */ public NetworkSupport(MonopolyApp app) { this.app = app; @@ -44,6 +44,7 @@ public class NetworkSupport implements MessageListener, ClientStateListe /** * Return the client connections Id + * * @return the client id */ public int getId() { @@ -52,9 +53,9 @@ public class NetworkSupport implements MessageListener, ClientStateListe } /** - * Returns the Battleship application instance. + * Returns the Monopoly application instance. * - * @return Battleship application instance + * @return Monopoly application instance */ public MonopolyApp getApp() { return app; diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java index 95d31c2..afe1e3e 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java @@ -53,7 +53,7 @@ public class WinnerPopUp extends Dialog { backgroundContainer.setPreferredSize(WinnerContainer.getPreferredSize().addLocal(padding, padding, 0)); // Titel - Label winnerTitle = WinnerContainer.addChild(new Label("Herlichen Glückwunsch, du bist der neue Monopoly Champion!", new ElementId("header"))); + Label winnerTitle = WinnerContainer.addChild(new Label("Herzlichen Glückwunsch, du bist der neue Monopoly Champion!", new ElementId("header"))); winnerTitle.setFontSize(25); // winnerTitle.setColor(ColorRGBA.Black); // Create the image container