Skip to content

Commit 6f600f6

Browse files
MomdAliMomdAli
committed
#188: Change Add work button
1 parent ac171dc commit 6f600f6

File tree

2 files changed

+58
-58
lines changed

2 files changed

+58
-58
lines changed

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

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,65 @@
1111
<?import javafx.scene.text.Font?>
1212
<?import de.doubleslash.keeptime.view.TimePickerComboBox?>
1313

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">
15-
<columnConstraints>
16-
<ColumnConstraints hgrow="SOMETIMES" />
17-
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
18-
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0" />
19-
</columnConstraints>
20-
<rowConstraints>
21-
<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" />
26-
<RowConstraints />
27-
</rowConstraints>
28-
<children>
14+
<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
15+
prefHeight="214.0" prefWidth="371.0" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.171"
16+
xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageWorkController">
17+
<columnConstraints>
18+
<ColumnConstraints hgrow="SOMETIMES"/>
19+
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0"/>
20+
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="100.0" prefWidth="150.0"/>
21+
</columnConstraints>
22+
<rowConstraints>
23+
<RowConstraints vgrow="SOMETIMES"/>
24+
<RowConstraints vgrow="SOMETIMES"/>
25+
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
26+
<RowConstraints vgrow="SOMETIMES"/>
27+
<RowConstraints vgrow="SOMETIMES"/>
28+
<RowConstraints/>
29+
</rowConstraints>
30+
<padding>
31+
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
32+
</padding>
2933
<Label text="Start">
30-
<font>
31-
<Font name="Open Sans Regular" size="12.0" />
32-
</font>
34+
<font>
35+
<Font name="Open Sans Regular" size="12.0"/>
36+
</font>
3337
</Label>
34-
<DatePicker fx:id="startDatePicker" GridPane.columnIndex="1" />
35-
<TimePickerComboBox fx:id="startTimePicker" GridPane.columnIndex="2" />
38+
<DatePicker fx:id="startDatePicker" GridPane.columnIndex="1"/>
39+
<TimePickerComboBox fx:id="startTimePicker" GridPane.columnIndex="2"/>
3640
<Label text="End" GridPane.rowIndex="1">
37-
<font>
38-
<Font name="Open Sans Regular" size="12.0" />
39-
</font>
41+
<font>
42+
<Font name="Open Sans Regular" size="12.0"/>
43+
</font>
4044
</Label>
41-
<DatePicker fx:id="endDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="1" />
42-
<TimePickerComboBox fx:id="endTimePicker" GridPane.columnIndex="2" GridPane.rowIndex="1" />
45+
<DatePicker fx:id="endDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
46+
<TimePickerComboBox fx:id="endTimePicker" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
4347
<Label text="Project" GridPane.rowIndex="3">
44-
<font>
45-
<Font name="Open Sans Regular" size="12.0" />
46-
</font>
48+
<font>
49+
<Font name="Open Sans Regular" size="12.0"/>
50+
</font>
4751
</Label>
48-
<ComboBox fx:id="projectComboBox" editable="true" prefWidth="400.0" visibleRowCount="4" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
52+
<ComboBox fx:id="projectComboBox" editable="true" prefWidth="400.0" visibleRowCount="4" GridPane.columnIndex="1"
53+
GridPane.columnSpan="2" GridPane.rowIndex="3"/>
4954
<Label text="Notes" GridPane.rowIndex="4">
50-
<font>
51-
<Font name="Open Sans Regular" size="12.0" />
52-
</font>
55+
<font>
56+
<Font name="Open Sans Regular" size="12.0"/>
57+
</font>
5358
</Label>
54-
<TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4" />
55-
<Label text="Changing the times may result in overlapping times!" textFill="#ffa100" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
56-
<font>
57-
<Font name="Open Sans Regular" size="12.0" />
58-
</font>
59-
<GridPane.margin>
60-
<Insets bottom="5.0" />
61-
</GridPane.margin>
59+
<TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1"
60+
GridPane.columnSpan="2" GridPane.rowIndex="4"/>
61+
<Label text="Changing the times may result in overlapping times!" textFill="#ffa100" GridPane.columnIndex="1"
62+
GridPane.columnSpan="2" GridPane.rowIndex="2">
63+
<font>
64+
<Font name="Open Sans Regular" size="12.0"/>
65+
</font>
66+
<GridPane.margin>
67+
<Insets bottom="5.0"/>
68+
</GridPane.margin>
69+
</Label>
70+
<Label fx:id="errorLabel" textFill="RED" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="5">
71+
<font>
72+
<Font name="Open Sans Regular" size="12.0"/>
73+
</font>
6274
</Label>
63-
<Label fx:id="errorLabel" textFill="RED" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="5">
64-
<font>
65-
<Font name="Open Sans Regular" size="12.0" />
66-
</font>
67-
</Label>
68-
</children>
69-
<padding>
70-
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
71-
</padding>
7275
</GridPane>

‎src/main/resources/layouts/report.fxml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,15 @@
8282
</BorderPane>
8383
<BorderPane>
8484
<left>
85-
<Button fx:id="expandCollapseButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" styleClass="secondary-button" text="Collapse" />
85+
<HBox spacing="5.0">
86+
<children>
87+
<Button fx:id="expandCollapseButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" styleClass="secondary-button" text="Collapse" />
88+
<Button fx:id="addWorkButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" styleClass="secondary-button" text="Add Work" />
89+
</children>
90+
</HBox>
8691
</left>
8792
<right>
88-
<HBox spacing="5.0">
89-
<children>
90-
<Button fx:id="addWorkButton" mnemonicParsing="false" styleClass="secondary-button" text="✚" textAlignment="CENTER">
91-
<font>
92-
<Font size="11.0" />
93-
</font></Button>
9493
<Button fx:id="heimatSyncButton" mnemonicParsing="false" styleClass="secondary-button" text="Sync2Heimat" />
95-
</children>
96-
</HBox>
9794
</right>
9895
<padding>
9996
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

0 commit comments

Comments
 (0)