add missing Icons

Author: ddamke

src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java

@@ -30,6 +30,7 @@
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.effect.Bloom;
+import javafx.scene.image.Image;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
@@ -251,11 +252,14 @@ private Node createListEntryForProject(final Project p) {
       changeWithTimeMenuItem.setOnAction(e -> {
          final ChangeWithTimeDialog changeWithTimeDialog = new ChangeWithTimeDialog(model,
                ViewController.activeWorkSecondsProperty, p);
-         changeWithTimeDialog.initOwner(mainStage);
-         mainStage.setAlwaysOnTop(false);
+         //changeWithTimeDialog.initOwner(mainStage);
+
+         Stage stage = (Stage) changeWithTimeDialog.getDialogPane().getScene().getWindow();
+         stage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
+         stage.setAlwaysOnTop(true);
+
          final Optional<Integer> result = changeWithTimeDialog.showAndWait();
          result.ifPresent(minusSeconds -> changeProject(p, minusSeconds));
-         mainStage.setAlwaysOnTop(true);
       });
       final MenuItem deleteMenuItem = new MenuItem("Delete");
       deleteMenuItem.setDisable(p.isDefault());
@@ -286,6 +290,9 @@ private Node createListEntryForProject(final Project p) {
          LOG.info("Edit project");
          final Dialog<Project> dialog = setupEditProjectDialog("Edit project", "Edit project '" + p.getName() + "'", p);
 
+         Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow();
+         stage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
+
          mainStage.setAlwaysOnTop(false);
          final Optional<Project> result = dialog.showAndWait();
          mainStage.setAlwaysOnTop(true);

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -373,14 +373,17 @@ private void initImportButton() {
 
          try {
             Alert confirmationAlert = new Alert(AlertType.CONFIRMATION, "", ButtonType.YES, ButtonType.NO);
+            Stage importConfirmationStage = (Stage) confirmationAlert.getDialogPane().getScene().getWindow();
+            importConfirmationStage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
+
             confirmationAlert.setTitle("Import");
             confirmationAlert.setHeaderText("Do you want to Override current Data ?");
             confirmationAlert.setContentText(
                   "Import previously exported .sql file. This will overwrite the currently used database contents - all current data will be lost!\n"
                         + "\n"
                         + "If you do not have a .sql file yet you need to open the previous version of KeepTime and in the settings dialog press \"Export\".\n"
                         + "\n"
-                        + "You will need to restart the application after this action. If you proceed you need to select the previouls exported .sql file.");
+                        + "You will need to restart the application after this action. If you proceed you need to select the previous exported .sql file.");
             confirmationAlert.showAndWait();
 
             if (confirmationAlert.getResult() == ButtonType.NO) {
@@ -406,6 +409,10 @@ private void initImportButton() {
                   "-options", "FROM_1X");
 
             Alert informationDialog = new Alert(AlertType.INFORMATION);
+
+            Stage informationStage = (Stage) informationDialog.getDialogPane().getScene().getWindow();
+            informationStage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
+
             informationDialog.setTitle("Import done");
             informationDialog.setHeaderText("The data was imported.");
             informationDialog.setContentText(

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -339,7 +339,7 @@ private void openConfirmationWindow() {
          Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
          stage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
 
-         alert.initOwner(mainStage);
+         stage.setAlwaysOnTop(true);
          alert.showAndWait();
 
          if (alert.getResult() == ButtonType.YES) {
@@ -561,6 +561,9 @@ public void addNewProject(final ActionEvent ae) {
       // TODO somewhat duplicate dialog of create and edit
       final Dialog<Project> dialog = setUpDialogProject("Create new project", "Create a new project");
 
+      Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow();
+      stage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
+
       mainStage.setAlwaysOnTop(false);
       final Optional<Project> result = dialog.showAndWait();
       mainStage.setAlwaysOnTop(true);