diff --git a/bin/de/brickedleveleditor/main/_de.properties b/bin/de/brickedleveleditor/main/_de.properties new file mode 100644 index 0000000000000000000000000000000000000000..5882f88395a5a5ffed32a3892767ab419021dc0b --- /dev/null +++ b/bin/de/brickedleveleditor/main/_de.properties @@ -0,0 +1,5 @@ +app.name=Bricked LevelEditor +version.code=0 +version.name=0.0.0 +version.date=19.10.16 +author=Max Wittig, Robert Goldmann \ No newline at end of file diff --git a/bin/de/brickedleveleditor/ui/GUI.fxml b/bin/de/brickedleveleditor/ui/GUI.fxml new file mode 100644 index 0000000000000000000000000000000000000000..23f129a13b8fad3dbf6a562d6aee370145a4e33a --- /dev/null +++ b/bin/de/brickedleveleditor/ui/GUI.fxml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import javafx.scene.control.Menu?> +<?import javafx.scene.control.MenuBar?> +<?import javafx.scene.control.MenuItem?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.ColumnConstraints?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.RowConstraints?> +<?import javafx.scene.layout.VBox?> + +<AnchorPane fx:id="anchorPane" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.brickedleveleditor.ui.Controller"> + <children> + <MenuBar layoutX="40.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> + <menus> + <Menu mnemonicParsing="false" text="File"> + <items> + <MenuItem fx:id="saveMenuItem" mnemonicParsing="false" text="Save" /> + <MenuItem mnemonicParsing="false" text="Unspecified Action" /> + </items> + </Menu> + <Menu mnemonicParsing="false" text="Hilfe"> + <items> + <MenuItem mnemonicParsing="false" onAction="#about" text="Über" /> + </items> + </Menu> + </menus> + </MenuBar> + <VBox fx:id="sidebarVBox" alignment="CENTER" layoutX="614.0" layoutY="29.0" prefHeight="572.0" prefWidth="186.0" AnchorPane.bottomAnchor="-1.0" AnchorPane.topAnchor="29.0" /> + <GridPane fx:id="gridPane" alignment="CENTER" gridLinesVisible="true" layoutX="14.0" layoutY="58.0" prefHeight="526.0" prefWidth="595.0" AnchorPane.bottomAnchor="16.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="191.0" AnchorPane.topAnchor="58.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + </rowConstraints> + </GridPane> + </children> +</AnchorPane> diff --git a/src/de/brickedleveleditor/ui/BrickLabel.java b/src/de/brickedleveleditor/ui/BrickLabel.java index 1ef1a69f4d00646837fbf88d47ee011dd63437b3..030ef6808b2d10ccc5b0469b517e084461964703 100644 --- a/src/de/brickedleveleditor/ui/BrickLabel.java +++ b/src/de/brickedleveleditor/ui/BrickLabel.java @@ -17,7 +17,7 @@ public class BrickLabel extends Label public BrickLabel(BrickType brickType, PowerUpType powerUpType) { - super(brickType.getID() + powerUpType.getId()); + super(brickType.getID() + powerUpType.getID()); this.brickType = brickType; this.powerUpType = powerUpType; @@ -36,7 +36,7 @@ public class BrickLabel extends Label public void setBrickType(BrickType brickType) { this.brickType = brickType; - setText(this.brickType.getID()+this.powerUpType.getId()); + setText(this.brickType.getID()+this.powerUpType.getID()); } public PowerUpType getPowerUpType() @@ -47,6 +47,6 @@ public class BrickLabel extends Label public void setPowerUpType(PowerUpType powerUpType) { this.powerUpType = powerUpType; - setText(this.brickType.getID()+this.powerUpType.getId()); + setText(this.brickType.getID()+this.powerUpType.getID()); } } diff --git a/src/de/brickedleveleditor/ui/Controller.java b/src/de/brickedleveleditor/ui/Controller.java index 017e1e75cec90160fa51d3e5e4c540be64646333..0fd204c7412333e650a839331c5ae2c16e1b3a25 100644 --- a/src/de/brickedleveleditor/ui/Controller.java +++ b/src/de/brickedleveleditor/ui/Controller.java @@ -8,9 +8,9 @@ import java.util.ResourceBundle; import de.bricked.game.bricks.Brick; import de.bricked.game.bricks.BrickType; +import de.bricked.game.paddle.PaddleSize; import de.bricked.game.powerups.PowerUpType; import de.brickedleveleditor.game.levels.LevelPackWriter; -import de.bricked.game.paddle.PaddleSize; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.fxml.FXML; @@ -21,9 +21,18 @@ import javafx.scene.control.Alert.AlertType; import javafx.scene.control.Label; import javafx.scene.control.MenuItem; import javafx.scene.image.Image; -import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; -import javafx.scene.layout.*; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundImage; +import javafx.scene.layout.BackgroundPosition; +import javafx.scene.layout.BackgroundRepeat; +import javafx.scene.layout.BackgroundSize; +import javafx.scene.layout.ColumnConstraints; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.RowConstraints; +import javafx.scene.layout.VBox; import javafx.scene.paint.Paint; import javafx.stage.Stage; import javafx.stage.WindowEvent; @@ -99,7 +108,7 @@ public class Controller powerupTextures.add(null); for (int i=1; i < PowerUpType.types.length; i++) { - File powerupPath = new File(rootPath + PowerUpType.types[i].getId() + fileExt); + File powerupPath = new File(rootPath + PowerUpType.types[i].getID() + fileExt); try { Image image = new Image(powerupPath.getPath());