Roman_Schenk
/
PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

This commit is contained in:
giavaphi 2022-12-11 07:19:06 +01:00
parent 8a2119028c
commit 3ebbb0e0e3
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
View File

@ -24,6 +24,7 @@ import javafx.scene.layout.VBox;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -208,6 +209,12 @@ public class MyScheduleController {
alert.setHeaderText("Are you sure you have completed this task?"); alert.setHeaderText("Are you sure you have completed this task?");
alert.setContentText("Confirming that you have completed the task will remove it from the schedule."); alert.setContentText("Confirming that you have completed the task will remove it from the schedule.");
DialogPane dialogPane = alert.getDialogPane();
dialogPane.getStylesheets().add(
Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
dialogPane.getStyleClass().add("myDialog");
alert.showAndWait() alert.showAndWait()
.ifPresent(buttonType -> { .ifPresent(buttonType -> {
if (buttonType == ButtonType.OK) { if (buttonType == ButtonType.OK) {

31
src/main/java/ch/zhaw/gartenverwaltung/TutorialController.java
View File

@ -7,6 +7,7 @@ import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import javafx.stage.Stage; import javafx.stage.Stage;
import java.io.File;
/** /**
* Controller class for the Tutorial.fxml file * Controller class for the Tutorial.fxml file
@ -32,17 +33,27 @@ public class TutorialController {
switchViews(); switchViews();
setButtonAbilities(); setButtonAbilities();
Image addNewPlantImage = new Image(String.valueOf(PlantsController.class.getResource("add-new-plant.png"))); setImageView(imgAddNewPlant, "add-new-plant.png");
Image selectSowHarvestImage = new Image(String.valueOf(PlantsController.class.getResource("select-sow-harvest.png"))); setImageView(imgSelectDate, "select-sow-harvest.png");
Image scheduleImage = new Image(String.valueOf(PlantsController.class.getResource("schedule.png"))); setImageView(imgDetailDeleteButtons, "details-delete.png");
Image detailDeleteButtonsImage = new Image(String.valueOf(PlantsController.class.getResource("details-delete.png"))); setImageView(imgTaskList, "schedule.png");
Image addTaskImage = new Image(String.valueOf(PlantsController.class.getResource("add-task.png"))); setImageView(imgAddTaskButton, "add-task.png");
}
imgAddNewPlant.setImage(addNewPlantImage); /**
imgSelectDate.setImage(selectSowHarvestImage); * update the given image view with screenshot or placeholder image.
imgDetailDeleteButtons.setImage(detailDeleteButtonsImage); * @param imageView the image view to update
imgAddTaskButton.setImage(addTaskImage); * @param fileName the file name of the source
imgTaskList.setImage(scheduleImage); */
private void setImageView(ImageView imageView, String fileName) {
File file = new File(String.valueOf(PlantsController.class.getResource(fileName)));
Image image;
if (file.exists()) {
image = new Image(String.valueOf(PlantsController.class.getResource(fileName)));
} else {
image = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
}
imageView.setImage(image);
} }
public void viewNextPage() { public void viewNextPage() {

2
src/main/resources/ch/zhaw/gartenverwaltung/Tutorial.fxml
View File

@ -14,7 +14,7 @@
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?> <?import javafx.scene.text.TextFlow?>
<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController"> <BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
<bottom> <bottom>
<HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER"> <HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER">
<children> <children>