Skip to content

Commit d06ebf2

Browse files
author
mplieske
committed
�changed font for all text elements in report.fxml to Open Sans
1 parent 655ce22 commit d06ebf2

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed

src/main/resources/layouts/ProjectDetailLayout.fxml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3+
<?import java.lang.*?>
4+
<?import javafx.scene.control.*?>
5+
<?import javafx.scene.layout.*?>
6+
<?import javafx.scene.text.*?>
37
<?import javafx.scene.control.Label?>
48
<?import javafx.scene.layout.Pane?>
5-
69
<?import javafx.scene.text.Font?>
7-
<Pane minHeight="-Infinity" prefHeight="14.0" prefWidth="114.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
10+
11+
<Pane minHeight="-Infinity" prefHeight="14.0" prefWidth="130.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
812
<children>
9-
<Label prefWidth="70.0" text="Projectname">
13+
<Label prefWidth="72.0" text="Projectname">
1014
<font>
11-
<Font name="Open Sans" size="12.0" />
15+
<Font name="Open Sans Regular" size="12.0" />
1216
</font>
1317
</Label>
14-
<Label layoutX="69.0" prefWidth="60.0" text="00:00:00">
18+
<Label layoutX="75.0" prefHeight="17.0" prefWidth="52.0" text="00:00:00">
1519
<font>
16-
<Font name="Open Sans" size="12.0" />
20+
<Font name="Open Sans Regular" size="12.0" />
1721
</font>
1822
</Label>
1923
</children>

src/main/resources/layouts/report.fxml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3+
<?import java.lang.*?>
4+
<?import javafx.geometry.*?>
5+
<?import javafx.scene.control.*?>
6+
<?import javafx.scene.layout.*?>
7+
<?import javafx.scene.text.*?>
38
<?import javafx.geometry.Insets?>
49
<?import javafx.scene.control.Label?>
510
<?import javafx.scene.control.ScrollPane?>
@@ -12,7 +17,7 @@
1217
<?import javafx.scene.layout.VBox?>
1318
<?import javafx.scene.text.Font?>
1419

15-
<AnchorPane prefWidth="500.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
20+
<AnchorPane prefWidth="500.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
1621
<children>
1722
<VBox>
1823
<children>
@@ -22,43 +27,43 @@
2227
<children>
2328
<Label text="Report">
2429
<font>
25-
<Font name="System Bold" size="35.0" />
30+
<Font name="Open Sans Bold" size="35.0" />
2631
</font>
2732
</Label>
2833
<Label layoutX="10.0" layoutY="10.0" text="Daily report">
2934
<font>
30-
<Font size="20.0" />
35+
<Font name="Open Sans Regular" size="20.0" />
3136
</font>
3237
</Label>
3338
<Label fx:id="currentDayLabel" text="Tuesday 05.07.2018">
3439
<font>
35-
<Font name="System Bold" size="17.0" />
40+
<Font name="Open Sans Bold" size="17.0" />
3641
</font>
3742
</Label>
3843
<HBox spacing="10.0">
3944
<children>
40-
<Label prefWidth="100.0" text="Present time:">
45+
<Label prefWidth="110.0" text="Present time:">
4146
<font>
42-
<Font size="17.0" />
47+
<Font name="Open Sans Regular" size="17.0" />
4348
</font>
4449
</Label>
4550
<Label fx:id="currentDayTimeLabel" text="99:99:99">
4651
<font>
47-
<Font size="17.0" />
52+
<Font name="Open Sans Regular" size="17.0" />
4853
</font>
4954
</Label>
5055
</children>
5156
</HBox>
5257
<HBox spacing="10.0">
5358
<children>
54-
<Label prefWidth="100.0" text="Work time:">
59+
<Label prefWidth="110.0" text="Work time:">
5560
<font>
56-
<Font size="17.0" />
61+
<Font name="Open Sans Regular" size="17.0" />
5762
</font>
5863
</Label>
5964
<Label fx:id="currentDayWorkTimeLabel" text="99:99:99">
6065
<font>
61-
<Font size="17.0" />
66+
<Font name="Open Sans Regular" size="17.0" />
6267
</font>
6368
</Label>
6469
</children>
@@ -72,7 +77,7 @@
7277
</BorderPane>
7378
<Label text="Notes:">
7479
<font>
75-
<Font size="16.0" />
80+
<Font name="Open Sans Regular" size="16.0" />
7681
</font>
7782
</Label>
7883
<ScrollPane fx:id="scrollPane" prefHeight="300.0" prefWidth="500.0">
@@ -93,12 +98,12 @@
9398
<children>
9499
<Label text="99:99:99" GridPane.columnIndex="2" GridPane.rowIndex="1">
95100
<font>
96-
<Font name="System Bold" size="15.0" />
101+
<Font name="Open Sans Bold" size="15.0" />
97102
</font>
98103
</Label>
99104
<Label layoutX="375.0" layoutY="39.0" text="99:99:99 - 99:99:99" GridPane.columnIndex="1" GridPane.rowIndex="1">
100105
<font>
101-
<Font size="15.0" />
106+
<Font name="Open Sans Regular" size="15.0" />
102107
</font>
103108
</Label>
104109
</children>

0 commit comments

Comments
 (0)