diff --git a/docs/UserManual/VideoTutorials/tutorial.mp4 b/docs/UserManual/VideoTutorials/tutorial.mp4 index aa1f5da5..beb55fee 100644 Binary files a/docs/UserManual/VideoTutorials/tutorial.mp4 and b/docs/UserManual/VideoTutorials/tutorial.mp4 differ diff --git a/easyDiffractionApp/Gui/Components/ApplicationWindow.qml b/easyDiffractionApp/Gui/Components/ApplicationWindow.qml index 4b425a1f..13cee14f 100644 --- a/easyDiffractionApp/Gui/Components/ApplicationWindow.qml +++ b/easyDiffractionApp/Gui/Components/ApplicationWindow.qml @@ -320,4 +320,14 @@ EaComponents.ApplicationWindow { } } + /////////////// + // Init dialogs + /////////////// + + // Application dialogs (invisible at the beginning) + ExProjectPage.AboutDialog { + x: (parent.width - width) * 0.5 + y: (parent.height - height) * 0.5 + + } } diff --git a/easyDiffractionApp/Gui/Globals/Constants.qml b/easyDiffractionApp/Gui/Globals/Constants.qml index 8c2420eb..73c353d3 100644 --- a/easyDiffractionApp/Gui/Globals/Constants.qml +++ b/easyDiffractionApp/Gui/Globals/Constants.qml @@ -16,6 +16,11 @@ QtObject { readonly property string appVersion: EaGlobals.Variables.projectConfig.tool.poetry.version readonly property string appDate: new Date().toISOString().slice(0,10) // TODO: Get from phython logic formatted as "9 Apr 2020" readonly property string appLogo: Qt.resolvedUrl("../Resources/Logo/App.svg") - + readonly property string appUrl: "https://github.com/easyScience/easyDiffractionApp" + readonly property string essLogo: Qt.resolvedUrl("../Resources/Logo/ESSlogo.png") + readonly property string eulaUrl: "https://raw.githubusercontent.com/easyScience/easyDiffractionApp/master/LICENSE.md" + readonly property string oslUrl: "https://raw.githubusercontent.com/easyScience/easyDiffractionApp/master/externalLicences.md" + readonly property string description: "easyDiffraction is a scientific software for\n modelling and analysis of neutron diffraction data.\n\n" + + "easyDiffraction is build by ESS DMSC in\n Copenhagen, Denmark." readonly property int sampleScale: 100 } diff --git a/easyDiffractionApp/Gui/Pages/Home/MainContent.qml b/easyDiffractionApp/Gui/Pages/Home/MainContent.qml index 7a259182..784c8d04 100644 --- a/easyDiffractionApp/Gui/Pages/Home/MainContent.qml +++ b/easyDiffractionApp/Gui/Pages/Home/MainContent.qml @@ -81,8 +81,10 @@ Item { spacing: EaStyle.Sizes.fontPixelSize EaElements.Button { - enabled: false + enabled: true + id: aboutButton text: qsTr("About %1".arg(ExGlobals.Constants.appName)) + onClicked: EaGlobals.Variables.showAppAboutDialog = true } EaElements.Button { enabled: false diff --git a/easyDiffractionApp/Gui/Pages/Project/AboutDialog.qml b/easyDiffractionApp/Gui/Pages/Project/AboutDialog.qml new file mode 100644 index 00000000..58529a8d --- /dev/null +++ b/easyDiffractionApp/Gui/Pages/Project/AboutDialog.qml @@ -0,0 +1,25 @@ +import QtQuick 2.13 + +import easyAppGui.Globals 1.0 as EaGlobals +import easyAppGui.Components 1.0 as EaComponents + +import Gui.Globals 1.0 as ExGlobals + +EaComponents.AboutDialog { + visible: EaGlobals.Variables.showAppAboutDialog + onClosed: EaGlobals.Variables.showAppAboutDialog = false + + + Component.onCompleted: { + appIconPath = ExGlobals.Constants.appLogo + essIconPath = ExGlobals.Constants.essLogo + eulaUrl = ExGlobals.Constants.eulaUrl + oslUrl = ExGlobals.Constants.oslUrl + appUrl = ExGlobals.Constants.appUrl + appPrefixName = ExGlobals.Constants.appPrefixName + appSuffixName = ExGlobals.Constants.appSuffixName + description = ExGlobals.Constants.description + appVersion = ExGlobals.Constants.appVersion + appDate = ExGlobals.Constants.appDate + } +} diff --git a/easyDiffractionApp/Gui/Pages/Project/qmldir b/easyDiffractionApp/Gui/Pages/Project/qmldir index 65b8a8e1..989d6d40 100644 --- a/easyDiffractionApp/Gui/Pages/Project/qmldir +++ b/easyDiffractionApp/Gui/Pages/Project/qmldir @@ -1,5 +1,7 @@ module Project +AboutDialog 1.0 AboutDialog.qml + MainContentTextView 1.0 MainContentTextView.qml MainContentDescription 1.0 MainContentDescription.qml diff --git a/easyDiffractionApp/Gui/Resources/Logo/ESSlogo.png b/easyDiffractionApp/Gui/Resources/Logo/ESSlogo.png new file mode 100644 index 00000000..9754fe3b Binary files /dev/null and b/easyDiffractionApp/Gui/Resources/Logo/ESSlogo.png differ diff --git a/externalLicenses.md b/externalLicenses.md new file mode 100644 index 00000000..35659500 --- /dev/null +++ b/externalLicenses.md @@ -0,0 +1,24 @@ +# External Open Source Dependencies + +The following Open Source projects are used in easyDiffraction (_if there are any issues with licensing, please contact us via https://easydiffraction.org/contact.html_): + +## Fonts + +Encode Sans - https://fonts.google.com/specimen/Encode+Sans - Open Font Licence +Encode Sans Condensed - https://fonts.google.com/specimen/Encode+Sans+Condensed - Open Font Licence +Encode Sans Expanded - https://fonts.google.com/specimen/Encode+Sans+Expanded - Open Font Licence +PT Sans - https://fonts.google.com/specimen/PT+Sans - Open Font Licence +PT Mono - https://fonts.google.com/specimen/PT+Mono - Open Font Licence + +## Icons + +fontAwsome - https://github.com/FortAwesome/Font-Awesome - Creatice Commons 4.0 Licence + +## Computational libraries + +GSASII - https://raw.githubusercontent.com/easyScience/libsLinux/main/libsLinux/GSASII/license2013.txt +CrysFML - https://raw.githubusercontent.com/easyScience/libsLinux/main/libsLinux/CFML_api/LICENSE + +## Python Modules + +Module information can be found at https://app.fossa.com/attribution/ef7a4b12-0ea0-4c0e-a77a-791b5f307327