Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy

@@ -297,37 +297,3 @@ selector("selector.item.label", "hover") {
     background = new QuadBackgroundComponent(new ColorRGBA(0.2f, 0.6f, 1.0f, 0.9f))  // Highlighted background
 }
 
-
-def enabledCommandToolbar = new Command<Button>() {
-    void execute(Button source) {
-        if (source.isEnabled())
-            source.setColor(ColorRGBA.White)
-        else
-            source.setColor(ColorRGBA.Gray)
-
-
-    }
-}
-
-def stdButtonCommandsToolbar = [
-        (ButtonAction.Down)    : [pressedCommand],
-        (ButtonAction.Up)      : [pressedCommand],
-        (ButtonAction.Enabled) : [enabledCommandToolbar],
-        (ButtonAction.Disabled): [enabledCommandToolbar]
-]
-
-selector("button-toolbar", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Orange border
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // Inner button background
-
-    // Apply the outer border as the main background
-    background = outerBackground
-
-    // Use insets to create a margin/padding effect for the inner background
-    insets = new Insets3f(3, 3, 3, 3) // Adjust the border thickness
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-    buttonCommands = stdButtonCommandsToolbar
-}
-
-

Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java

@@ -275,7 +275,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     //logik zum wechselnden erscheinen und verschwinden beim drücken von B //TODO süäter entfernen
     private void handleB(boolean isPressed) {
         if (isPressed) {
-            Dialog tmp = new SellHouse(this);
+            Dialog tmp = new ConfirmTrade(this);
             tmp.open();
         }
     }

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java

@@ -83,7 +83,7 @@ public class Toolbar extends Dialog implements GameEventListener {
         diceContainer.addChild(horizontalContainer);
 
         // Würfeln-Button
-        Button diceButton = new Button("Würfeln", new ElementId("button-toolbar"));
+        Button diceButton = new Button("Würfeln");
         diceButton.setPreferredSize(new Vector3f(200, 50, 0));
         diceButton.addClickCommands(s -> ifTopDialog(() -> {
             startDiceAnimation();
@@ -103,7 +103,7 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     private Button addTradeMenuButton() {
-        Button tradeButton = new Button("Handeln", new ElementId("button-toolbar"));
+        Button tradeButton = new Button("Handeln");
         tradeButton.setPreferredSize(new Vector3f(150, 50, 0));
         tradeButton.addClickCommands(s -> ifTopDialog(() -> {
             app.getGameLogic().playSound(Sound.BUTTON);
@@ -113,7 +113,7 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     private Button addPropertyMenuButton() {
-        Button propertyMenuButton = new Button("Grundstücke", new ElementId("button-toolbar"));
+        Button propertyMenuButton = new Button("Grundstücke");
         propertyMenuButton.setPreferredSize(new Vector3f(150, 50, 0));
         propertyMenuButton.setFontSize(30);
         propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> {
@@ -125,7 +125,7 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     private Button addEndTurnButton() {
-        Button endTurnButton = new Button("Zug beenden", new ElementId("button-toolbar"));
+        Button endTurnButton = new Button("Zug beenden");
         endTurnButton.setPreferredSize(new Vector3f(150, 50, 0));
         endTurnButton.addClickCommands(s -> ifTopDialog(() -> {
             app.getGameLogic().playSound(Sound.BUTTON);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/ConfirmTrade.java

@@ -38,7 +38,7 @@ public class ConfirmTrade extends Dialog {
         confirmTradeContainer = new Container();
         
         
-        Label title = confirmTradeContainer.addChild(new Label( "Handel", new ElementId("label-Bold"))); //TODO ggf die Buttons Sprachabhängig von den Properties machen
+        Label title = confirmTradeContainer.addChild(new Label( "Handel", new ElementId("label-Bold")));
         title.setFontSize(48);
         title.setColor(ColorRGBA.Black);
 

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/SellHouse.java

@@ -1,117 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyRequest;
-import pp.monopoly.notification.Sound;
-
-/**
- * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
- */
-public class SellHouse extends Dialog {
-    private final MonopolyApp app;
-    private final Container sellhouseContainer;
-    private final Container backgroundContainer;
-
-
-    public SellHouse(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-        
-        //Generate the corresponfing field
-        //int index = app.getGameLogic().getPlayerHandler().getPlayers().get(0).getFieldID();;
-        // BuildingProperty field = (BuildingProperty) new BoardManager().getFieldAtIndex(index);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für die Gebäudekarte
-        sellhouseContainer = new Container();
-        
-        
-        Label title = sellhouseContainer.addChild(new Label( "Gebäude Abreißen", new ElementId("label-Bold"))); //TODO ggf die Buttons Sprachabhängig von den Properties machen
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        Container upContainer = sellhouseContainer.addChild(new Container());
-        Container middleContainer = sellhouseContainer.addChild(new Container());
-        Container downContainer = sellhouseContainer.addChild(new Container());
-
-        // Text, der auf der Karte steht
-        // Die Preise werden dynamisch dem BoardManager entnommen
-        upContainer.addChild(new Label("„Grundstück wählen:", new ElementId("label-Text"))); //TODO hier überall die entsprechenden Variablen einfügen
-        upContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        upContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        middleContainer.setPreferredSize(new Vector3f(100, 150, 0));
-        middleContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Red));
-        middleContainer.addChild(new Label("Dies ist ein Container", new ElementId("label-Text")));
-        middleContainer.addChild(new Label("", new ElementId("label-Text")));
-        middleContainer.addChild(new Label("Hier kann der Slider und die Checkbocen eingefügt werden", new ElementId("label-Text")));
-        downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Erstattung:", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text")));
-        downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button cancelButton = sellhouseContainer.addChild(new Button("Abbrechen", new ElementId("button"))); //TODO ggf die Buttons Sprachabhängig von den Properties machen
-        cancelButton.setFontSize(32);
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button confirmButton = sellhouseContainer.addChild(new Button("Bestätigen", new ElementId("button"))); //TODO ggf die Buttons Sprachabhängig von den Properties machen
-        confirmButton.setFontSize(32);
-        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new BuyPropertyRequest());
-        }));
-
-
-        float padding = 10; // Padding around the settingsContainer for the background
-        backgroundContainer.setPreferredSize(sellhouseContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-
-        // Zentriere das Menü
-        sellhouseContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - sellhouseContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + sellhouseContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - sellhouseContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + sellhouseContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(sellhouseContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(sellhouseContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}