From a0807c2e0c43e24371b68f3ca7613748d0cce4ce Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Wed, 11 Mar 2020 14:21:13 +0100
Subject: [PATCH] updated about screen, updated third-party license generation

---
 main/ui/src/license/template.ftl              | 25 +++++++++++--------
 .../resources/fxml/preferences_about.fxml     | 11 ++++----
 .../main/resources/license/THIRD-PARTY.txt    | 25 +++++++++++--------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/main/ui/src/license/template.ftl b/main/ui/src/license/template.ftl
index 2888d746e..12f788d90 100644
--- a/main/ui/src/license/template.ftl
+++ b/main/ui/src/license/template.ftl
@@ -5,19 +5,18 @@
         <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - " + (p.url!"no url defined") + ")">
     </#if>
 </#function>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see http://www.gnu.org/licenses/.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see http://www.gnu.org/licenses/.
 
 Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:
 <#list licenseMap as e>
@@ -30,3 +29,7 @@ Cryptomator uses ${dependencyMap?size} third-party dependencies under the follow
 	</#list>
 	</#if>
 </#list>
+
+Cryptomator uses other third-party assets under the following licenses:
+	SIL OFL 1.1 License:
+		• Font Awesome 5.12.0 (https://fontawesome.com/)
diff --git a/main/ui/src/main/resources/fxml/preferences_about.fxml b/main/ui/src/main/resources/fxml/preferences_about.fxml
index 7f6a55e22..f214f5df2 100644
--- a/main/ui/src/main/resources/fxml/preferences_about.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_about.fxml
@@ -11,22 +11,21 @@
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.preferences.AboutController"
-	  spacing="12"
-	  alignment="TOP_CENTER">
+	  spacing="18">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<HBox spacing="12" VBox.vgrow="NEVER" alignment="TOP_LEFT">
+		<HBox spacing="12" VBox.vgrow="NEVER">
 			<ImageView VBox.vgrow="ALWAYS" fitHeight="64" preserveRatio="true" smooth="true" cache="true">
 				<Image url="/bot.png"/>
 			</ImageView>
-			<VBox HBox.hgrow="ALWAYS">
+			<VBox spacing="3" HBox.hgrow="ALWAYS" alignment="CENTER_LEFT">
 				<FormattedLabel styleClass="label-large" format="Cryptomator %s" arg1="${controller.applicationVersion}"/>
-				<Label text="© 2016 - 2020 Skymatic GmbH"/>
+				<Label text="© 2016 – 2020 Skymatic GmbH"/>
 			</VBox>
 		</HBox>
 
-		<TextArea text="${controller.thirdPartyLicenseText}" editable="false" />
+		<TextArea text="${controller.thirdPartyLicenseText}" editable="false"/>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 6fe68d640..8ca3554cd 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -1,16 +1,15 @@
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see http://www.gnu.org/licenses/.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see http://www.gnu.org/licenses/.
 
 Cryptomator uses 49 third-party dependencies under the following licenses:
 	Apache License v2.0:
@@ -83,3 +82,7 @@ Cryptomator uses 49 third-party dependencies under the following licenses:
 		• SLF4J API Module (org.slf4j:slf4j-api:1.7.29 - http://www.slf4j.org)
 	The BSD 2-Clause License:
 		• EasyBind (org.fxmisc.easybind:easybind:1.0.3 - http://www.fxmisc.org/easybind/)
+
+Cryptomator uses other third-party assets under the following licenses:
+	SIL OFL 1.1 License:
+		• Font Awesome 5.12.0 (https://fontawesome.com/)