From 2245568edf763342c4410bc6a889f25680629b03 Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Fri, 29 Apr 2022 10:39:37 +0200 Subject: [PATCH] created GUI Main and AddParticipant --- .../projekt2/turnierverwaltung/main/MainWindow.java | 1 - .../turnierverwaltung/main/MainWindowController.java | 11 ++++++++--- .../participantFormularController.java | 10 +++++++--- .../projekt2/turnierverwaltung/main/MainWindow.fxml | 6 +++++- .../participandAddFormular/participandFormular.fxml | 6 +++++- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java index 29a8990..f7e9d27 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java @@ -34,6 +34,5 @@ public class MainWindow extends Application { } catch (IOException e) { e.printStackTrace(); } - } } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java index 992b4f4..84c410d 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java @@ -18,6 +18,9 @@ public class MainWindowController { @FXML private Button createBtn; + @FXML + private MenuItem germanSelect; + @FXML private GridPane grid; @@ -36,9 +39,6 @@ public class MainWindowController { @FXML private Button openBtn; - @FXML - private MenuItem setLan; - @FXML private Label tournierListTitle; @@ -51,6 +51,11 @@ public class MainWindowController { @FXML private Label turnierNameLabel; + @FXML + void changeLangToGerman(ActionEvent event) { + + } + @FXML void closeApplication(ActionEvent event) { diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java index 47f7acc..a80622b 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java @@ -34,6 +34,9 @@ public class participantFormularController { @FXML private TextField firstNameTextField; + @FXML + private MenuItem germanSelect; + @FXML private GridPane grid; @@ -71,10 +74,12 @@ public class participantFormularController { private Button saveBtn; @FXML - private MenuItem setLan; + void addParticipant(ActionEvent event) { + + } @FXML - void addParticipant(ActionEvent event) { + void changeLangToGerman(ActionEvent event) { } @@ -94,4 +99,3 @@ public class participantFormularController { } } - diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml index cd4c4cd..6e78fd9 100644 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml +++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml @@ -26,7 +26,11 @@ - + + + + + diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml index c70f0ca..ae0a799 100644 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml +++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml @@ -25,7 +25,11 @@ - + + + + +