Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package de.doubleslash.keeptime.view;

import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
Expand Down Expand Up @@ -73,6 +74,11 @@ private void initialize() {
sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
formValidProperty.bind(Bindings.createBooleanBinding(() -> !nameTextField.getText().isBlank(),nameTextField.textProperty()));
validateTextAlert.visibleProperty().bind(formValidProperty.not());

Platform.runLater(() ->{
nameTextField.requestFocus();
nameTextField.end();
});
}

public void initializeWith(final Project project) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/layouts/manage-project.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<Label text="IsWork:" GridPane.rowIndex="5" />
<Label text="SortIndex:" GridPane.rowIndex="6" />
<TextField fx:id="nameTextField" GridPane.columnIndex="1" />
<TextArea fx:id="descriptionTextArea" prefHeight="120.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<ColorPicker fx:id="textFillColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<CheckBox fx:id="isWorkCheckBox" mnemonicParsing="false" selected="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<Spinner fx:id="sortIndexSpinner" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<TextArea fx:id="descriptionTextArea" prefHeight="120.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<VBox alignment="CENTER_LEFT" GridPane.rowIndex="2">
<children>
<Label text="Description:" />
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/layouts/manage-work.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>

<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="214.0" prefWidth="371.0" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageWorkController">
<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="214.0" prefWidth="371.0" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageWorkController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
Expand All @@ -23,6 +23,7 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints vgrow="SOMETIMES" />
<RowConstraints vgrow="SOMETIMES" />
<RowConstraints />
</rowConstraints>
<children>
<Label text="Start">
Expand All @@ -31,12 +32,14 @@
</font>
</Label>
<DatePicker fx:id="startDatePicker" GridPane.columnIndex="1" />
<Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
<Label text="End" GridPane.rowIndex="1">
<font>
<Font name="Open Sans Regular" size="12.0" />
</font>
</Label>
<DatePicker fx:id="endDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Label text="Project" GridPane.rowIndex="3">
<font>
<Font name="Open Sans Regular" size="12.0" />
Expand All @@ -48,8 +51,6 @@
<Font name="Open Sans Regular" size="12.0" />
</font>
</Label>
<Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
<Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4" />
<Label text="Changing the times may result in overlapping times!" textFill="#ffa100" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
<font>
Expand Down