diff --git a/src/main/java/Enigma/GuiController.java b/src/main/java/Enigma/GuiController.java
index c5bb75c83804ac83e6f39aeebc35bbdcded0f63c..6fc8545808f93994f22664f6aa82bef319c96404 100644
--- a/src/main/java/Enigma/GuiController.java
+++ b/src/main/java/Enigma/GuiController.java
@@ -1,7 +1,12 @@
package Enigma;
+import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.*;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.paint.Color;
import java.awt.event.ActionEvent;
@@ -13,6 +18,7 @@ public class GuiController {
private final static String[] str= {"I", "II", "III", "IV", "V"};
private final static String[] num ={"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26"};
private final static String[] bs ={"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
+ private String textEingabe="";
@FXML
@@ -96,6 +102,85 @@ public class GuiController {
@FXML
private Button btnLöschen;
+ @FXML
+ private Button btnP1;
+
+ @FXML
+ private Button btnY1;
+
+ @FXML
+ private Button btnX1;
+
+ @FXML
+ private Button btnC1;
+
+ @FXML
+ private Button btnV1;
+
+ @FXML
+ private Button btnB1;
+
+ @FXML
+ private Button btnN1;
+
+ @FXML
+ private Button btnM1;
+
+ @FXML
+ private Button btnL1;
+
+ @FXML
+ private Button btnA1;
+
+ @FXML
+ private Button btnS1;
+
+ @FXML
+ private Button btnD1;
+
+ @FXML
+ private Button btnF1;
+
+ @FXML
+ private Button btnG1;
+
+ @FXML
+ private Button btnH1;
+
+ @FXML
+ private Button btnJ1;
+
+ @FXML
+ private Button btnK1;
+
+ @FXML
+ private Button btnQ1;
+
+ @FXML
+ private Button btnW1;
+
+ @FXML
+ private Button btnE1;
+
+ @FXML
+ private Button btnR1;
+
+ @FXML
+ private Button btnT1;
+
+ @FXML
+ private Button btnZ1;
+
+ @FXML
+ private Button btnU1;
+
+ @FXML
+ private Button btnI1;
+
+ @FXML
+ private Button btnO1;
+
+
@FXML
private MenuButton mBtnWalzPos1;
@@ -126,8 +211,6 @@ public class GuiController {
@FXML
private TextField tfcodiert;
- @FXML
- private TextField tfKenngruppe;
@FXML
private MenuButton mBtnNotchPos1;
@@ -137,6 +220,7 @@ public class GuiController {
}
+
@FXML
void btnempfangen() {
}
@@ -225,7 +309,6 @@ public class GuiController {
assert mBtnStartPos2 != null : "fx:id=\"mBtnStartPos2\" was not injected: check your FXML file 'gui.fxml'.";
assert tfrein != null : "fx:id=\"tfrein\" was not injected: check your FXML file 'gui.fxml'.";
assert tfcodiert != null : "fx:id=\"tfcodiert\" was not injected: check your FXML file 'gui.fxml'.";
- assert tfKenngruppe != null : "fx:id=\"tfKenngruppe\" was not injected: check your FXML file 'gui.fxml'.";
assert mBtnNotchPos1 != null : "fx:id=\"mBtnNotchPos1\" was not injected: check your FXML file 'gui.fxml'.";
// ActionListener den Butten hinzufügen
@@ -367,3 +450,7 @@ public class GuiController {
//TODO Benötige TestString aus der DB Codebuch
}
}
+
+
+
+
diff --git a/src/main/java/Enigma/SecondaryController.java b/src/main/java/Enigma/KenngruppeController.java
similarity index 68%
rename from src/main/java/Enigma/SecondaryController.java
rename to src/main/java/Enigma/KenngruppeController.java
index 360bb06245d64f0367068d81be1f0ab2587ff7f6..a72feab71a816a33b95db6f7b4abfe44b0176c52 100644
--- a/src/main/java/Enigma/SecondaryController.java
+++ b/src/main/java/Enigma/KenngruppeController.java
@@ -3,10 +3,10 @@ package Enigma;
import java.io.IOException;
import javafx.fxml.FXML;
-public class SecondaryController {
+public class KenngruppeController {
@FXML
private void switchToPrimary() throws IOException {
- App.setRoot("primary");
+ App.setRoot("gui");
}
}
\ No newline at end of file
diff --git a/src/main/resources/Enigma/gui.fxml b/src/main/resources/Enigma/gui.fxml
index e196eeb372928689afae3f8a86b530dc278f28ac..fc579bdc36786a3fd52f03a254a2aa3261483f3f 100644
--- a/src/main/resources/Enigma/gui.fxml
+++ b/src/main/resources/Enigma/gui.fxml
@@ -6,22 +6,23 @@
<?import javafx.scene.control.MenuButton?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.paint.RadialGradient?>
+<?import javafx.scene.paint.Stop?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="967.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Enigma.GuiController">
<children>
- <TextField layoutX="43.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="112.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="187.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="272.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="346.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="413.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="476.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="544.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="617.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <TextField layoutX="693.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" />
- <ButtonBar layoutX="31.0" layoutY="570.0" prefHeight="36.0" prefWidth="860.0">
+ <TextField fx:id="tfStecker1" layoutX="104.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="104.0" />
+ <TextField fx:id="tfStecker2" layoutX="184.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="184.0" />
+ <TextField fx:id="tfStecker3" layoutX="263.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="263.0" />
+ <TextField fx:id="tfStecker4" layoutX="343.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="343.0" />
+ <TextField fx:id="tfStecker5" layoutX="416.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="416.0" />
+ <TextField fx:id="tfStecker6" layoutX="496.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="496.0" />
+ <TextField fx:id="tfStecker7" layoutX="576.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="576.0" />
+ <TextField fx:id="tfStecker8" layoutX="656.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="656.0" />
+ <TextField fx:id="tfStecker9" layoutX="736.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="736.0" />
+ <TextField fx:id="tfStecker10" layoutX="816.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="816.0" />
+ <ButtonBar layoutX="-39.0" layoutY="571.0" prefHeight="36.0" prefWidth="860.0">
<buttons>
- <Button fx:id="btnL" mnemonicParsing="false" onAction="#gedrueckteTaste" text="L" />
<Button fx:id="btnP" mnemonicParsing="false" onAction="#gedrueckteTaste" text="P" />
<Button fx:id="btnY" mnemonicParsing="false" onAction="#gedrueckteTaste" text="Y" />
<Button fx:id="btnX" mnemonicParsing="false" onAction="#gedrueckteTaste" text="X" />
@@ -30,9 +31,10 @@
<Button fx:id="btnB" mnemonicParsing="false" onAction="#gedrueckteTaste" text="B" />
<Button fx:id="btnN" mnemonicParsing="false" onAction="#gedrueckteTaste" text="N" />
<Button fx:id="btnM" mnemonicParsing="false" onAction="#gedrueckteTaste" text="M" />
+ <Button fx:id="btnL" mnemonicParsing="false" onAction="#gedrueckteTaste" text="L" />
</buttons>
</ButtonBar>
- <ButtonBar layoutX="15.0" layoutY="534.0" prefHeight="36.0" prefWidth="860.0">
+ <ButtonBar layoutX="-87.0" layoutY="527.0" prefHeight="36.0" prefWidth="860.0">
<buttons>
<Button fx:id="btnA" mnemonicParsing="false" onAction="#gedrueckteTaste" text="A" />
<Button fx:id="btnS" mnemonicParsing="false" onAction="#gedrueckteTaste" text="S" />
@@ -58,49 +60,11 @@
<Button fx:id="btnLöschen" mnemonicParsing="false" text="Löschen" />
</buttons>
</ButtonBar>
- <ButtonBar layoutX="39.0" layoutY="418.0" prefHeight="36.0" prefWidth="860.0">
- <buttons>
- <Button mnemonicParsing="false" text="L" />
- <Button mnemonicParsing="false" text="P" />
- <Button mnemonicParsing="false" text="Y" />
- <Button mnemonicParsing="false" text="X" />
- <Button mnemonicParsing="false" text="C" />
- <Button mnemonicParsing="false" text="V" />
- <Button mnemonicParsing="false" text="B" />
- <Button mnemonicParsing="false" text="N" />
- <Button mnemonicParsing="false" text="M" />
- </buttons>
- </ButtonBar>
- <ButtonBar layoutX="23.0" layoutY="382.0" prefHeight="36.0" prefWidth="860.0">
- <buttons>
- <Button mnemonicParsing="false" text="A" />
- <Button mnemonicParsing="false" text="S" />
- <Button mnemonicParsing="false" text="D" />
- <Button mnemonicParsing="false" text="F" />
- <Button mnemonicParsing="false" text="G" />
- <Button mnemonicParsing="false" text="H" />
- <Button mnemonicParsing="false" text="J" />
- <Button mnemonicParsing="false" text="K" />
- </buttons>
- </ButtonBar>
- <ButtonBar layoutX="30.0" layoutY="339.0" prefHeight="25.0" prefWidth="583.0">
- <buttons>
- <Button minWidth="13.0" mnemonicParsing="false" prefHeight="25.0" text="Q" />
- <Button mnemonicParsing="false" text="W" />
- <Button mnemonicParsing="false" text="E" />
- <Button mnemonicParsing="false" text="R" />
- <Button mnemonicParsing="false" text="T" />
- <Button mnemonicParsing="false" text="Z" />
- <Button mnemonicParsing="false" text="U" />
- <Button mnemonicParsing="false" text="I" />
- <Button mnemonicParsing="false" text="O" />
- </buttons>
- </ButtonBar>
- <MenuButton fx:id="mBtnWalzPos1" layoutX="91.0" layoutY="76.0" mnemonicParsing="false" text="I">
+ <MenuButton fx:id="mBtnWalzPos1" alignment="CENTER_RIGHT" contentDisplay="CENTER" layoutX="91.0" layoutY="76.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="I" AnchorPane.leftAnchor="90.0" AnchorPane.topAnchor="80.0">
</MenuButton>
- <MenuButton fx:id="mBtnWalzPos3" layoutX="171.0" layoutY="76.0" mnemonicParsing="false" text="I">
+ <MenuButton fx:id="mBtnWalzPos3" alignment="CENTER_RIGHT" layoutX="208.0" layoutY="80.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="I" textAlignment="CENTER" AnchorPane.leftAnchor="210.0" AnchorPane.topAnchor="80.0">
</MenuButton>
- <MenuButton fx:id="mBtnWalzPos2" layoutX="133.0" layoutY="76.0" mnemonicParsing="false" text="I">
+ <MenuButton fx:id="mBtnWalzPos2" alignment="CENTER_RIGHT" layoutX="152.0" layoutY="80.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="I" textAlignment="CENTER" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="80.0">
</MenuButton>
<!-- <MenuButton layoutX="93.0" layoutY="114.0" mnemonicParsing="false">-->
<!-- <items>-->
@@ -132,26 +96,70 @@
<!-- <MenuItem mnemonicParsing="false" onAction="#z26" text="26" />-->
<!-- </items>-->
<!-- </MenuButton>-->
- <MenuButton fx:id="mBtnNotchPos3" layoutX="173.0" layoutY="114.0" mnemonicParsing="false" text="1">
+ <MenuButton fx:id="mBtnNotchPos3" alignment="CENTER_RIGHT" layoutX="208.0" layoutY="120.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="1" textAlignment="CENTER" AnchorPane.leftAnchor="210.0" AnchorPane.topAnchor="120.0">
</MenuButton>
- <MenuButton fx:id="mBtnNotchPos2" layoutX="135.0" layoutY="114.0" mnemonicParsing="false" text="1">
+ <MenuButton fx:id="mBtnNotchPos2" alignment="CENTER_RIGHT" layoutX="152.0" layoutY="120.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="1" textAlignment="CENTER" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="120.0">
</MenuButton>
- <MenuButton fx:id="mBtnStartPos1" layoutX="95.0" layoutY="157.0" mnemonicParsing="false" text="A">
+ <MenuButton fx:id="mBtnStartPos1" alignment="CENTER_RIGHT" layoutX="95.0" layoutY="157.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="A" textAlignment="CENTER" AnchorPane.leftAnchor="90.0" AnchorPane.topAnchor="160.0">
</MenuButton>
- <MenuButton fx:id="mBtnStartPos3" layoutX="175.0" layoutY="157.0" mnemonicParsing="false" text="A">
+ <MenuButton fx:id="mBtnStartPos3" alignment="CENTER_RIGHT" layoutX="208.0" layoutY="160.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="A" textAlignment="CENTER" AnchorPane.leftAnchor="210.0" AnchorPane.topAnchor="160.0">
</MenuButton>
- <MenuButton fx:id="mBtnStartPos2" layoutX="137.0" layoutY="157.0" mnemonicParsing="false" text="A">
+ <MenuButton fx:id="mBtnStartPos2" alignment="CENTER_RIGHT" layoutX="152.0" layoutY="160.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="A" textAlignment="CENTER" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="160.0">
</MenuButton>
- <TextField fx:id="tfrein" layoutX="246.0" layoutY="76.0" prefHeight="77.0" prefWidth="410.0" />
- <TextField fx:id="tfcodiert" layoutX="248.0" layoutY="182.0" prefHeight="77.0" prefWidth="410.0" />
- <Button layoutX="717.0" layoutY="221.0" mnemonicParsing="false" onAction="#btnsenden" prefHeight="69.0" prefWidth="164.0" text="An Funker senden" />
- <Button layoutX="717.0" layoutY="135.0" mnemonicParsing="false" onAction="#btnempfangen" prefHeight="69.0" prefWidth="164.0" text="Funkspruch empfangen" />
- <TextField fx:id="tfKenngruppe" layoutX="725.0" layoutY="76.0" />
- <Label layoutX="727.0" layoutY="51.0" prefHeight="17.0" prefWidth="149.0" text="Kenngruppe" />
- <MenuButton fx:id="mBtnNotchPos1" layoutX="93.0" layoutY="114.0" mnemonicParsing="false" text="1" />
- <Label layoutX="29.0" layoutY="80.0" text="Walze" />
- <Label layoutX="29.0" layoutY="127.0" text="Ringe" />
- <Label layoutX="11.0" layoutY="161.0" text="Startposition" />
+ <TextField fx:id="tfrein" editable="false" layoutX="279.0" layoutY="76.0" prefHeight="77.0" prefWidth="410.0" />
+ <TextField fx:id="tfcodiert" editable="false" layoutX="279.0" layoutY="183.0" prefHeight="77.0" prefWidth="410.0" />
+ <Button layoutX="726.0" layoutY="187.0" mnemonicParsing="false" onAction="#btnsenden" prefHeight="69.0" prefWidth="164.0" text="An Funker senden" />
+ <Button layoutX="726.0" layoutY="80.0" mnemonicParsing="false" onAction="#btnempfangen" prefHeight="69.0" prefWidth="164.0" text="Funkspruch empfangen" />
+ <MenuButton fx:id="mBtnNotchPos1" alignment="CENTER_RIGHT" layoutX="93.0" layoutY="114.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="1" textAlignment="CENTER" AnchorPane.leftAnchor="90.0" AnchorPane.topAnchor="120.0" />
+ <Label layoutX="29.0" layoutY="80.0" text="Walze" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="84.0" />
+ <Label layoutX="29.0" layoutY="127.0" text="Ringe" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="124.0" />
+ <Label layoutX="17.0" layoutY="164.0" text="Startposition" AnchorPane.leftAnchor="17.0" AnchorPane.topAnchor="164.0" />
<Label layoutX="380.0" layoutY="27.0" prefHeight="17.0" prefWidth="172.0" text="Tageseinstellungen" />
+ <ButtonBar layoutX="-15.0" layoutY="408.0" prefHeight="36.0" prefWidth="860.0">
+ <buttons>
+ <Button fx:id="btnP1" mnemonicParsing="false" onAction="#leuchtTaste" text="P" />
+ <Button fx:id="btnY1" mnemonicParsing="false" onAction="#leuchtTaste" text="Y" />
+ <Button fx:id="btnX1" mnemonicParsing="false" onAction="#leuchtTaste" text="X" />
+ <Button fx:id="btnC1" mnemonicParsing="false" onAction="#leuchtTaste" text="C" />
+ <Button fx:id="btnV1" mnemonicParsing="false" onAction="#leuchtTaste" text="V" />
+ <Button fx:id="btnB1" mnemonicParsing="false" onAction="#leuchtTaste" text="B" />
+ <Button fx:id="btnN1" mnemonicParsing="false" onAction="#leuchtTaste" text="N" />
+ <Button fx:id="btnM1" mnemonicParsing="false" onAction="#leuchtTaste" text="M" />
+ <Button fx:id="btnL1" mnemonicParsing="false" onAction="#leuchtTaste" text="L" />
+ </buttons>
+ </ButtonBar>
+ <ButtonBar layoutX="-63.0" layoutY="364.0" prefHeight="36.0" prefWidth="860.0">
+ <buttons>
+ <Button fx:id="btnA1" mnemonicParsing="false" onAction="#leuchtTaste" text="A" />
+ <Button fx:id="btnS1" mnemonicParsing="false" onAction="#leuchtTaste" text="S" />
+ <Button fx:id="btnD1" mnemonicParsing="false" onAction="#leuchtTaste" text="D">
+ <textFill>
+ <RadialGradient centerX="0.5" centerY="0.5" radius="0.5">
+ <stops>
+ <Stop color="BLACK" />
+ <Stop color="WHITE" offset="1.0" />
+ </stops>
+ </RadialGradient>
+ </textFill></Button>
+ <Button fx:id="btnF1" mnemonicParsing="false" onAction="#leuchtTaste" text="F" />
+ <Button fx:id="btnG1" mnemonicParsing="false" onAction="#leuchtTaste" text="G" />
+ <Button fx:id="btnH1" mnemonicParsing="false" onAction="#leuchtTaste" text="H" />
+ <Button fx:id="btnJ1" mnemonicParsing="false" onAction="#leuchtTaste" text="J" />
+ <Button fx:id="btnK1" mnemonicParsing="false" onAction="#leuchtTaste" text="K" />
+ </buttons>
+ </ButtonBar>
+ <ButtonBar layoutX="46.0" layoutY="328.0" prefHeight="25.0" prefWidth="583.0">
+ <buttons>
+ <Button fx:id="btnQ1" disable="true" minWidth="26.0" mnemonicParsing="false" onAction="#leuchtTaste" prefHeight="25.0" text="Q" textFill="#544d4d" />
+ <Button fx:id="btnW1" mnemonicParsing="false" onAction="#leuchtTaste" text="W" />
+ <Button fx:id="btnE1" mnemonicParsing="false" onAction="#leuchtTaste" text="E" />
+ <Button fx:id="btnR1" mnemonicParsing="false" onAction="#leuchtTaste" text="R" />
+ <Button fx:id="btnT1" mnemonicParsing="false" onAction="#leuchtTaste" text="T" />
+ <Button fx:id="btnZ1" mnemonicParsing="false" onAction="#leuchtTaste" text="Z" />
+ <Button fx:id="btnU1" mnemonicParsing="false" onAction="#leuchtTaste" text="U" />
+ <Button fx:id="btnI1" mnemonicParsing="false" onAction="#leuchtTaste" text="I" />
+ <Button fx:id="btnO1" mnemonicParsing="false" onAction="#leuchtTaste" text="O" />
+ </buttons>
+ </ButtonBar>
</children>
</AnchorPane>
diff --git a/src/main/resources/Enigma/kenngruppe.fxml b/src/main/resources/Enigma/kenngruppe.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..69a72c6d5d706fe354cbc42579769619f52d23df
--- /dev/null
+++ b/src/main/resources/Enigma/kenngruppe.fxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="257.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Enigma.KenngruppeController">
+ <children>
+ <Label layoutX="81.0" layoutY="29.0" text="Bitte Kenngruppe eingeben!" AnchorPane.leftAnchor="70.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="30.0" />
+ <Button fx:id="secondaryButton" layoutX="72.0" layoutY="178.0" onAction="#switchToPrimary" text="Kenngruppe bestätigen!" AnchorPane.leftAnchor="70.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="170.0" />
+ <TextField layoutX="81.0" layoutY="84.0" AnchorPane.leftAnchor="70.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="100.0" />
+ </children>
+</AnchorPane>
diff --git a/src/main/resources/Enigma/secondary.fxml b/src/main/resources/Enigma/secondary.fxml
deleted file mode 100644
index 6f0d942833692b3137fbe7119541faecce085034..0000000000000000000000000000000000000000
--- a/src/main/resources/Enigma/secondary.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
-<?import javafx.geometry.Insets?>
-
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Enigma.SecondaryController">
- <children>
- <Label text="Secondary View" />
- <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
- </children>
- <padding>
- <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
- </padding>
-</VBox>