mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-28 21:37:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

updated about screen, updated third-party license generation

Browse Source
This commit is contained in:
Tobias Hagemann
2020-03-11 14:21:13 +01:00
parent 96a3c025ab
commit a0807c2e0c
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main/ui/src/license/template.ftl
View File

@@ -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/)

11
main/ui/src/main/resources/fxml/preferences_about.fxml
View File

@@ -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>

25
main/ui/src/main/resources/license/THIRD-PARTY.txt
View File

@@ -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/)