Skip to content

Commit 4191bd8

Browse files
author
mplieske
committed
added default font (Open Sans Regular) and changed fonts for popups to Open Sans Regular
1 parent 4f491e0 commit 4191bd8

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

src/main/java/de/doubleslash/keeptime/view/ViewController.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import javafx.scene.control.ColorPicker;
5555
import javafx.scene.control.ContextMenu;
5656
import javafx.scene.control.Dialog;
57+
import javafx.scene.control.DialogPane;
5758
import javafx.scene.control.Label;
5859
import javafx.scene.control.MenuItem;
5960
import javafx.scene.control.Slider;
@@ -75,6 +76,7 @@
7576
import javafx.scene.layout.VBox;
7677
import javafx.scene.paint.Color;
7778
import javafx.scene.shape.Circle;
79+
import javafx.scene.text.Font;
7880
import javafx.scene.text.TextAlignment;
7981
import javafx.stage.Modality;
8082
import javafx.stage.Stage;
@@ -723,19 +725,32 @@ private GridPane setUpGridPane(final String projectName, final Color projectColo
723725
grid.setVgap(10);
724726
grid.setPadding(new Insets(20, 150, 10, 10));
725727

726-
grid.add(new Label("Name:"), 0, 0);
728+
Label nameLabel = new Label("Name:");
729+
nameLabel.setFont(Font.font("Open Sans Regular"));
730+
grid.add(nameLabel, 0, 0);
731+
727732
final TextField projectNameTextField = new TextField(projectName);
733+
projectNameTextField.setFont(Font.font("Open Sans Regular"));
728734
grid.add(projectNameTextField, 1, 0);
729735

730-
grid.add(new Label("Color:"), 0, 1);
736+
Label colorLabel = new Label("Color:");
737+
colorLabel.setFont(Font.font("Open Sans Regular"));
738+
grid.add(colorLabel, 0, 1);
739+
731740
final ColorPicker colorPicker = new ColorPicker(projectColor);
732741
grid.add(colorPicker, 1, 1);
733742

734-
grid.add(new Label("IsWork:"), 0, 2);
743+
Label isWorkLabel = new Label("IsWork:");
744+
isWorkLabel.setFont(Font.font("Open Sans Regular"));
745+
grid.add(isWorkLabel, 0, 2);
746+
735747
final CheckBox isWorkCheckBox = new CheckBox();
736748
isWorkCheckBox.setSelected(isWork);
749+
isWorkCheckBox.setFont(Font.font("Open Sans Regular"));
737750
grid.add(isWorkCheckBox, 1, 2);
738751

752+
Label sortIndex = new Label("SortIndex:");
753+
sortIndex.setFont(Font.font("Open Sans Regular"));
739754
grid.add(new Label("SortIndex:"), 0, 3);
740755

741756
return grid;

src/main/resources/css/application.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */
2+
.root {
3+
-fx-font-family: "Open Sans Regular"
4+
}
5+
26
.text-area {
37
-fx-text-fill: rgba(1,1,1,.5);
48
-fx-background-color: rgba(0,0,0,0);

src/main/resources/css/menu.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.root {
2+
-fx-font-family: "Open Sans Regular";
3+
}
4+
15
.menuBorder {
26
-fx-border-color: rgba(180,180,180,1);
37
-fx-padding: 2px;

0 commit comments

Comments
 (0)