From b71529da31fa41cd50e96c896dec87aee3fa22af Mon Sep 17 00:00:00 2001
From: dbuechel <damian.buechel@let.ethz.ch>
Date: Tue, 13 Aug 2019 10:02:05 +0200
Subject: [PATCH] SEBWIN-338: Introduced program build version.
---
.../BrowserApplicationController.cs | 2 +-
.../Handlers/RequestHandler.cs | 2 +-
.../ConfigurationRepositoryTests.cs | 2 +-
.../ConfigurationData/DataValues.cs | 12 +-
.../ConfigurationRepository.cs | 3 +-
.../Configuration/AppConfig.cs | 13 +-
SafeExamBrowser.Contracts/I18n/TextKey.cs | 1 +
SafeExamBrowser.I18n/Text.xml | 615 +++++++++---------
SafeExamBrowser.Runtime/CompositionRoot.cs | 5 +-
.../AboutWindow.xaml | 2 +-
.../AboutWindow.xaml.cs | 7 +-
.../RuntimeWindow.xaml | 2 +-
.../RuntimeWindow.xaml.cs | 9 +-
.../SplashScreen.xaml.cs | 3 +-
.../AboutWindow.xaml | 2 +-
.../AboutWindow.xaml.cs | 7 +-
.../RuntimeWindow.xaml | 2 +-
.../RuntimeWindow.xaml.cs | 9 +-
.../SplashScreen.xaml.cs | 3 +-
19 files changed, 368 insertions(+), 333 deletions(-)
diff --git a/SafeExamBrowser.Browser/BrowserApplicationController.cs b/SafeExamBrowser.Browser/BrowserApplicationController.cs
index 0b39dc75..80e11d37 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationController.cs
+++ b/SafeExamBrowser.Browser/BrowserApplicationController.cs
@@ -173,7 +173,7 @@ namespace SafeExamBrowser.Browser
private string InitializeUserAgent()
{
var osVersion = $"{Environment.OSVersion.Version.Major}.{Environment.OSVersion.Version.Minor}";
- var sebVersion = $"SEB/{appConfig.ProgramVersion}";
+ var sebVersion = $"SEB/{appConfig.ProgramInformationalVersion}";
if (settings.UseCustomUserAgent)
{
diff --git a/SafeExamBrowser.Browser/Handlers/RequestHandler.cs b/SafeExamBrowser.Browser/Handlers/RequestHandler.cs
index 9e47b615..c876c4c7 100644
--- a/SafeExamBrowser.Browser/Handlers/RequestHandler.cs
+++ b/SafeExamBrowser.Browser/Handlers/RequestHandler.cs
@@ -48,7 +48,7 @@ namespace SafeExamBrowser.Browser.Handlers
var headers = new NameValueCollection(request.Headers);
var userAgent = request.Headers["User-Agent"];
- headers["User-Agent"] = $"{userAgent} SEB/{appConfig.ProgramVersion}";
+ headers["User-Agent"] = $"{userAgent} SEB/{appConfig.ProgramInformationalVersion}";
request.Headers = headers;
}
diff --git a/SafeExamBrowser.Configuration.UnitTests/ConfigurationRepositoryTests.cs b/SafeExamBrowser.Configuration.UnitTests/ConfigurationRepositoryTests.cs
index eb673747..2e0ab7f2 100644
--- a/SafeExamBrowser.Configuration.UnitTests/ConfigurationRepositoryTests.cs
+++ b/SafeExamBrowser.Configuration.UnitTests/ConfigurationRepositoryTests.cs
@@ -56,7 +56,7 @@ namespace SafeExamBrowser.Configuration.UnitTests
fileSaver.Setup(f => f.CanSave(It.IsAny<Uri>())).Returns<Uri>(u => u.IsFile);
networkLoader.Setup(n => n.CanLoad(It.IsAny<Uri>())).Returns<Uri>(u => u.Scheme.Equals("http") || u.Scheme.Equals("seb"));
- sut = new ConfigurationRepository(certificateStore.Object, hashAlgorithm.Object, logger.Object, executablePath, string.Empty, string.Empty, string.Empty);
+ sut = new ConfigurationRepository(certificateStore.Object, hashAlgorithm.Object, logger.Object, executablePath, string.Empty, string.Empty, string.Empty, string.Empty);
sut.InitializeAppConfig();
}
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
index ae35ed93..4c6002a1 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
@@ -20,13 +20,20 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
private AppConfig appConfig;
private string executablePath;
+ private string programBuild;
private string programCopyright;
private string programTitle;
private string programVersion;
- internal DataValues(string executablePath, string programCopyright, string programTitle, string programVersion)
+ internal DataValues(
+ string executablePath,
+ string programBuild,
+ string programCopyright,
+ string programTitle,
+ string programVersion)
{
this.executablePath = executablePath ?? string.Empty;
+ this.programBuild = programBuild ?? string.Empty;
this.programCopyright = programCopyright ?? string.Empty;
this.programTitle = programTitle ?? string.Empty;
this.programVersion = programVersion ?? string.Empty;
@@ -57,10 +64,11 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
appConfig.ClientLogFilePath = Path.Combine(logFolder, $"{logFilePrefix}_Client.log");
appConfig.ConfigurationFileExtension = ".seb";
appConfig.DownloadDirectory = Path.Combine(appDataLocalFolder, "Downloads");
+ appConfig.ProgramBuildVersion = programBuild;
appConfig.ProgramCopyright = programCopyright;
appConfig.ProgramDataFilePath = Path.Combine(programDataFolder, DEFAULT_CONFIGURATION_NAME);
appConfig.ProgramTitle = programTitle;
- appConfig.ProgramVersion = programVersion;
+ appConfig.ProgramInformationalVersion = programVersion;
appConfig.RuntimeId = Guid.NewGuid();
appConfig.RuntimeAddress = $"{AppConfig.BASE_ADDRESS}/runtime/{Guid.NewGuid()}";
appConfig.RuntimeLogFilePath = Path.Combine(logFolder, $"{logFilePrefix}_Runtime.log");
diff --git a/SafeExamBrowser.Configuration/ConfigurationRepository.cs b/SafeExamBrowser.Configuration/ConfigurationRepository.cs
index 4630f67f..886e91fa 100644
--- a/SafeExamBrowser.Configuration/ConfigurationRepository.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationRepository.cs
@@ -37,6 +37,7 @@ namespace SafeExamBrowser.Configuration
IHashAlgorithm hashAlgorithm,
IModuleLogger logger,
string executablePath,
+ string programBuild,
string programCopyright,
string programTitle,
string programVersion)
@@ -48,7 +49,7 @@ namespace SafeExamBrowser.Configuration
dataParsers = new List<IDataParser>();
dataSerializers = new List<IDataSerializer>();
dataMapper = new DataMapper();
- dataValues = new DataValues(executablePath, programCopyright, programTitle, programVersion);
+ dataValues = new DataValues(executablePath, programBuild, programCopyright, programTitle, programVersion);
resourceLoaders = new List<IResourceLoader>();
resourceSavers = new List<IResourceSaver>();
}
diff --git a/SafeExamBrowser.Contracts/Configuration/AppConfig.cs b/SafeExamBrowser.Contracts/Configuration/AppConfig.cs
index b1c85ebe..a3adbb32 100644
--- a/SafeExamBrowser.Contracts/Configuration/AppConfig.cs
+++ b/SafeExamBrowser.Contracts/Configuration/AppConfig.cs
@@ -97,7 +97,12 @@ namespace SafeExamBrowser.Contracts.Configuration
public string DownloadDirectory { get; set; }
/// <summary>
- /// The copyright information for the application (i.e. the executing assembly).
+ /// The build version of the application.
+ /// </summary>
+ public string ProgramBuildVersion { get; set; }
+
+ /// <summary>
+ /// The copyright information for the application.
/// </summary>
public string ProgramCopyright { get; set; }
@@ -107,14 +112,14 @@ namespace SafeExamBrowser.Contracts.Configuration
public string ProgramDataFilePath { get; set; }
/// <summary>
- /// The program title of the application (i.e. the executing assembly).
+ /// The program title of the application.
/// </summary>
public string ProgramTitle { get; set; }
/// <summary>
- /// The program version of the application (i.e. the executing assembly).
+ /// The informational version of the application.
/// </summary>
- public string ProgramVersion { get; set; }
+ public string ProgramInformationalVersion { get; set; }
/// <summary>
/// The communication address of the runtime component.
diff --git a/SafeExamBrowser.Contracts/I18n/TextKey.cs b/SafeExamBrowser.Contracts/I18n/TextKey.cs
index 0c1cacdc..063db73e 100644
--- a/SafeExamBrowser.Contracts/I18n/TextKey.cs
+++ b/SafeExamBrowser.Contracts/I18n/TextKey.cs
@@ -16,6 +16,7 @@ namespace SafeExamBrowser.Contracts.I18n
{
BrowserWindow_DeveloperConsoleMenuItem,
BrowserWindow_ZoomMenuItem,
+ Build,
LogWindow_Title,
MessageBox_ApplicationError,
MessageBox_ApplicationErrorTitle,
diff --git a/SafeExamBrowser.I18n/Text.xml b/SafeExamBrowser.I18n/Text.xml
index d98e523e..921d9595 100644
--- a/SafeExamBrowser.I18n/Text.xml
+++ b/SafeExamBrowser.I18n/Text.xml
@@ -1,309 +1,312 @@
<?xml version="1.0" encoding="utf-8" ?>
<Text>
- <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
- Developer Console
- </Entry>
- <Entry key="BrowserWindow_ZoomMenuItem">
- Page Zoom
- </Entry>
- <Entry key="LogWindow_Title">
- Application Log
- </Entry>
- <Entry key="MessageBox_ApplicationError">
- An unrecoverable error has occurred! Please consult the application log for more information. The application will now shut down...
- </Entry>
- <Entry key="MessageBox_ApplicationErrorTitle">
- Application Error
- </Entry>
- <Entry key="MessageBox_CancelButton">
- Cancel
- </Entry>
- <Entry key="MessageBox_ClientConfigurationError">
- The local client configuration has failed! Please consult the application log for more information. The application will now shut down...
- </Entry>
- <Entry key="MessageBox_ClientConfigurationErrorTitle">
- Client Configuration Error
- </Entry>
- <Entry key="MessageBox_ClientConfigurationQuestion">
- The client configuration has been saved and will be used when you start the application the next time. Do you want to quit for now?
- </Entry>
- <Entry key="MessageBox_ClientConfigurationQuestionTitle">
- Configuration Successful
- </Entry>
- <Entry key="MessageBox_ConfigurationDownloadError">
- Failed to download the new application configuration. Please try again or contact technical support.
- </Entry>
- <Entry key="MessageBox_ConfigurationDownloadErrorTitle">
- Download Error
- </Entry>
- <Entry key="MessageBox_InvalidConfigurationData">
- The configuration resource "%%URI%%" contains invalid data!
- </Entry>
- <Entry key="MessageBox_InvalidConfigurationDataTitle">
- Configuration Error
- </Entry>
- <Entry key="MessageBox_InvalidPasswordError">
- You failed to enter the correct password within 5 attempts. The application will now terminate...
- </Entry>
- <Entry key="MessageBox_InvalidPasswordErrorTitle">
- Invalid Password
- </Entry>
- <Entry key="MessageBox_InvalidQuitPassword">
- The application can only be terminated by entering the correct quit password.
- </Entry>
- <Entry key="MessageBox_InvalidQuitPasswordTitle">
- Invalid Quit Password
- </Entry>
- <Entry key="MessageBox_NoButton">
- No
- </Entry>
- <Entry key="MessageBox_NotSupportedConfigurationResource">
- The configuration resource "%%URI%%" is not supported!
- </Entry>
- <Entry key="MessageBox_NotSupportedConfigurationResourceTitle">
- Configuration Error
- </Entry>
- <Entry key="MessageBox_OkButton">
- OK
- </Entry>
- <Entry key="MessageBox_Quit">
- Do you want to quit the application?
- </Entry>
- <Entry key="MessageBox_QuitTitle">
- Quit?
- </Entry>
- <Entry key="MessageBox_QuitError">
- The client failed to communicate the shutdown request to the runtime!
- </Entry>
- <Entry key="MessageBox_QuitErrorTitle">
- Quit Error
- </Entry>
- <Entry key="MessageBox_ReconfigurationDenied">
- You are not allowed to reconfigure the application.
- </Entry>
- <Entry key="MessageBox_ReconfigurationDeniedTitle">
- Reconfiguration Denied
- </Entry>
- <Entry key="MessageBox_ReconfigurationError">
- The client failed to communicate the reconfiguration request to the runtime!
- </Entry>
- <Entry key="MessageBox_ReconfigurationErrorTitle">
- Reconfiguration Error
- </Entry>
- <Entry key="MessageBox_ReconfigurationQuestion">
- Would you like to reconfigure the application?
- </Entry>
- <Entry key="MessageBox_ReconfigurationQuestionTitle">
- Configuration Detected
- </Entry>
- <Entry key="MessageBox_ReloadConfirmation">
- Would you like to reload the current page?
- </Entry>
- <Entry key="MessageBox_ReloadConfirmationTitle">
- Reload?
- </Entry>
- <Entry key="MessageBox_ServiceUnavailableError">
- Failed to initialize the SEB service! The application will now terminate since the service is configured to be mandatory.
- </Entry>
- <Entry key="MessageBox_ServiceUnavailableErrorTitle">
- Service Unavailable
- </Entry>
- <Entry key="MessageBox_ServiceUnavailableWarning">
- Failed to initialize the SEB service. The application will continue initialization since the service is configured to be optional.
- </Entry>
- <Entry key="MessageBox_ServiceUnavailableWarningTitle">
- Service Unavailable
- </Entry>
- <Entry key="MessageBox_SessionStartError">
- The application failed to start a new session! Please consult the application log for more information...
- </Entry>
- <Entry key="MessageBox_SessionStartErrorTitle">
- Session Start Error
- </Entry>
- <Entry key="MessageBox_ShutdownError">
- An unexpected error occurred during the shutdown procedure! Please consult the application log for more information...
- </Entry>
- <Entry key="MessageBox_ShutdownErrorTitle">
- Shutdown Error
- </Entry>
- <Entry key="MessageBox_StartupError">
- An unexpected error occurred during the startup procedure! Please consult the application log for more information...
- </Entry>
- <Entry key="MessageBox_StartupErrorTitle">
- Startup Error
- </Entry>
- <Entry key="MessageBox_UnexpectedConfigurationError">
- An unexpected error occurred while trying to load configuration resource "%%URI%%"! Please consult the application log for more information...
- </Entry>
- <Entry key="MessageBox_UnexpectedConfigurationErrorTitle">
- Configuration Error
- </Entry>
- <Entry key="MessageBox_YesButton">
- Yes
- </Entry>
- <Entry key="Notification_AboutTooltip">
- Information about SEB
- </Entry>
- <Entry key="Notification_LogTooltip">
- Application Log
- </Entry>
- <Entry key="OperationStatus_CloseRuntimeConnection">
- Closing runtime connection
- </Entry>
- <Entry key="OperationStatus_EmptyClipboard">
- Emptying clipboard
- </Entry>
- <Entry key="OperationStatus_FinalizeServiceSession">
- Finalizing service session
- </Entry>
- <Entry key="OperationStatus_InitializeBrowser">
- Initializing browser
- </Entry>
- <Entry key="OperationStatus_InitializeConfiguration">
- Initializing application configuration
- </Entry>
- <Entry key="OperationStatus_InitializeKioskMode">
- Initializing kiosk mode
- </Entry>
- <Entry key="OperationStatus_InitializeProcessMonitoring">
- Initializing process monitoring
- </Entry>
- <Entry key="OperationStatus_InitializeRuntimeConnection">
- Initializing runtime connection
- </Entry>
- <Entry key="OperationStatus_InitializeServiceSession">
- Initializing service session
- </Entry>
- <Entry key="OperationStatus_InitializeSession">
- Initializing new session
- </Entry>
- <Entry key="OperationStatus_InitializeShell">
- Initializing user interface
- </Entry>
- <Entry key="OperationStatus_InitializeWindowMonitoring">
- Initializing window monitoring
- </Entry>
- <Entry key="OperationStatus_InitializeWorkingArea">
- Initializing working area
- </Entry>
- <Entry key="OperationStatus_RestartCommunicationHost">
- Restarting communication host
- </Entry>
- <Entry key="OperationStatus_RestoreWorkingArea">
- Restoring working area
- </Entry>
- <Entry key="OperationStatus_RevertKioskMode">
- Reverting kiosk mode
- </Entry>
- <Entry key="OperationStatus_StartClient">
- Starting client
- </Entry>
- <Entry key="OperationStatus_StartCommunicationHost">
- Starting communication host
- </Entry>
- <Entry key="OperationStatus_StartKeyboardInterception">
- Starting keyboard interception
- </Entry>
- <Entry key="OperationStatus_StartMouseInterception">
- Starting mouse interception
- </Entry>
- <Entry key="OperationStatus_StopClient">
- Stopping client
- </Entry>
- <Entry key="OperationStatus_StopCommunicationHost">
- Stopping communication host
- </Entry>
- <Entry key="OperationStatus_StopKeyboardInterception">
- Stopping keyboard interception
- </Entry>
- <Entry key="OperationStatus_StopMouseInterception">
- Stopping mouse interception
- </Entry>
- <Entry key="OperationStatus_StopProcessMonitoring">
- Stopping process monitoring
- </Entry>
- <Entry key="OperationStatus_StopWindowMonitoring">
- Stopping window monitoring
- </Entry>
- <Entry key="OperationStatus_TerminateBrowser">
- Terminating browser
- </Entry>
- <Entry key="OperationStatus_TerminateShell">
- Terminating user interface
- </Entry>
- <Entry key="OperationStatus_WaitExplorerStartup">
- Waiting for Windows explorer to start up
- </Entry>
- <Entry key="OperationStatus_WaitExplorerTermination">
- Waiting for Windows explorer to shut down
- </Entry>
- <Entry key="OperationStatus_WaitRuntimeDisconnection">
- Waiting for the runtime to disconnect
- </Entry>
- <Entry key="PasswordDialog_Cancel">
- Cancel
- </Entry>
- <Entry key="PasswordDialog_Confirm">
- Confirm
- </Entry>
- <Entry key="PasswordDialog_LocalAdminPasswordRequired">
- Please enter the administrator password for the local client configuration:
- </Entry>
- <Entry key="PasswordDialog_LocalAdminPasswordRequiredTitle">
- Administrator Password Required
- </Entry>
- <Entry key="PasswordDialog_LocalSettingsPasswordRequired">
- Please enter the settings password for the local client configuration:
- </Entry>
- <Entry key="PasswordDialog_LocalSettingsPasswordRequiredTitle">
- Settings Password Required
- </Entry>
- <Entry key="PasswordDialog_QuitPasswordRequired">
- Please enter the quit password in order to terminate the application:
- </Entry>
- <Entry key="PasswordDialog_QuitPasswordRequiredTitle">
- Quit Password Required
- </Entry>
- <Entry key="PasswordDialog_SettingsPasswordRequired">
- Please enter the settings password for the selected application configuration:
- </Entry>
- <Entry key="PasswordDialog_SettingsPasswordRequiredTitle">
- Settings Password Required
- </Entry>
- <Entry key="RuntimeWindow_ApplicationRunning">
- The application is running.
- </Entry>
- <Entry key="Shell_QuitButton">
- Terminate Session
- </Entry>
- <Entry key="SystemControl_BatteryCharging">
- Plugged in, charging... (%%CHARGE%%%)
- </Entry>
- <Entry key="SystemControl_BatteryCharged">
- Fully charged (%%CHARGE%%%)
- </Entry>
- <Entry key="SystemControl_BatteryChargeCriticalWarning">
- The battery charge is critically low. Please connect your computer to a power supply!
- </Entry>
- <Entry key="SystemControl_BatteryChargeLowInfo">
- The battery charge is getting low. Consider connecting your computer to a power supply in time...
- </Entry>
- <Entry key="SystemControl_BatteryRemainingCharge">
- %%HOURS%%h %%MINUTES%%min remaining (%%CHARGE%%%)
- </Entry>
- <Entry key="SystemControl_KeyboardLayoutTooltip">
- The current keyboard layout is "%%LAYOUT%%"
- </Entry>
- <Entry key="SystemControl_WirelessConnected">
- Connected to "%%NAME%%"
- </Entry>
- <Entry key="SystemControl_WirelessDisconnected">
- Disconnected
- </Entry>
- <Entry key="SystemControl_WirelessNotAvailable">
- No wireless network adapter available or turned on
- </Entry>
- <Entry key="Version">
- Version
- </Entry>
+ <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
+ Developer Console
+ </Entry>
+ <Entry key="BrowserWindow_ZoomMenuItem">
+ Page Zoom
+ </Entry>
+ <Entry key="Build">
+ Build
+ </Entry>
+ <Entry key="LogWindow_Title">
+ Application Log
+ </Entry>
+ <Entry key="MessageBox_ApplicationError">
+ An unrecoverable error has occurred! Please consult the application log for more information. The application will now shut down...
+ </Entry>
+ <Entry key="MessageBox_ApplicationErrorTitle">
+ Application Error
+ </Entry>
+ <Entry key="MessageBox_CancelButton">
+ Cancel
+ </Entry>
+ <Entry key="MessageBox_ClientConfigurationError">
+ The local client configuration has failed! Please consult the application log for more information. The application will now shut down...
+ </Entry>
+ <Entry key="MessageBox_ClientConfigurationErrorTitle">
+ Client Configuration Error
+ </Entry>
+ <Entry key="MessageBox_ClientConfigurationQuestion">
+ The client configuration has been saved and will be used when you start the application the next time. Do you want to quit for now?
+ </Entry>
+ <Entry key="MessageBox_ClientConfigurationQuestionTitle">
+ Configuration Successful
+ </Entry>
+ <Entry key="MessageBox_ConfigurationDownloadError">
+ Failed to download the new application configuration. Please try again or contact technical support.
+ </Entry>
+ <Entry key="MessageBox_ConfigurationDownloadErrorTitle">
+ Download Error
+ </Entry>
+ <Entry key="MessageBox_InvalidConfigurationData">
+ The configuration resource "%%URI%%" contains invalid data!
+ </Entry>
+ <Entry key="MessageBox_InvalidConfigurationDataTitle">
+ Configuration Error
+ </Entry>
+ <Entry key="MessageBox_InvalidPasswordError">
+ You failed to enter the correct password within 5 attempts. The application will now terminate...
+ </Entry>
+ <Entry key="MessageBox_InvalidPasswordErrorTitle">
+ Invalid Password
+ </Entry>
+ <Entry key="MessageBox_InvalidQuitPassword">
+ The application can only be terminated by entering the correct quit password.
+ </Entry>
+ <Entry key="MessageBox_InvalidQuitPasswordTitle">
+ Invalid Quit Password
+ </Entry>
+ <Entry key="MessageBox_NoButton">
+ No
+ </Entry>
+ <Entry key="MessageBox_NotSupportedConfigurationResource">
+ The configuration resource "%%URI%%" is not supported!
+ </Entry>
+ <Entry key="MessageBox_NotSupportedConfigurationResourceTitle">
+ Configuration Error
+ </Entry>
+ <Entry key="MessageBox_OkButton">
+ OK
+ </Entry>
+ <Entry key="MessageBox_Quit">
+ Do you want to quit the application?
+ </Entry>
+ <Entry key="MessageBox_QuitTitle">
+ Quit?
+ </Entry>
+ <Entry key="MessageBox_QuitError">
+ The client failed to communicate the shutdown request to the runtime!
+ </Entry>
+ <Entry key="MessageBox_QuitErrorTitle">
+ Quit Error
+ </Entry>
+ <Entry key="MessageBox_ReconfigurationDenied">
+ You are not allowed to reconfigure the application.
+ </Entry>
+ <Entry key="MessageBox_ReconfigurationDeniedTitle">
+ Reconfiguration Denied
+ </Entry>
+ <Entry key="MessageBox_ReconfigurationError">
+ The client failed to communicate the reconfiguration request to the runtime!
+ </Entry>
+ <Entry key="MessageBox_ReconfigurationErrorTitle">
+ Reconfiguration Error
+ </Entry>
+ <Entry key="MessageBox_ReconfigurationQuestion">
+ Would you like to reconfigure the application?
+ </Entry>
+ <Entry key="MessageBox_ReconfigurationQuestionTitle">
+ Configuration Detected
+ </Entry>
+ <Entry key="MessageBox_ReloadConfirmation">
+ Would you like to reload the current page?
+ </Entry>
+ <Entry key="MessageBox_ReloadConfirmationTitle">
+ Reload?
+ </Entry>
+ <Entry key="MessageBox_ServiceUnavailableError">
+ Failed to initialize the SEB service! The application will now terminate since the service is configured to be mandatory.
+ </Entry>
+ <Entry key="MessageBox_ServiceUnavailableErrorTitle">
+ Service Unavailable
+ </Entry>
+ <Entry key="MessageBox_ServiceUnavailableWarning">
+ Failed to initialize the SEB service. The application will continue initialization since the service is configured to be optional.
+ </Entry>
+ <Entry key="MessageBox_ServiceUnavailableWarningTitle">
+ Service Unavailable
+ </Entry>
+ <Entry key="MessageBox_SessionStartError">
+ The application failed to start a new session! Please consult the application log for more information...
+ </Entry>
+ <Entry key="MessageBox_SessionStartErrorTitle">
+ Session Start Error
+ </Entry>
+ <Entry key="MessageBox_ShutdownError">
+ An unexpected error occurred during the shutdown procedure! Please consult the application log for more information...
+ </Entry>
+ <Entry key="MessageBox_ShutdownErrorTitle">
+ Shutdown Error
+ </Entry>
+ <Entry key="MessageBox_StartupError">
+ An unexpected error occurred during the startup procedure! Please consult the application log for more information...
+ </Entry>
+ <Entry key="MessageBox_StartupErrorTitle">
+ Startup Error
+ </Entry>
+ <Entry key="MessageBox_UnexpectedConfigurationError">
+ An unexpected error occurred while trying to load configuration resource "%%URI%%"! Please consult the application log for more information...
+ </Entry>
+ <Entry key="MessageBox_UnexpectedConfigurationErrorTitle">
+ Configuration Error
+ </Entry>
+ <Entry key="MessageBox_YesButton">
+ Yes
+ </Entry>
+ <Entry key="Notification_AboutTooltip">
+ Information about SEB
+ </Entry>
+ <Entry key="Notification_LogTooltip">
+ Application Log
+ </Entry>
+ <Entry key="OperationStatus_CloseRuntimeConnection">
+ Closing runtime connection
+ </Entry>
+ <Entry key="OperationStatus_EmptyClipboard">
+ Emptying clipboard
+ </Entry>
+ <Entry key="OperationStatus_FinalizeServiceSession">
+ Finalizing service session
+ </Entry>
+ <Entry key="OperationStatus_InitializeBrowser">
+ Initializing browser
+ </Entry>
+ <Entry key="OperationStatus_InitializeConfiguration">
+ Initializing application configuration
+ </Entry>
+ <Entry key="OperationStatus_InitializeKioskMode">
+ Initializing kiosk mode
+ </Entry>
+ <Entry key="OperationStatus_InitializeProcessMonitoring">
+ Initializing process monitoring
+ </Entry>
+ <Entry key="OperationStatus_InitializeRuntimeConnection">
+ Initializing runtime connection
+ </Entry>
+ <Entry key="OperationStatus_InitializeServiceSession">
+ Initializing service session
+ </Entry>
+ <Entry key="OperationStatus_InitializeSession">
+ Initializing new session
+ </Entry>
+ <Entry key="OperationStatus_InitializeShell">
+ Initializing user interface
+ </Entry>
+ <Entry key="OperationStatus_InitializeWindowMonitoring">
+ Initializing window monitoring
+ </Entry>
+ <Entry key="OperationStatus_InitializeWorkingArea">
+ Initializing working area
+ </Entry>
+ <Entry key="OperationStatus_RestartCommunicationHost">
+ Restarting communication host
+ </Entry>
+ <Entry key="OperationStatus_RestoreWorkingArea">
+ Restoring working area
+ </Entry>
+ <Entry key="OperationStatus_RevertKioskMode">
+ Reverting kiosk mode
+ </Entry>
+ <Entry key="OperationStatus_StartClient">
+ Starting client
+ </Entry>
+ <Entry key="OperationStatus_StartCommunicationHost">
+ Starting communication host
+ </Entry>
+ <Entry key="OperationStatus_StartKeyboardInterception">
+ Starting keyboard interception
+ </Entry>
+ <Entry key="OperationStatus_StartMouseInterception">
+ Starting mouse interception
+ </Entry>
+ <Entry key="OperationStatus_StopClient">
+ Stopping client
+ </Entry>
+ <Entry key="OperationStatus_StopCommunicationHost">
+ Stopping communication host
+ </Entry>
+ <Entry key="OperationStatus_StopKeyboardInterception">
+ Stopping keyboard interception
+ </Entry>
+ <Entry key="OperationStatus_StopMouseInterception">
+ Stopping mouse interception
+ </Entry>
+ <Entry key="OperationStatus_StopProcessMonitoring">
+ Stopping process monitoring
+ </Entry>
+ <Entry key="OperationStatus_StopWindowMonitoring">
+ Stopping window monitoring
+ </Entry>
+ <Entry key="OperationStatus_TerminateBrowser">
+ Terminating browser
+ </Entry>
+ <Entry key="OperationStatus_TerminateShell">
+ Terminating user interface
+ </Entry>
+ <Entry key="OperationStatus_WaitExplorerStartup">
+ Waiting for Windows explorer to start up
+ </Entry>
+ <Entry key="OperationStatus_WaitExplorerTermination">
+ Waiting for Windows explorer to shut down
+ </Entry>
+ <Entry key="OperationStatus_WaitRuntimeDisconnection">
+ Waiting for the runtime to disconnect
+ </Entry>
+ <Entry key="PasswordDialog_Cancel">
+ Cancel
+ </Entry>
+ <Entry key="PasswordDialog_Confirm">
+ Confirm
+ </Entry>
+ <Entry key="PasswordDialog_LocalAdminPasswordRequired">
+ Please enter the administrator password for the local client configuration:
+ </Entry>
+ <Entry key="PasswordDialog_LocalAdminPasswordRequiredTitle">
+ Administrator Password Required
+ </Entry>
+ <Entry key="PasswordDialog_LocalSettingsPasswordRequired">
+ Please enter the settings password for the local client configuration:
+ </Entry>
+ <Entry key="PasswordDialog_LocalSettingsPasswordRequiredTitle">
+ Settings Password Required
+ </Entry>
+ <Entry key="PasswordDialog_QuitPasswordRequired">
+ Please enter the quit password in order to terminate the application:
+ </Entry>
+ <Entry key="PasswordDialog_QuitPasswordRequiredTitle">
+ Quit Password Required
+ </Entry>
+ <Entry key="PasswordDialog_SettingsPasswordRequired">
+ Please enter the settings password for the selected application configuration:
+ </Entry>
+ <Entry key="PasswordDialog_SettingsPasswordRequiredTitle">
+ Settings Password Required
+ </Entry>
+ <Entry key="RuntimeWindow_ApplicationRunning">
+ The application is running.
+ </Entry>
+ <Entry key="Shell_QuitButton">
+ Terminate Session
+ </Entry>
+ <Entry key="SystemControl_BatteryCharging">
+ Plugged in, charging... (%%CHARGE%%%)
+ </Entry>
+ <Entry key="SystemControl_BatteryCharged">
+ Fully charged (%%CHARGE%%%)
+ </Entry>
+ <Entry key="SystemControl_BatteryChargeCriticalWarning">
+ The battery charge is critically low. Please connect your computer to a power supply!
+ </Entry>
+ <Entry key="SystemControl_BatteryChargeLowInfo">
+ The battery charge is getting low. Consider connecting your computer to a power supply in time...
+ </Entry>
+ <Entry key="SystemControl_BatteryRemainingCharge">
+ %%HOURS%%h %%MINUTES%%min remaining (%%CHARGE%%%)
+ </Entry>
+ <Entry key="SystemControl_KeyboardLayoutTooltip">
+ The current keyboard layout is "%%LAYOUT%%"
+ </Entry>
+ <Entry key="SystemControl_WirelessConnected">
+ Connected to "%%NAME%%"
+ </Entry>
+ <Entry key="SystemControl_WirelessDisconnected">
+ Disconnected
+ </Entry>
+ <Entry key="SystemControl_WirelessNotAvailable">
+ No wireless network adapter available or turned on
+ </Entry>
+ <Entry key="Version">
+ Version
+ </Entry>
</Text>
\ No newline at end of file
diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs
index fb6f6c76..94109151 100644
--- a/SafeExamBrowser.Runtime/CompositionRoot.cs
+++ b/SafeExamBrowser.Runtime/CompositionRoot.cs
@@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
using System.Reflection;
using SafeExamBrowser.Communication.Hosts;
@@ -106,7 +107,7 @@ namespace SafeExamBrowser.Runtime
internal void LogStartupInformation()
{
- logger.Log($"/* {appConfig.ProgramTitle}, Version {appConfig.ProgramVersion}");
+ logger.Log($"/* {appConfig.ProgramTitle}, Version {appConfig.ProgramInformationalVersion}, Build {appConfig.ProgramBuildVersion}");
logger.Log($"/* {appConfig.ProgramCopyright}");
logger.Log($"/* ");
logger.Log($"/* Please visit https://www.github.com/SafeExamBrowser for more information.");
@@ -125,6 +126,7 @@ namespace SafeExamBrowser.Runtime
private void InitializeConfiguration()
{
var executable = Assembly.GetExecutingAssembly();
+ var programBuild = FileVersionInfo.GetVersionInfo(executable.Location).FileVersion;
var programCopyright = executable.GetCustomAttribute<AssemblyCopyrightAttribute>().Copyright;
var programTitle = executable.GetCustomAttribute<AssemblyTitleAttribute>().Title;
var programVersion = executable.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
@@ -143,6 +145,7 @@ namespace SafeExamBrowser.Runtime
new HashAlgorithm(),
repositoryLogger,
executable.Location,
+ programBuild,
programCopyright,
programTitle,
programVersion);
diff --git a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml
index 7383e522..907883c5 100644
--- a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml
@@ -17,7 +17,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/SplashScreen.png" Margin="0,5,0,0" />
- <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" Foreground="Gray" Margin="25,75,100,10" TextWrapping="Wrap" />
+ <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" FontSize="10" Foreground="DimGray" Margin="25,70,100,10" TextWrapping="Wrap" />
<ScrollViewer Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Auto">
<TextBlock x:Name="MainText" Margin="10" FontSize="10" TextWrapping="Wrap">
This application is subject to the terms of the Mozilla Public License, version 2.0. If a copy of the MPL was not
diff --git a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs
index 82e2dbd4..3b6d8e6b 100644
--- a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Documents;
+using System.Windows.Media;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.UserInterface.Windows;
@@ -44,10 +45,12 @@ namespace SafeExamBrowser.UserInterface.Desktop
private void InitializeAboutWindow()
{
Closing += (o, args) => closing?.Invoke();
- VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Version)} {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ 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 });
VersionInfo.Inlines.Add(new LineBreak());
VersionInfo.Inlines.Add(new LineBreak());
- VersionInfo.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
+ VersionInfo.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10, Foreground = Brushes.Gray });
}
}
}
diff --git a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml
index 8859c749..19825e6d 100644
--- a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml
@@ -46,7 +46,7 @@
<ColumnDefinition Width="400" />
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Grid.ColumnSpan="2" Margin="-25,0,0,0" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/SplashScreen.png" />
- <TextBlock x:Name="InfoTextBlock" Grid.Column="1" Foreground="Gray" Margin="10,75,225,10" TextWrapping="Wrap" />
+ <TextBlock x:Name="InfoTextBlock" Grid.Column="1" FontSize="10" Foreground="DimGray" Margin="10,70,225,10" TextWrapping="Wrap" />
</Grid>
<ProgressBar x:Name="ProgressBar" Grid.Row="1" Background="WhiteSmoke" BorderThickness="0" Foreground="DodgerBlue"
IsIndeterminate="{Binding IsIndeterminate}" Maximum="{Binding MaxProgress}" Value="{Binding CurrentProgress}"
diff --git a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs
index c80b2876..5baa3e4d 100644
--- a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Documents;
+using System.Windows.Media;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.Logging;
@@ -130,12 +131,14 @@ namespace SafeExamBrowser.UserInterface.Desktop
private void InitializeRuntimeWindow()
{
- Title = $"{appConfig.ProgramTitle} - Version {appConfig.ProgramVersion}";
+ Title = $"{appConfig.ProgramTitle} - Version {appConfig.ProgramInformationalVersion}";
- InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramInformationalVersion}") { FontSize = 12 });
+ InfoTextBlock.Inlines.Add(new LineBreak());
+ InfoTextBlock.Inlines.Add(new Run($"Build {appConfig.ProgramBuildVersion}") { FontSize = 8, Foreground = Brushes.Gray });
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new LineBreak());
- InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
+ InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10, Foreground = Brushes.Gray });
model = new RuntimeWindowViewModel(LogTextBlock);
AnimatedBorder.DataContext = model;
diff --git a/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs
index 13e4446a..c6cd1444 100644
--- a/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Documents;
+using System.Windows.Media;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.UserInterface.Windows;
@@ -122,7 +123,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
{
if (appConfig != null)
{
- InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramInformationalVersion}") { Foreground = Brushes.DimGray });
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
diff --git a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml
index c2e552c7..8feb78f2 100644
--- a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml
@@ -17,7 +17,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/SplashScreen.png" Margin="0,5,0,0" />
- <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" Foreground="Gray" Margin="25,75,100,10" TextWrapping="Wrap" />
+ <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" FontSize="10" Foreground="DimGray" Margin="25,70,100,10" TextWrapping="Wrap" />
<ScrollViewer Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Auto">
<TextBlock x:Name="MainText" Margin="10" FontSize="10" TextWrapping="Wrap">
This application is subject to the terms of the Mozilla Public License, version 2.0. If a copy of the MPL was not
diff --git a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs
index bc3f2420..1bb2e79b 100644
--- a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Documents;
+using System.Windows.Media;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.UserInterface.Windows;
@@ -44,10 +45,12 @@ namespace SafeExamBrowser.UserInterface.Mobile
private void InitializeAboutWindow()
{
Closing += (o, args) => closing?.Invoke();
- VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Version)} {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ 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 });
VersionInfo.Inlines.Add(new LineBreak());
VersionInfo.Inlines.Add(new LineBreak());
- VersionInfo.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
+ VersionInfo.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10, Foreground = Brushes.Gray });
}
}
}
diff --git a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml
index 7bc9534f..8ac480da 100644
--- a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml
@@ -46,7 +46,7 @@
<ColumnDefinition Width="400" />
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Grid.ColumnSpan="2" Margin="-25,0,0,0" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/SplashScreen.png" />
- <TextBlock x:Name="InfoTextBlock" Grid.Column="1" Foreground="Gray" Margin="10,75,225,10" TextWrapping="Wrap" />
+ <TextBlock x:Name="InfoTextBlock" Grid.Column="1" FontSize="10" Foreground="DimGray" Margin="10,70,225,10" TextWrapping="Wrap" />
</Grid>
<ProgressBar x:Name="ProgressBar" Grid.Row="1" Background="WhiteSmoke" BorderThickness="0" Foreground="DodgerBlue"
IsIndeterminate="{Binding IsIndeterminate}" Maximum="{Binding MaxProgress}" Value="{Binding CurrentProgress}"
diff --git a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs
index b59cf751..7831f1df 100644
--- a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Documents;
+using System.Windows.Media;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.Logging;
@@ -130,12 +131,14 @@ namespace SafeExamBrowser.UserInterface.Mobile
private void InitializeRuntimeWindow()
{
- Title = $"{appConfig.ProgramTitle} - Version {appConfig.ProgramVersion}";
+ Title = $"{appConfig.ProgramTitle} - Version {appConfig.ProgramInformationalVersion}";
- InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramInformationalVersion}") { FontSize = 12 });
+ InfoTextBlock.Inlines.Add(new LineBreak());
+ InfoTextBlock.Inlines.Add(new Run($"Build {appConfig.ProgramBuildVersion}") { FontSize = 8, Foreground = Brushes.Gray });
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new LineBreak());
- InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
+ InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10, Foreground = Brushes.Gray });
model = new RuntimeWindowViewModel(LogTextBlock);
AnimatedBorder.DataContext = model;
diff --git a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs
index d1a108ff..d86ea17a 100644
--- a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Documents;
+using System.Windows.Media;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.UserInterface.Windows;
@@ -122,7 +123,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
{
if (appConfig != null)
{
- InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramInformationalVersion}") { Foreground = Brushes.DimGray });
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 12 });