Skip to content
Snippets Groups Projects
Commit 315c5669 authored by Jan Schubert's avatar Jan Schubert
Browse files

Kenngruppen Dialog eingefügt

parent 06a2b65d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/Enigma/App.java
+ 1
− 1
View file @ 315c5669
...@@ -17,7 +17,7 @@ public class App extends Application { ...@@ -17,7 +17,7 @@ public class App extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
scene = new Scene(loadFXML("gui")); scene = new Scene(loadFXML("kenngruppe"));
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
......
src/main/java/Enigma/GuiController.java
+ 12
− 0
View file @ 315c5669
...@@ -171,6 +171,18 @@ public class GuiController { ...@@ -171,6 +171,18 @@ public class GuiController {
}); });
} }
} }
@FXML
private Button btnQ2;
@FXML
void gedrueckteTasteQ() {
btnQ2.setStyle("-fx-background-color: #ff0000");
//btnQ2.setStyle("-fx-background-color: #ffffff");
}
@FXML @FXML
void initialize() { void initialize() {
//Einträge für Walzen //Einträge für Walzen
......
src/main/java/Enigma/SecondaryController.java → src/main/java/Enigma/KenngruppeController.java
+ 2
− 2
View file @ 315c5669
...@@ -3,10 +3,10 @@ package Enigma; ...@@ -3,10 +3,10 @@ package Enigma;
import java.io.IOException; import java.io.IOException;
import javafx.fxml.FXML; import javafx.fxml.FXML;
public class SecondaryController { public class KenngruppeController {
@FXML @FXML
private void switchToPrimary() throws IOException { private void switchToPrimary() throws IOException {
App.setRoot("primary"); App.setRoot("gui");
} }
} }
\ No newline at end of file
src/main/resources/Enigma/gui.fxml
+ 66
− 66
View file @ 315c5669
...@@ -9,19 +9,18 @@ ...@@ -9,19 +9,18 @@
<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"> <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> <children>
<TextField layoutX="43.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="104.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="104.0" />
<TextField layoutX="112.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="184.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="184.0" />
<TextField layoutX="187.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="263.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="263.0" />
<TextField layoutX="272.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="343.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="343.0" />
<TextField layoutX="346.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="416.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="416.0" />
<TextField layoutX="413.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="496.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="496.0" />
<TextField layoutX="476.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="576.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="576.0" />
<TextField layoutX="544.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="656.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="656.0" />
<TextField layoutX="617.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="736.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="736.0" />
<TextField layoutX="693.0" layoutY="625.0" prefHeight="25.0" prefWidth="48.0" /> <TextField layoutX="816.0" layoutY="631.0" prefHeight="25.0" prefWidth="48.0" AnchorPane.bottomAnchor="21.0" AnchorPane.leftAnchor="816.0" />
<ButtonBar layoutX="31.0" layoutY="570.0" prefHeight="36.0" prefWidth="860.0"> <ButtonBar layoutX="-39.0" layoutY="571.0" prefHeight="36.0" prefWidth="860.0">
<buttons> <buttons>
<Button fx:id="btnL" mnemonicParsing="false" onAction="#gedrueckteTaste" text="L" />
<Button fx:id="btnP" mnemonicParsing="false" onAction="#gedrueckteTaste" text="P" /> <Button fx:id="btnP" mnemonicParsing="false" onAction="#gedrueckteTaste" text="P" />
<Button fx:id="btnY" mnemonicParsing="false" onAction="#gedrueckteTaste" text="Y" /> <Button fx:id="btnY" mnemonicParsing="false" onAction="#gedrueckteTaste" text="Y" />
<Button fx:id="btnX" mnemonicParsing="false" onAction="#gedrueckteTaste" text="X" /> <Button fx:id="btnX" mnemonicParsing="false" onAction="#gedrueckteTaste" text="X" />
...@@ -30,9 +29,10 @@ ...@@ -30,9 +29,10 @@
<Button fx:id="btnB" mnemonicParsing="false" onAction="#gedrueckteTaste" text="B" /> <Button fx:id="btnB" mnemonicParsing="false" onAction="#gedrueckteTaste" text="B" />
<Button fx:id="btnN" mnemonicParsing="false" onAction="#gedrueckteTaste" text="N" /> <Button fx:id="btnN" mnemonicParsing="false" onAction="#gedrueckteTaste" text="N" />
<Button fx:id="btnM" mnemonicParsing="false" onAction="#gedrueckteTaste" text="M" /> <Button fx:id="btnM" mnemonicParsing="false" onAction="#gedrueckteTaste" text="M" />
<Button fx:id="btnL" mnemonicParsing="false" onAction="#gedrueckteTaste" text="L" />
</buttons> </buttons>
</ButtonBar> </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> <buttons>
<Button fx:id="btnA" mnemonicParsing="false" onAction="#gedrueckteTaste" text="A" /> <Button fx:id="btnA" mnemonicParsing="false" onAction="#gedrueckteTaste" text="A" />
<Button fx:id="btnS" mnemonicParsing="false" onAction="#gedrueckteTaste" text="S" /> <Button fx:id="btnS" mnemonicParsing="false" onAction="#gedrueckteTaste" text="S" />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</ButtonBar> </ButtonBar>
<ButtonBar layoutX="22.0" layoutY="491.0" prefHeight="25.0" prefWidth="583.0"> <ButtonBar layoutX="22.0" layoutY="491.0" prefHeight="25.0" prefWidth="583.0">
<buttons> <buttons>
<Button fx:id="btnQ" minWidth="13.0" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="25.0" text="Q" /> <Button fx:id="btnQ" minWidth="13.0" mnemonicParsing="false" onAction="#gedrueckteTasteQ" prefHeight="25.0" text="Q" />
<Button fx:id="btnW" mnemonicParsing="false" onAction="#gedrueckteTaste" text="W" /> <Button fx:id="btnW" mnemonicParsing="false" onAction="#gedrueckteTaste" text="W" />
<Button fx:id="btnE" mnemonicParsing="false" onAction="#gedrueckteTaste" text="E" /> <Button fx:id="btnE" mnemonicParsing="false" onAction="#gedrueckteTaste" text="E" />
<Button fx:id="btnR" mnemonicParsing="false" onAction="#gedrueckteTaste" text="R" /> <Button fx:id="btnR" mnemonicParsing="false" onAction="#gedrueckteTaste" text="R" />
...@@ -58,49 +58,11 @@ ...@@ -58,49 +58,11 @@
<Button fx:id="btnLöschen" mnemonicParsing="false" text="Löschen" /> <Button fx:id="btnLöschen" mnemonicParsing="false" text="Löschen" />
</buttons> </buttons>
</ButtonBar> </ButtonBar>
<ButtonBar layoutX="39.0" layoutY="418.0" prefHeight="36.0" prefWidth="860.0"> <MenuButton fx:id="mBtnWalzPos1" layoutX="91.0" layoutY="76.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="40.0" text="I" AnchorPane.leftAnchor="90.0" AnchorPane.topAnchor="80.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> </MenuButton>
<MenuButton fx:id="mBtnWalzPos3" layoutX="171.0" layoutY="76.0" mnemonicParsing="false" text="I"> <MenuButton fx:id="mBtnWalzPos3" layoutX="201.0" layoutY="56.0" mnemonicParsing="false" text="I" AnchorPane.leftAnchor="182.0" AnchorPane.topAnchor="80.0">
</MenuButton> </MenuButton>
<MenuButton fx:id="mBtnWalzPos2" layoutX="133.0" layoutY="76.0" mnemonicParsing="false" text="I"> <MenuButton fx:id="mBtnWalzPos2" layoutX="136.0" layoutY="76.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="40.0" text="I" AnchorPane.leftAnchor="136.0" AnchorPane.topAnchor="80.0">
</MenuButton> </MenuButton>
<!-- <MenuButton layoutX="93.0" layoutY="114.0" mnemonicParsing="false">--> <!-- <MenuButton layoutX="93.0" layoutY="114.0" mnemonicParsing="false">-->
<!-- <items>--> <!-- <items>-->
...@@ -132,26 +94,64 @@ ...@@ -132,26 +94,64 @@
<!-- <MenuItem mnemonicParsing="false" onAction="#z26" text="26" />--> <!-- <MenuItem mnemonicParsing="false" onAction="#z26" text="26" />-->
<!-- </items>--> <!-- </items>-->
<!-- </MenuButton>--> <!-- </MenuButton>-->
<MenuButton fx:id="mBtnNotchPos3" layoutX="173.0" layoutY="114.0" mnemonicParsing="false" text="1"> <MenuButton fx:id="mBtnNotchPos3" layoutX="211.0" layoutY="97.0" mnemonicParsing="false" text="1" AnchorPane.leftAnchor="182.0" AnchorPane.topAnchor="120.0">
</MenuButton> </MenuButton>
<MenuButton fx:id="mBtnNotchPos2" layoutX="135.0" layoutY="114.0" mnemonicParsing="false" text="1"> <MenuButton fx:id="mBtnNotchPos2" layoutX="136.0" layoutY="114.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="39.0" text="1" AnchorPane.leftAnchor="136.0" AnchorPane.topAnchor="120.0">
</MenuButton> </MenuButton>
<MenuButton fx:id="mBtnStartPos1" layoutX="95.0" layoutY="157.0" mnemonicParsing="false" text="A"> <MenuButton fx:id="mBtnStartPos1" layoutX="95.0" layoutY="157.0" mnemonicParsing="false" text="A" AnchorPane.leftAnchor="90.0" AnchorPane.topAnchor="160.0">
</MenuButton> </MenuButton>
<MenuButton fx:id="mBtnStartPos3" layoutX="175.0" layoutY="157.0" mnemonicParsing="false" text="A"> <MenuButton fx:id="mBtnStartPos3" layoutX="181.0" layoutY="156.0" mnemonicParsing="false" text="A" AnchorPane.leftAnchor="182.0" AnchorPane.topAnchor="160.0">
</MenuButton> </MenuButton>
<MenuButton fx:id="mBtnStartPos2" layoutX="137.0" layoutY="157.0" mnemonicParsing="false" text="A"> <MenuButton fx:id="mBtnStartPos2" layoutX="137.0" layoutY="157.0" mnemonicParsing="false" text="A" AnchorPane.leftAnchor="136.0" AnchorPane.topAnchor="160.0">
</MenuButton> </MenuButton>
<TextField fx:id="tfrein" layoutX="246.0" layoutY="76.0" prefHeight="77.0" prefWidth="410.0" /> <TextField fx:id="tfrein" editable="false" 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" /> <TextField fx:id="tfcodiert" editable="false" 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="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" /> <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" /> <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" /> <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" /> <MenuButton fx:id="mBtnNotchPos1" layoutX="93.0" layoutY="114.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="40.0" text="1" AnchorPane.leftAnchor="90.0" AnchorPane.topAnchor="120.0" />
<Label layoutX="29.0" layoutY="80.0" text="Walze" /> <Label layoutX="29.0" layoutY="80.0" text="Walze" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0" />
<Label layoutX="29.0" layoutY="127.0" text="Ringe" /> <Label layoutX="29.0" layoutY="127.0" text="Ringe" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="120.0" />
<Label layoutX="11.0" layoutY="161.0" text="Startposition" /> <Label layoutX="11.0" layoutY="161.0" text="Startposition" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="160.0" />
<Label layoutX="380.0" layoutY="27.0" prefHeight="17.0" prefWidth="172.0" text="Tageseinstellungen" /> <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="#gedrueckteTaste" text="P" />
<Button fx:id="btnY1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="Y" />
<Button fx:id="btnX1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="X" />
<Button fx:id="btnC1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="C" />
<Button fx:id="btnV1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="V" />
<Button fx:id="btnB1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="B" />
<Button fx:id="btnN1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="N" />
<Button fx:id="btnM1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="M" />
<Button fx:id="btnL1" mnemonicParsing="false" onAction="#gedrueckteTaste" 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="#gedrueckteTaste" text="A" />
<Button fx:id="btnS1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="S" />
<Button fx:id="btnD1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="D" />
<Button fx:id="btnF1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="F" />
<Button fx:id="btnG1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="G" />
<Button fx:id="btnH1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="H" />
<Button fx:id="btnJ1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="J" />
<Button fx:id="btnK1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="K" />
</buttons>
</ButtonBar>
<ButtonBar layoutX="46.0" layoutY="328.0" prefHeight="25.0" prefWidth="583.0">
<buttons>
<Button fx:id="btnQ1" minWidth="13.0" mnemonicParsing="false" onAction="#gedrueckteTasteQ" prefHeight="25.0" text="Q" />
<Button fx:id="btnW1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="W" />
<Button fx:id="btnE1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="E" />
<Button fx:id="btnR1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="R" />
<Button fx:id="btnT1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="T" />
<Button fx:id="btnZ1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="Z" />
<Button fx:id="btnU1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="U" />
<Button fx:id="btnI1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="I" />
<Button fx:id="btnO1" mnemonicParsing="false" onAction="#gedrueckteTaste" text="O" />
</buttons>
</ButtonBar>
</children> </children>
</AnchorPane> </AnchorPane>
src/main/resources/Enigma/kenngruppe.fxml 0 → 100644
+ 15
− 0
View file @ 315c5669
<?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>
src/main/resources/Enigma/secondary.fxml deleted 100644 → 0
+ 0
− 16
View file @ 06a2b65d
<?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>
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