Skip to content
Snippets Groups Projects
Commit 3a9710fe authored by Dennis Eisold's avatar Dennis Eisold
Browse files

Merge branch 'master' into 'master'

Master

See merge request alfatrainingkurse/java/enigma!111
parents 560529fa 76773e49
No related branches found
No related tags found
No related merge requests found
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
<?import javafx.scene.shape.Circle?> <?import javafx.scene.shape.Circle?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="962.0" xmlns="http://javafx.com/javafx/8.0.999-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="962.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController">
<children> <children>
<AnchorPane layoutX="207.0" layoutY="-111.0" prefHeight="111.0" prefWidth="487.0" AnchorPane.leftAnchor="207.0" AnchorPane.rightAnchor="274.0" />
<GridPane layoutX="23.0" layoutY="60.0" prefHeight="158.0" prefWidth="237.0" AnchorPane.leftAnchor="23.0" AnchorPane.topAnchor="60.0"> <GridPane layoutX="23.0" layoutY="60.0" prefHeight="158.0" prefWidth="237.0" AnchorPane.leftAnchor="23.0" AnchorPane.topAnchor="60.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
...@@ -670,7 +669,56 @@ ...@@ -670,7 +669,56 @@
<Insets left="42.0" /> <Insets left="42.0" />
</GridPane.margin> </GridPane.margin>
</Label> </Label>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="7" /> <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="7">
<children>
<Pane fx:id="port0" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="7">
<children>
<Pane fx:id="port1" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="3" GridPane.rowIndex="7">
<children>
<Pane fx:id="port2" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="4" GridPane.rowIndex="7">
<children>
<Pane fx:id="port3" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="5" GridPane.rowIndex="7">
<children>
<Pane fx:id="port4" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="6" GridPane.rowIndex="7">
<children>
<Pane fx:id="port5" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="7" GridPane.rowIndex="7">
<children>
<Pane fx:id="port6" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="8" GridPane.rowIndex="7">
<children>
<Pane fx:id="port7" layoutY="-304.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="9" GridPane.rowIndex="7">
<children>
<Pane fx:id="port8" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="10" GridPane.rowIndex="7">
<children>
<Pane fx:id="port9" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" />
</children>
</Pane>
</children> </children>
</GridPane> </GridPane>
<Label layoutX="684.0" layoutY="-164.0" prefHeight="17.0" prefWidth="195.0" /> <Label layoutX="684.0" layoutY="-164.0" prefHeight="17.0" prefWidth="195.0" />
...@@ -702,5 +750,6 @@ ...@@ -702,5 +750,6 @@
</Button> </Button>
</children> </children>
</GridPane> </GridPane>
<Pane layoutX="-129.0" layoutY="248.0" prefHeight="346.0" prefWidth="67.0" />
</children> </children>
</AnchorPane> </AnchorPane>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment