From 2a523a493ff04ed180f2378ac99923a11a7abac0 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 23 Apr 2021 23:34:32 +0200
Subject: [PATCH] #21 - prefill task and project after initialization otherwise
the task combo box is not correctly filled with the available tasks for the
selected project
---
.../smarttime/controller/InsertTimeController.java | 4 +++-
src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java b/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
index c305746..88aee7b 100644
--- a/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
+++ b/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
@@ -81,7 +81,6 @@ public class InsertTimeController
}
comboBoxProject.getItems().addAll(objects);
- comboBoxProject.getSelectionModel().select(settings.getLastProject());
comboBoxProject.setStyle("-fx-font-family: \"Arial\";-fx-font-size: 15px;");
comboBoxTask.setStyle("-fx-font-family: \"Arial\";-fx-font-size: 15px;");
@@ -104,6 +103,9 @@ public class InsertTimeController
}
});
+ comboBoxProject.getSelectionModel().select(settings.getLastProject());
+ comboBoxTask.getSelectionModel().select(settings.getLastTask());
+
timePicker1Controller.setController(this);
timePicker2Controller.setController(this);
diff --git a/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml b/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
index 45d7528..f097e92 100644
--- a/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
+++ b/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
@@ -16,7 +16,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.Controller">
+<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.251" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.Controller">
<children>
<VBox alignment="TOP_CENTER" layoutX="143.0" layoutY="69.0" prefHeight="800.0" prefWidth="650.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
--
GitLab