diff --git a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java index b6434bb..8bc1f13 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -144,6 +144,7 @@ public class CalculatorController { @FXML private Label servicesLabel; + //extra pane @FXML private AnchorPane extraPane; diff --git a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java index 7a0b0e8..c0d6712 100644 --- a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java +++ b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java @@ -24,6 +24,7 @@ import javafx.scene.control.ScrollPane; import javafx.scene.control.Slider; import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.HBox; import javafx.scene.text.Text; import javafx.stage.Stage; import javafx.stage.Window; @@ -47,6 +48,10 @@ public class RegisterWindowController { @Autowired ExtraActivityController extraActivityController; + @FXML + private Text explainText; + + //navigation panes @FXML private AnchorPane getStartedPane; @@ -160,6 +165,9 @@ public class RegisterWindowController { private PasswordField passwordField2; @FXML private Button signUpButton; + + + //@FXML //private Line uNamePathLine; @@ -187,6 +195,18 @@ public class RegisterWindowController { slideIn.play(); } + public void showExplanation(ActionEvent event) throws InterruptedException { + System.out.println(explainText.isVisible()); + if (explainText.isVisible()) { + System.out.println("set to false"); + explainText.setVisible(false); + } else { + System.out.println("set to true"); + explainText.setVisible(true); + } + + } + /** * Signs up the user. * @param event the click of the sign up button diff --git a/src/Client/src/main/resources/fxml/FirstCalculator.fxml b/src/Client/src/main/resources/fxml/FirstCalculator.fxml index 760ebf5..5ccfc3a 100644 --- a/src/Client/src/main/resources/fxml/FirstCalculator.fxml +++ b/src/Client/src/main/resources/fxml/FirstCalculator.fxml @@ -1,5 +1,12 @@ + + + + + + + @@ -15,7 +22,7 @@ - + @@ -159,7 +166,20 @@ - + + + + + + diff --git a/src/Client/src/main/resources/icons/questionmark.png b/src/Client/src/main/resources/icons/questionmark.png new file mode 100644 index 0000000..435cd42 Binary files /dev/null and b/src/Client/src/main/resources/icons/questionmark.png differ