From f090d2de97403a8d8144c5f44363b7a75fe26c62 Mon Sep 17 00:00:00 2001
From: Jan <janschubert93@web.de>
Date: Fri, 29 Nov 2019 14:15:29 +0100
Subject: [PATCH] ProgressBar

---
 .../java/projekt/enigma/GuiController.java    | 200 +++++++++---------
 src/main/resources/projekt/enigma/gui.fxml    |   2 +-
 2 files changed, 104 insertions(+), 98 deletions(-)

diff --git a/src/main/java/projekt/enigma/GuiController.java b/src/main/java/projekt/enigma/GuiController.java
index 4e2a1a3..2e06eb6 100644
--- a/src/main/java/projekt/enigma/GuiController.java
+++ b/src/main/java/projekt/enigma/GuiController.java
@@ -22,301 +22,307 @@ public class GuiController {
 	private Codierer codierer;
 
 	@FXML
-	private Button btnL;
+	private TextField tfStecker1;
 
 	@FXML
-	private Button btnP;
+	private TextField tfStecker2;
 
 	@FXML
-	private Button btnY;
+	private TextField tfStecker3;
 
 	@FXML
-	private Button btnX;
+	private TextField tfStecker4;
 
 	@FXML
-	private Button btnC;
+	private TextField tfStecker5;
 
 	@FXML
-	private Button btnV;
+	private TextField tfStecker6;
 
 	@FXML
-	private Button btnB;
+	private TextField tfStecker7;
 
 	@FXML
-	private Button btnN;
+	private TextField tfStecker8;
+
+	@FXML
+	private TextField tfStecker9;
+
+	@FXML
+	private TextField tfStecker10;
 
 	@FXML
 	private Button btnM;
 
 	@FXML
-	private Button btnA;
+	private Button btnN;
 
 	@FXML
-	private Button btnS;
+	private Button btnB;
 
 	@FXML
-	private Button btnD;
+	private Button btnV;
 
 	@FXML
-	private Button btnF;
+	private Button btnC;
 
 	@FXML
-	private Button btnG;
+	private Button btnX;
 
 	@FXML
-	private Button btnH;
+	private Button btnY;
 
 	@FXML
-	private Button btnJ;
+	private Button btnP;
 
 	@FXML
-	private Button btnK;
+	private Button btnL;
 
 	@FXML
-	private Button btnQ;
+	private Button btnK;
 
 	@FXML
-	private Button btnW;
+	private Button btnJ;
 
 	@FXML
-	private Button btnE;
+	private Button btnH;
 
 	@FXML
-	private Button btnR;
+	private Button btnG;
 
 	@FXML
-	private Button btnT;
+	private Button btnF;
 
 	@FXML
-	private Button btnZ;
+	private Button btnD;
 
 	@FXML
-	private Button btnU;
+	private Button btnS;
 
 	@FXML
-	private Button btnI;
+	private Button btnA;
 
 	@FXML
 	private Button btnO;
 
 	@FXML
-	private MenuButton mBtnWalzPos1;
+	private Button btnI;
 
 	@FXML
-	private MenuButton mBtnWalzPos3;
+	private Button btnU;
 
 	@FXML
-	private MenuButton mBtnWalzPos2;
+	private Button btnZ;
 
 	@FXML
-	private MenuButton mBtnNotchPos3;
+	private Button btnT;
 
 	@FXML
-	private MenuButton mBtnNotchPos2;
+	private Button btnR;
 
 	@FXML
-	private MenuButton mBtnStartPos1;
+	private Button btnE;
 
 	@FXML
-	private MenuButton mBtnStartPos3;
+	private Button btnW;
 
 	@FXML
-	private MenuButton mBtnStartPos2;
+	private Button btnQ;
 
 	@FXML
-	private TextField tfKlartext;
+	private Circle circL;
 
 	@FXML
-	private TextField tfCodiert;
+	private Circle circM;
 
 	@FXML
-	private MenuButton mBtnNotchPos1;
+	private Circle circN;
 
 	@FXML
-	private TextField tfStecker1;
+	private Circle circB;
 
 	@FXML
-	private TextField tfStecker2;
+	private Circle circV;
 
 	@FXML
-	private TextField tfStecker3;
+	private Circle circC;
 
 	@FXML
-	private TextField tfStecker4;
+	private Circle circX;
 
 	@FXML
-	private TextField tfStecker5;
+	private Circle circY;
 
 	@FXML
-	private TextField tfStecker6;
+	private Circle circP;
 
 	@FXML
-	private TextField tfStecker7;
+	private Circle circK;
 
 	@FXML
-	private TextField tfStecker8;
+	private Circle circJ;
 
 	@FXML
-	private TextField tfStecker9;
+	private Circle circH;
 
 	@FXML
-	private TextField tfStecker10;
+	private Circle circG;
 
 	@FXML
-	private Label lblQ;
+	private Circle circF;
 
 	@FXML
-	private Label lblE;
+	private Circle circD;
 
 	@FXML
-	private Label lblW;
+	private Circle circS;
 
 	@FXML
-	private Label lblR;
+	private Circle circA;
 
 	@FXML
-	private Label lblT;
+	private Circle circO;
 
 	@FXML
-	private Label lblZ;
+	private Circle circI;
 
 	@FXML
-	private Label lblO;
+	private Circle circU;
 
 	@FXML
-	private Label lblI;
+	private Circle circZ;
 
 	@FXML
-	private Label lblU;
+	private Circle circT;
 
 	@FXML
-	private Label lblA;
+	private Circle circR;
 
 	@FXML
-	private Label lblD;
+	private Circle circE;
 
 	@FXML
-	private Label lblS;
+	private Circle circW;
 
 	@FXML
-	private Label lblF;
+	private Circle circQ;
 
 	@FXML
-	private Label lblG;
+	private Label lblL;
 
 	@FXML
-	private Label lblH;
+	private Label lblM;
 
 	@FXML
-	private Label lblK;
+	private Label lblN;
 
 	@FXML
-	private Label lblJ;
+	private Label lblB;
 
 	@FXML
-	private Label lblP;
+	private Label lblV;
 
 	@FXML
-	private Label lblX;
+	private Label lblC;
 
 	@FXML
-	private Label lblY;
+	private Label lblX;
 
 	@FXML
-	private Label lblC;
+	private Label lblY;
 
 	@FXML
-	private Label lblV;
+	private Label lblP;
 
 	@FXML
-	private Label lblB;
+	private Label lblK;
 
 	@FXML
-	private Label lblL;
+	private Label lblJ;
 
 	@FXML
-	private Label lblM;
+	private Label lblH;
 
 	@FXML
-	private Label lblN;
+	private Label lblG;
 
 	@FXML
-	private Circle circE;
+	private Label lblF;
 
 	@FXML
-	private Circle circR;
+	private Label lblD;
 
 	@FXML
-	private Circle circT;
+	private Label lblS;
 
 	@FXML
-	private Circle circZ;
+	private Label lblA;
 
 	@FXML
-	private Circle circU;
+	private Label lblQ;
 
 	@FXML
-	private Circle circI;
+	private Label lblW;
 
 	@FXML
-	private Circle circO;
+	private Label lblE;
 
 	@FXML
-	private Circle circA;
+	private Label lblR;
 
 	@FXML
-	private Circle circS;
+	private Label lblT;
 
 	@FXML
-	private Circle circD;
+	private Label lblZ;
 
 	@FXML
-	private Circle circF;
+	private Label lblU;
 
 	@FXML
-	private Circle circG;
+	private Label lblI;
 
 	@FXML
-	private Circle circH;
+	private Label lblO;
 
 	@FXML
-	private Circle circJ;
+	private TextField tfCodiert;
 
 	@FXML
-	private Circle circK;
+	private TextField tfKlartext;
 
 	@FXML
-	private Circle circP;
+	private ProgressBar pbLadeNachricht;
 
 	@FXML
-	private Circle circY;
+	private MenuButton mBtnWalzPos1;
 
 	@FXML
-	private Circle circX;
+	private MenuButton mBtnWalzPos2;
 
 	@FXML
-	private Circle circC;
+	private MenuButton mBtnWalzPos3;
 
 	@FXML
-	private Circle circV;
+	private MenuButton mBtnNotchPos1;
 
 	@FXML
-	private Circle circB;
+	private MenuButton mBtnNotchPos2;
 
 	@FXML
-	private Circle circN;
+	private MenuButton mBtnNotchPos3;
 
 	@FXML
-	private Circle circM;
+	private MenuButton mBtnStartPos1;
 
 	@FXML
-	private Circle circL;
+	private MenuButton mBtnStartPos2;
 
 	@FXML
-	private Circle circW;
+	private MenuButton mBtnStartPos3;
 
 	@FXML
-	private Circle circQ;
+	private Label lblLadeNachricht;
 
 	@FXML
 	void initialize() {
diff --git a/src/main/resources/projekt/enigma/gui.fxml b/src/main/resources/projekt/enigma/gui.fxml
index 0768e9a..4c75cd6 100644
--- a/src/main/resources/projekt/enigma/gui.fxml
+++ b/src/main/resources/projekt/enigma/gui.fxml
@@ -562,7 +562,7 @@
       </MenuButton>
             <MenuButton fx:id="mBtnWalzPos2" alignment="CENTER_RIGHT" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="I" textAlignment="CENTER" GridPane.columnIndex="2">
       </MenuButton>
-            <MenuButton fx:id="mBtnWalzPos3" alignment="CENTER_RIGHT" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="I" textAlignment="CENTER" GridPane.columnIndex="3">
+            <MenuButton fx:id="mBtnWalzPos3" mnemonicParsing="false" popupSide="TOP" prefHeight="25.0" prefWidth="48.0" text="I" textAlignment="CENTER" GridPane.columnIndex="3">
       </MenuButton>
             <MenuButton fx:id="mBtnNotchPos1" alignment="CENTER_RIGHT" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="1" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <MenuButton fx:id="mBtnNotchPos2" alignment="CENTER_RIGHT" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="1" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.rowIndex="1">
-- 
GitLab