Changed font for occupations and the privacy links because of problems with mac (displayed wrongly)
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||||
<artifactId>eclipse-dmg-packager</artifactId>
|
<artifactId>eclipse-dmg-packager</artifactId>
|
||||||
<version>1.1.3</version>
|
<version>1.3.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
@@ -32,6 +32,11 @@
|
|||||||
<target>8</target>
|
<target>8</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||||
|
<artifactId>eclipse-dmg-packager</artifactId>
|
||||||
|
<version>1.3.0</version>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.openjfx</groupId>
|
<groupId>org.openjfx</groupId>
|
||||||
<artifactId>javafx-maven-plugin</artifactId>
|
<artifactId>javafx-maven-plugin</artifactId>
|
||||||
@@ -69,6 +74,18 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>eclipse cbi</id>
|
||||||
|
<url>https://repo.eclipse.org/content/repositories/cbi-releases</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
<pluginRepositories>
|
||||||
|
<pluginRepository>
|
||||||
|
<id>eclipse cbi</id>
|
||||||
|
<url>https://repo.eclipse.org/content/repositories/cbi-releases</url>
|
||||||
|
</pluginRepository>
|
||||||
|
</pluginRepositories>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.openjfx</groupId>
|
<groupId>org.openjfx</groupId>
|
||||||
|
|||||||
@@ -615,6 +615,7 @@ public class UICoordinator implements ChangeListener<Boolean>
|
|||||||
privAgree = new CheckBox();
|
privAgree = new CheckBox();
|
||||||
privAgree.setText(Text.PRIVACY_STATEMENT_ACCEPTED);
|
privAgree.setText(Text.PRIVACY_STATEMENT_ACCEPTED);
|
||||||
privAgree.setWrapText(true);
|
privAgree.setWrapText(true);
|
||||||
|
privAgree.setStyle("-fx-font-family: \"Arial\"");
|
||||||
privAgree.selectedProperty().addListener(new ChangeListener<Boolean>()
|
privAgree.selectedProperty().addListener(new ChangeListener<Boolean>()
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
@@ -779,7 +780,10 @@ public class UICoordinator implements ChangeListener<Boolean>
|
|||||||
// View for clicking and setting the path for saving the resulting data
|
// View for clicking and setting the path for saving the resulting data
|
||||||
BorderPane selectSavePath = new BorderPane();
|
BorderPane selectSavePath = new BorderPane();
|
||||||
String currentUsersHomeDir = System.getProperty("user.home");
|
String currentUsersHomeDir = System.getProperty("user.home");
|
||||||
dirForSaving= new File(currentUsersHomeDir);
|
if(dirForSaving==null)
|
||||||
|
{
|
||||||
|
dirForSaving= new File(currentUsersHomeDir);
|
||||||
|
}
|
||||||
path = new Label(String.format(Text.F_LABEL_SAVE_PATH, currentUsersHomeDir));
|
path = new Label(String.format(Text.F_LABEL_SAVE_PATH, currentUsersHomeDir));
|
||||||
|
|
||||||
selectSavePath.setCenter(path);
|
selectSavePath.setCenter(path);
|
||||||
@@ -1100,12 +1104,12 @@ public class UICoordinator implements ChangeListener<Boolean>
|
|||||||
ComboBox<String> levelTwo = getComboBox(comboContainer);
|
ComboBox<String> levelTwo = getComboBox(comboContainer);
|
||||||
ComboBox<String> levelThree = getComboBox(comboContainer);
|
ComboBox<String> levelThree = getComboBox(comboContainer);
|
||||||
ComboBox<String> levelFour = getComboBox(comboContainer);
|
ComboBox<String> levelFour = getComboBox(comboContainer);
|
||||||
|
levelOne.setStyle("-fx-font-family :\"Arial\"");
|
||||||
|
|
||||||
levelOne.setItems(getOccupationList(""));
|
levelOne.setItems(getOccupationList(""));
|
||||||
levelOne.setDisable(false);
|
levelOne.setDisable(false);
|
||||||
levelOne.setValue(Text.NOT_SET);
|
levelOne.setValue(Text.NOT_SET);
|
||||||
occupation= new Occupation(Text.NOT_SET);
|
occupation= new Occupation(Text.NOT_SET);
|
||||||
|
|
||||||
|
|
||||||
levelOne.valueProperty().addListener(new ChangeListener<String>()
|
levelOne.valueProperty().addListener(new ChangeListener<String>()
|
||||||
{
|
{
|
||||||
|
|||||||
Binary file not shown.
@@ -1,5 +1,5 @@
|
|||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Apr 30 10:46:45 CEST 2021
|
#Fri May 21 10:51:02 CEST 2021
|
||||||
groupId=health_data_export
|
groupId=health_data_export
|
||||||
artifactId=health_data_export
|
artifactId=health_data_export
|
||||||
version=7
|
version=7
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user