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

Merge branch 'master' into 'master' 

Master

See merge request !117
parents c3834507 57006543
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/resources/projekt/enigma/gui.fxml
+ 81
− 97
View file @ 152b13ae
...@@ -124,56 +124,6 @@ ...@@ -124,56 +124,6 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<children> <children>
<TextField fx:id="tfStecker1" prefHeight="25.0" prefWidth="20.0" GridPane.columnIndex="1" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker2" prefHeight="25.0" prefWidth="20.0" GridPane.columnIndex="2" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker3" prefHeight="25.0" prefWidth="20.0" GridPane.columnIndex="3" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker4" prefHeight="25.0" prefWidth="20.0" GridPane.columnIndex="4" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker5" prefHeight="25.0" prefWidth="48.0" GridPane.columnIndex="5" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker6" prefHeight="25.0" prefWidth="48.0" GridPane.columnIndex="6" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker7" prefHeight="25.0" prefWidth="48.0" GridPane.columnIndex="7" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker8" prefHeight="25.0" prefWidth="48.0" GridPane.columnIndex="8" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker9" prefHeight="25.0" prefWidth="48.0" GridPane.columnIndex="9" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="tfStecker10" prefHeight="25.0" prefWidth="48.0" GridPane.columnIndex="10" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</TextField>
<Button fx:id="btnA" minHeight="35.0" mnemonicParsing="false" onMousePressed="#tasteRunter" onMouseReleased="#tasteRauf" prefHeight="43.0" prefWidth="45.0" style="-fx-background-radius: 100; -fx-background-color: #0d0d0d;" text="A" textFill="#fffdfd" GridPane.columnIndex="2" GridPane.rowIndex="5"> <Button fx:id="btnA" minHeight="35.0" mnemonicParsing="false" onMousePressed="#tasteRunter" onMouseReleased="#tasteRauf" prefHeight="43.0" prefWidth="45.0" style="-fx-background-radius: 100; -fx-background-color: #0d0d0d;" text="A" textFill="#fffdfd" GridPane.columnIndex="2" GridPane.rowIndex="5">
<font> <font>
<Font name="System Bold" size="18.0" /> <Font name="System Bold" size="18.0" />
...@@ -674,54 +624,88 @@ ...@@ -674,54 +624,88 @@
<Pane fx:id="port0" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <Pane fx:id="port0" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
</children> </children>
</Pane> </Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="7"> <Button fx:id="btnPort0" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="1" GridPane.rowIndex="8">
<children> <padding>
<Pane fx:id="port1" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <Insets left="10.0" right="10.0" />
</children> </padding>
</Pane> <GridPane.margin>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="3" GridPane.rowIndex="7"> <Insets left="10.0" right="10.0" />
<children> </GridPane.margin>
<Pane fx:id="port2" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> </Button>
</children> <Button fx:id="btnPort9" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="10" GridPane.rowIndex="8">
</Pane> <padding>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="4" GridPane.rowIndex="7"> <Insets left="10.0" right="10.0" />
<children> </padding>
<Pane fx:id="port3" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <GridPane.margin>
</children> <Insets left="10.0" right="10.0" />
</Pane> </GridPane.margin>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="5" GridPane.rowIndex="7"> </Button>
<children> <Button fx:id="btnPort8" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="9" GridPane.rowIndex="8">
<Pane fx:id="port4" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <padding>
</children> <Insets left="10.0" right="10.0" />
</Pane> </padding>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="6" GridPane.rowIndex="7"> <GridPane.margin>
<children> <Insets left="10.0" right="10.0" />
<Pane fx:id="port5" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> </GridPane.margin>
</children> </Button>
</Pane> <Button fx:id="btnPort7" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="8" GridPane.rowIndex="8">
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="7" GridPane.rowIndex="7"> <padding>
<children> <Insets left="10.0" right="10.0" />
<Pane fx:id="port6" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> </padding>
</children> <GridPane.margin>
</Pane> <Insets left="10.0" right="10.0" />
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="8" GridPane.rowIndex="7"> </GridPane.margin>
<children> </Button>
<Pane fx:id="port7" disable="true" layoutY="-304.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <Button fx:id="btnPort6" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="7" GridPane.rowIndex="8">
</children> <padding>
</Pane> <Insets left="10.0" right="10.0" />
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="9" GridPane.rowIndex="7"> </padding>
<children> <GridPane.margin>
<Pane fx:id="port8" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <Insets left="10.0" right="10.0" />
</children> </GridPane.margin>
</Pane> </Button>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="10" GridPane.rowIndex="7"> <Button fx:id="btnPort5" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="6" GridPane.rowIndex="8">
<children> <padding>
<Pane fx:id="port9" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" /> <Insets left="10.0" right="10.0" />
</children> </padding>
</Pane> <GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</Button>
<Button fx:id="btnPort4" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="5" GridPane.rowIndex="8">
<padding>
<Insets left="10.0" right="10.0" />
</padding>
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</Button>
<Button fx:id="btnPort3" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="4" GridPane.rowIndex="8">
<padding>
<Insets left="10.0" right="10.0" />
</padding>
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</Button>
<Button fx:id="btnPort2" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="3" GridPane.rowIndex="8">
<padding>
<Insets left="10.0" right="10.0" />
</padding>
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</Button>
<Button fx:id="btnPort1" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="2" GridPane.rowIndex="8">
<padding>
<Insets left="10.0" right="10.0" />
</padding>
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</Button>
</children> </children>
</GridPane> </GridPane>
<Label layoutX="684.0" layoutY="-164.0" prefHeight="17.0" prefWidth="195.0" />
<GridPane layoutX="297.0" layoutY="64.0" prefHeight="168.0" prefWidth="585.0"> <GridPane layoutX="297.0" layoutY="64.0" prefHeight="168.0" prefWidth="585.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
...@@ -750,6 +734,6 @@ ...@@ -750,6 +734,6 @@
</Button> </Button>
</children> </children>
</GridPane> </GridPane>
<Pane layoutX="-129.0" layoutY="248.0" prefHeight="346.0" prefWidth="67.0" /> <Label fx:id="lblKenngruppe" layoutX="682.0" layoutY="34.0" prefHeight="17.0" prefWidth="177.0" style="-fx-border-color: #000000;" />
</children> </children>
</AnchorPane> </AnchorPane>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment