Skip to content

Commit 5f2a55a

Browse files
committed
added custom font to new layout. added warning when editing times
1 parent 14dbe65 commit 5f2a55a

File tree

1 file changed

+47
-21
lines changed

1 file changed

+47
-21
lines changed

src/main/resources/layouts/manage-work.fxml

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,58 @@
99
<?import javafx.scene.layout.ColumnConstraints?>
1010
<?import javafx.scene.layout.GridPane?>
1111
<?import javafx.scene.layout.RowConstraints?>
12+
<?import javafx.scene.text.Font?>
1213

13-
<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">
14+
<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">
1415
<columnConstraints>
15-
<ColumnConstraints hgrow="SOMETIMES" />
16+
<ColumnConstraints hgrow="SOMETIMES" />
17+
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
1618
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
17-
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
1819
</columnConstraints>
1920
<rowConstraints>
2021
<RowConstraints vgrow="SOMETIMES" />
21-
<RowConstraints vgrow="SOMETIMES" />
22-
<RowConstraints vgrow="SOMETIMES" />
23-
<RowConstraints vgrow="SOMETIMES" />
22+
<RowConstraints vgrow="SOMETIMES" />
23+
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
24+
<RowConstraints vgrow="SOMETIMES" />
25+
<RowConstraints vgrow="SOMETIMES" />
2426
</rowConstraints>
25-
<children>
26-
<Label text="Start Time" />
27-
<DatePicker fx:id="startDatePicker" GridPane.columnIndex="1" />
28-
<Label text="End Time" GridPane.rowIndex="1" />
29-
<DatePicker fx:id="endDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="1" />
30-
<Label text="Project" GridPane.rowIndex="2" />
31-
<ComboBox fx:id="projectComboBox" editable="true" prefWidth="400.0" visibleRowCount="4" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2" />
32-
<Label text="notes" GridPane.rowIndex="3" />
33-
<Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
34-
<Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
35-
<TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
36-
</children>
37-
<padding>
38-
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
39-
</padding>
27+
<children>
28+
<Label text="Start">
29+
<font>
30+
<Font name="Open Sans Regular" size="12.0" />
31+
</font>
32+
</Label>
33+
<DatePicker fx:id="startDatePicker" GridPane.columnIndex="1" />
34+
<Label text="End" GridPane.rowIndex="1">
35+
<font>
36+
<Font name="Open Sans Regular" size="12.0" />
37+
</font>
38+
</Label>
39+
<DatePicker fx:id="endDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="1" />
40+
<Label text="Project" GridPane.rowIndex="3">
41+
<font>
42+
<Font name="Open Sans Regular" size="12.0" />
43+
</font>
44+
</Label>
45+
<ComboBox fx:id="projectComboBox" editable="true" prefWidth="400.0" visibleRowCount="4" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
46+
<Label text="Notes" GridPane.rowIndex="4">
47+
<font>
48+
<Font name="Open Sans Regular" size="12.0" />
49+
</font>
50+
</Label>
51+
<Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
52+
<Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
53+
<TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4" />
54+
<Label text="Changing the times may result in overlapping times!" textFill="#ffa100" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
55+
<font>
56+
<Font name="Open Sans Regular" size="12.0" />
57+
</font>
58+
<GridPane.margin>
59+
<Insets bottom="5.0" />
60+
</GridPane.margin>
61+
</Label>
62+
</children>
63+
<padding>
64+
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
65+
</padding>
4066
</GridPane>

0 commit comments

Comments
 (0)