From b9536c6a1bd46718ef1e3c2b7352e5cf5d6d681a Mon Sep 17 00:00:00 2001 From: dbuechel Date: Tue, 21 Jan 2020 09:43:25 +0100 Subject: [PATCH] Unified license information in about windows. --- SafeExamBrowser.I18n.Contracts/TextKey.cs | 1 + SafeExamBrowser.I18n/Text.xml | 3 ++ .../AboutWindow.xaml | 50 +++++++++++++++--- .../AboutWindow.xaml.cs | 3 ++ .../AboutWindow.xaml | 45 ++++++++++++++-- .../AboutWindow.xaml.cs | 3 ++ Setup/Resources/License.rtf | Bin 3256 -> 3255 bytes 7 files changed, 92 insertions(+), 13 deletions(-) diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs index 9016edc0..76756748 100644 --- a/SafeExamBrowser.I18n.Contracts/TextKey.cs +++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs @@ -14,6 +14,7 @@ namespace SafeExamBrowser.I18n.Contracts /// public enum TextKey { + AboutWindow_LicenseInfo, Browser_BlockedContentMessage, Browser_BlockedPageButton, Browser_BlockedPageMessage, diff --git a/SafeExamBrowser.I18n/Text.xml b/SafeExamBrowser.I18n/Text.xml index 26d186ae..e772b0db 100644 --- a/SafeExamBrowser.I18n/Text.xml +++ b/SafeExamBrowser.I18n/Text.xml @@ -1,5 +1,8 @@  + + This application is subject to the terms of the Mozilla Public License, version 2.0. Safe Exam Browser uses the following frameworks and third-party libraries: + Content blocked diff --git a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml index 99cae9e3..7341576e 100644 --- a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml @@ -4,24 +4,33 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop" - mc:Ignorable="d" - Title="Version & License Information" Background="White" Height="325" Width="575" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico" - ShowInTaskbar="False" WindowStartupLocation="CenterScreen"> + mc:Ignorable="d" Title="Version & License Information" Background="White" Height="350" Width="575" ResizeMode="NoResize" + Icon="./Images/SafeExamBrowser.ico" ShowInTaskbar="False" WindowStartupLocation="CenterScreen"> + + + + + + + + - - - + + - This application is subject to the terms of the Mozilla Public License, version 2.0. If a copy of the MPL was not - distributed with this application, you can obtain one at http://mozilla.org/MPL/2.0/. + + + .NET Framework + + Copyright © 2002-2020 Microsoft. All rights reserved. CefSharp (.NET bindings for the Chromium Embedded Framework) @@ -32,6 +41,31 @@ CEF (Chromium Embedded Framework) Copyright © 2008-2020 The Chromium Embedded Framework Authors. All rights reserved. + + + Font-Awesome-WPF + + Copyright © 2014-2020 charri. All rights reserved. + + + KnownFolders + + Copyright © 2017-2020 Syroot. All rights reserved. + + + NAudio + + Copyright © 2008-2020 Mark Heath & contributors. All rights reserved. + + + SimpleWifi + + Copyright © 2013-2015 DigiExam. All rights reserved. + + + Visual C++ Redistributable + + Copyright © 1993-2020 Microsoft. All rights reserved. diff --git a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs index e5b07ea7..21bd3465 100644 --- a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs @@ -45,6 +45,9 @@ namespace SafeExamBrowser.UserInterface.Desktop private void InitializeAboutWindow() { Closing += (o, args) => closing?.Invoke(); + + MainText.Inlines.InsertBefore(MainText.Inlines.FirstInline, new Run(text.Get(TextKey.AboutWindow_LicenseInfo))); + VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Version)} {appConfig.ProgramInformationalVersion}") { FontSize = 12 }); VersionInfo.Inlines.Add(new LineBreak()); VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Build)} {appConfig.ProgramBuildVersion}") { FontSize = 8, Foreground = Brushes.Gray }); diff --git a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml index 42b6ff22..3c21ceb2 100644 --- a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml @@ -7,21 +7,31 @@ mc:Ignorable="d" Title="Version & License Information" Background="White" Height="450" Width="675" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico" FontSize="16" ShowInTaskbar="False" WindowStartupLocation="CenterScreen"> + + + + + + + + - - - + + - This application is subject to the terms of the Mozilla Public License, version 2.0. If a copy of the MPL was not - distributed with this application, you can obtain one at http://mozilla.org/MPL/2.0/. + + + .NET Framework + + Copyright © 2002-2020 Microsoft. All rights reserved. CefSharp (.NET bindings for the Chromium Embedded Framework) @@ -32,6 +42,31 @@ CEF (Chromium Embedded Framework) Copyright © 2008-2020 The Chromium Embedded Framework Authors. All rights reserved. + + + Font-Awesome-WPF + + Copyright © 2014-2020 charri. All rights reserved. + + + KnownFolders + + Copyright © 2017-2020 Syroot. All rights reserved. + + + NAudio + + Copyright © 2008-2020 Mark Heath & contributors. All rights reserved. + + + SimpleWifi + + Copyright © 2013-2015 DigiExam. All rights reserved. + + + Visual C++ Redistributable + + Copyright © 1993-2020 Microsoft. All rights reserved. diff --git a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs index c1a203aa..7be03ae3 100644 --- a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs @@ -45,6 +45,9 @@ namespace SafeExamBrowser.UserInterface.Mobile private void InitializeAboutWindow() { Closing += (o, args) => closing?.Invoke(); + + MainText.Inlines.InsertBefore(MainText.Inlines.FirstInline, new Run(text.Get(TextKey.AboutWindow_LicenseInfo))); + VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Version)} {appConfig.ProgramInformationalVersion}")); VersionInfo.Inlines.Add(new LineBreak()); VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Build)} {appConfig.ProgramBuildVersion}") { FontSize = 10, Foreground = Brushes.Gray }); diff --git a/Setup/Resources/License.rtf b/Setup/Resources/License.rtf index 75b4f69e1f6e79ce6a892eb98876600cff397687..b02a30a2df29357f8c3e0bddde68b3b98cd62b4f 100644 GIT binary patch delta 16 YcmdlXxm|KY5$EIy+`5|=a7r)(05>58p8x;= delta 12 TcmdlkxkGY85$EPYPB&%%AcX`&