From f83b06d345f7f2bde219ad04290a06c99477f8d7 Mon Sep 17 00:00:00 2001
From: Jan <janschubert93@web.de>
Date: Wed, 4 Dec 2019 15:09:37 +0100
Subject: [PATCH 1/2] GUI mit einem Panel
---
src/main/resources/projekt/enigma/gui.fxml | 47 ----------------------
1 file changed, 47 deletions(-)
diff --git a/src/main/resources/projekt/enigma/gui.fxml b/src/main/resources/projekt/enigma/gui.fxml
index 3080961..2fed1ba 100644
--- a/src/main/resources/projekt/enigma/gui.fxml
+++ b/src/main/resources/projekt/enigma/gui.fxml
@@ -674,54 +674,8 @@
<Pane fx:id="port0" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
</children>
</Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port1" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="3" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port2" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="4" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port3" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="5" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port4" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="6" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port5" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="7" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port6" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="8" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port7" disable="true" layoutY="-304.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="9" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port8" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="10" GridPane.rowIndex="7">
- <children>
- <Pane fx:id="port9" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
- </children>
- </Pane>
</children>
</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">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -750,6 +704,5 @@
</Button>
</children>
</GridPane>
- <Pane layoutX="-129.0" layoutY="248.0" prefHeight="346.0" prefWidth="67.0" />
</children>
</AnchorPane>
--
GitLab
From 570065432b670ad0fc591c8113330d8540e1f327 Mon Sep 17 00:00:00 2001
From: Jan <janschubert93@web.de>
Date: Wed, 4 Dec 2019 15:29:23 +0100
Subject: [PATCH 2/2] GUI mit port Buttons und Kenngruppen Label
---
src/main/resources/projekt/enigma/gui.fxml | 131 +++++++++++++--------
1 file changed, 81 insertions(+), 50 deletions(-)
diff --git a/src/main/resources/projekt/enigma/gui.fxml b/src/main/resources/projekt/enigma/gui.fxml
index 2fed1ba..880cf98 100644
--- a/src/main/resources/projekt/enigma/gui.fxml
+++ b/src/main/resources/projekt/enigma/gui.fxml
@@ -124,56 +124,6 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<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">
<font>
<Font name="System Bold" size="18.0" />
@@ -674,6 +624,86 @@
<Pane fx:id="port0" disable="true" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" visible="false" />
</children>
</Pane>
+ <Button fx:id="btnPort0" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="1" 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="btnPort9" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="10" 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="btnPort8" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="9" 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="btnPort7" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="8" 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="btnPort6" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="7" 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="btnPort5" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" prefWidth="79.0" GridPane.columnIndex="6" 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="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>
</GridPane>
<GridPane layoutX="297.0" layoutY="64.0" prefHeight="168.0" prefWidth="585.0">
@@ -704,5 +734,6 @@
</Button>
</children>
</GridPane>
+ <Label fx:id="lblKenngruppe" layoutX="682.0" layoutY="34.0" prefHeight="17.0" prefWidth="177.0" style="-fx-border-color: #000000;" />
</children>
</AnchorPane>
--
GitLab