diff --git a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs index 7ff5eebe..7113d117 100644 --- a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs +++ b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs @@ -170,7 +170,7 @@ namespace SafeExamBrowser.Client.UnitTests //[TestCleanup] //public void Cleanup() //{ - // // TODO sut.Stop(); + // // sut.Stop(); //} } } diff --git a/SafeExamBrowser.Client/Operations/BrowserOperation.cs b/SafeExamBrowser.Client/Operations/BrowserOperation.cs index c0bb2cc6..c78325c7 100644 --- a/SafeExamBrowser.Client/Operations/BrowserOperation.cs +++ b/SafeExamBrowser.Client/Operations/BrowserOperation.cs @@ -45,7 +45,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing browser..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeBrowser); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeBrowser); var browserButton = uiFactory.CreateApplicationButton(browserInfo); @@ -65,7 +65,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Terminating browser..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_TerminateBrowser); + StatusChanged?.Invoke(TextKey.OperationStatus_TerminateBrowser); browserController.Terminate(); } diff --git a/SafeExamBrowser.Client/Operations/ClientHostDisconnectionOperation.cs b/SafeExamBrowser.Client/Operations/ClientHostDisconnectionOperation.cs index 06589f0a..3fac12e5 100644 --- a/SafeExamBrowser.Client/Operations/ClientHostDisconnectionOperation.cs +++ b/SafeExamBrowser.Client/Operations/ClientHostDisconnectionOperation.cs @@ -11,6 +11,7 @@ using SafeExamBrowser.Contracts.Communication.Events; using SafeExamBrowser.Contracts.Communication.Hosts; using SafeExamBrowser.Contracts.Core.OperationModel; using SafeExamBrowser.Contracts.Core.OperationModel.Events; +using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; namespace SafeExamBrowser.Client.Operations @@ -26,7 +27,7 @@ namespace SafeExamBrowser.Client.Operations private int timeout_ms; public event ActionRequiredEventHandler ActionRequired { add { } remove { } } - public event StatusChangedEventHandler StatusChanged { add { } remove { } } + public event StatusChangedEventHandler StatusChanged; public ClientHostDisconnectionOperation(IClientHost clientHost, ILogger logger, int timeout_ms) { @@ -51,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations var disconnectedEvent = new AutoResetEvent(false); var disconnectedEventHandler = new CommunicationEventHandler(() => disconnectedEvent.Set()); - // TODO: Update status! + StatusChanged?.Invoke(TextKey.OperationStatus_WaitRuntimeDisconnection); clientHost.RuntimeDisconnected += disconnectedEventHandler; diff --git a/SafeExamBrowser.Client/Operations/ClipboardOperation.cs b/SafeExamBrowser.Client/Operations/ClipboardOperation.cs index a2b4cebe..0bf3a20a 100644 --- a/SafeExamBrowser.Client/Operations/ClipboardOperation.cs +++ b/SafeExamBrowser.Client/Operations/ClipboardOperation.cs @@ -48,7 +48,7 @@ namespace SafeExamBrowser.Client.Operations private void EmptyClipboard() { logger.Info("Emptying clipboard..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_EmptyClipboard); + StatusChanged?.Invoke(TextKey.OperationStatus_EmptyClipboard); nativeMethods.EmptyClipboard(); } diff --git a/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs index ee1e6539..091baeec 100644 --- a/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs +++ b/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs @@ -35,7 +35,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing application configuration..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeConfiguration); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeConfiguration); try { diff --git a/SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs b/SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs index 972bd2f9..a2c63c83 100644 --- a/SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs @@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing working area..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeWorkingArea); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeWorkingArea); displayMonitor.PreventSleepMode(); displayMonitor.InitializePrimaryDisplay(taskbar.GetAbsoluteHeight()); @@ -51,7 +51,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Restoring working area..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_RestoreWorkingArea); + StatusChanged?.Invoke(TextKey.OperationStatus_RestoreWorkingArea); displayMonitor.StopMonitoringDisplayChanges(); displayMonitor.ResetPrimaryDisplay(); diff --git a/SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs b/SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs index ffd5caa7..e4f60d36 100644 --- a/SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs +++ b/SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs @@ -37,7 +37,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Starting keyboard interception..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StartKeyboardInterception); + StatusChanged?.Invoke(TextKey.OperationStatus_StartKeyboardInterception); nativeMethods.RegisterKeyboardHook(keyboardInterceptor); @@ -52,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Stopping keyboard interception..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopKeyboardInterception); + StatusChanged?.Invoke(TextKey.OperationStatus_StopKeyboardInterception); nativeMethods.DeregisterKeyboardHook(keyboardInterceptor); } diff --git a/SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs b/SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs index 1692e304..bfd9e4df 100644 --- a/SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs +++ b/SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs @@ -37,7 +37,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Starting mouse interception..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StartMouseInterception); + StatusChanged?.Invoke(TextKey.OperationStatus_StartMouseInterception); nativeMethods.RegisterMouseHook(mouseInterceptor); @@ -52,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Stopping mouse interception..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopMouseInterception); + StatusChanged?.Invoke(TextKey.OperationStatus_StopMouseInterception); nativeMethods.DeregisterMouseHook(mouseInterceptor); } diff --git a/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs b/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs index 9d534f83..f6210971 100644 --- a/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs @@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing process monitoring..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeProcessMonitoring); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeProcessMonitoring); if (settings.KioskMode == KioskMode.DisableExplorerShell) { @@ -52,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Stopping process monitoring..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopProcessMonitoring); + StatusChanged?.Invoke(TextKey.OperationStatus_StopProcessMonitoring); if (settings.KioskMode == KioskMode.DisableExplorerShell) { diff --git a/SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs b/SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs index 99adb8a6..9c8f95c8 100644 --- a/SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs +++ b/SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs @@ -35,7 +35,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing runtime connection..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeRuntimeConnection); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeRuntimeConnection); connected = runtime.Connect(token); @@ -59,7 +59,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Closing runtime connection..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_CloseRuntimeConnection); + StatusChanged?.Invoke(TextKey.OperationStatus_CloseRuntimeConnection); if (connected) { diff --git a/SafeExamBrowser.Client/Operations/TaskbarOperation.cs b/SafeExamBrowser.Client/Operations/TaskbarOperation.cs index a3375ada..4d964eed 100644 --- a/SafeExamBrowser.Client/Operations/TaskbarOperation.cs +++ b/SafeExamBrowser.Client/Operations/TaskbarOperation.cs @@ -65,7 +65,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing taskbar..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeTaskbar); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeTaskbar); if (settings.AllowApplicationLog) { @@ -98,7 +98,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Terminating taskbar..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_TerminateTaskbar); + StatusChanged?.Invoke(TextKey.OperationStatus_TerminateTaskbar); if (settings.AllowApplicationLog) { diff --git a/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs b/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs index 3308a9d0..5b7e4e5d 100644 --- a/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs @@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Operations public OperationResult Perform() { logger.Info("Initializing window monitoring..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeWindowMonitoring); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeWindowMonitoring); if (kioskMode == KioskMode.DisableExplorerShell) { @@ -57,7 +57,7 @@ namespace SafeExamBrowser.Client.Operations public void Revert() { logger.Info("Stopping window monitoring..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopWindowMonitoring); + StatusChanged?.Invoke(TextKey.OperationStatus_StopWindowMonitoring); if (kioskMode != KioskMode.None) { diff --git a/SafeExamBrowser.Communication/Proxies/ServiceProxy.cs b/SafeExamBrowser.Communication/Proxies/ServiceProxy.cs index 9f792ef3..47b3c1d7 100644 --- a/SafeExamBrowser.Communication/Proxies/ServiceProxy.cs +++ b/SafeExamBrowser.Communication/Proxies/ServiceProxy.cs @@ -51,7 +51,7 @@ namespace SafeExamBrowser.Communication.Proxies return new CommunicationResult(true); } - // TODO: Implement service communication + // Implement service communication... // Send(new StartSessionMessage { Id = sessionId, Settings = settings }); throw new NotImplementedException(); @@ -64,7 +64,7 @@ namespace SafeExamBrowser.Communication.Proxies return new CommunicationResult(true); } - // TODO: Implement service communication + // Implement service communication... // Send(new StopSessionMessage { SessionId = sessionId }); throw new NotImplementedException(); diff --git a/SafeExamBrowser.Contracts/I18n/TextKey.cs b/SafeExamBrowser.Contracts/I18n/TextKey.cs index 4ea88db8..33121f19 100644 --- a/SafeExamBrowser.Contracts/I18n/TextKey.cs +++ b/SafeExamBrowser.Contracts/I18n/TextKey.cs @@ -9,7 +9,7 @@ namespace SafeExamBrowser.Contracts.I18n { /// - /// Defines all text elements of the user interface. Use the pattern "Location_Description" to allow for a better overview over all + /// Defines all text elements of the user interface. Use the pattern "LogicalGroup_Description" to allow for a better overview over all /// keys and their usage (where applicable). /// public enum TextKey @@ -44,46 +44,46 @@ namespace SafeExamBrowser.Contracts.I18n MessageBox_StartupErrorTitle, Notification_AboutTooltip, Notification_LogTooltip, + OperationStatus_CloseRuntimeConnection, + OperationStatus_EmptyClipboard, + OperationStatus_FinalizeServiceSession, + OperationStatus_InitializeBrowser, + OperationStatus_InitializeConfiguration, + OperationStatus_InitializeKioskMode, + OperationStatus_InitializeProcessMonitoring, + OperationStatus_InitializeRuntimeConnection, + OperationStatus_InitializeServiceSession, + OperationStatus_InitializeTaskbar, + OperationStatus_InitializeWindowMonitoring, + OperationStatus_InitializeWorkingArea, + OperationStatus_RestartCommunicationHost, + OperationStatus_RestoreWorkingArea, + OperationStatus_RevertKioskMode, + OperationStatus_ShutdownProcedure, + OperationStatus_StartClient, + OperationStatus_StartCommunicationHost, + OperationStatus_StartEventHandling, + OperationStatus_StartKeyboardInterception, + OperationStatus_StartMouseInterception, + OperationStatus_InitializeSession, + OperationStatus_StopClient, + OperationStatus_StopCommunicationHost, + OperationStatus_StopEventHandling, + OperationStatus_StopKeyboardInterception, + OperationStatus_StopMouseInterception, + OperationStatus_StopProcessMonitoring, + OperationStatus_StopWindowMonitoring, + OperationStatus_TerminateBrowser, + OperationStatus_TerminateTaskbar, + OperationStatus_WaitExplorerStartup, + OperationStatus_WaitExplorerTermination, + OperationStatus_WaitRuntimeDisconnection, PasswordDialog_AdminPasswordRequired, PasswordDialog_AdminPasswordRequiredTitle, PasswordDialog_Cancel, PasswordDialog_Confirm, PasswordDialog_SettingsPasswordRequired, PasswordDialog_SettingsPasswordRequiredTitle, - // TODO: Rename these... - ProgressIndicator_CloseRuntimeConnection, - ProgressIndicator_EmptyClipboard, - ProgressIndicator_FinalizeServiceSession, - ProgressIndicator_InitializeBrowser, - ProgressIndicator_InitializeConfiguration, - ProgressIndicator_InitializeKioskMode, - ProgressIndicator_InitializeProcessMonitoring, - ProgressIndicator_InitializeRuntimeConnection, - ProgressIndicator_InitializeServiceSession, - ProgressIndicator_InitializeTaskbar, - ProgressIndicator_InitializeWindowMonitoring, - ProgressIndicator_InitializeWorkingArea, - ProgressIndicator_RestartCommunicationHost, - ProgressIndicator_RestoreWorkingArea, - ProgressIndicator_RevertKioskMode, - ProgressIndicator_ShutdownProcedure, - ProgressIndicator_StartClient, - ProgressIndicator_StartCommunicationHost, - ProgressIndicator_StartEventHandling, - ProgressIndicator_StartKeyboardInterception, - ProgressIndicator_StartMouseInterception, - ProgressIndicator_InitializeSession, - ProgressIndicator_StopClient, - ProgressIndicator_StopCommunicationHost, - ProgressIndicator_StopEventHandling, - ProgressIndicator_StopKeyboardInterception, - ProgressIndicator_StopMouseInterception, - ProgressIndicator_StopProcessMonitoring, - ProgressIndicator_StopWindowMonitoring, - ProgressIndicator_TerminateBrowser, - ProgressIndicator_TerminateTaskbar, - ProgressIndicator_WaitExplorerStartup, - ProgressIndicator_WaitExplorerTermination, RuntimeWindow_ApplicationRunning, SystemControl_BatteryCharged, SystemControl_BatteryCharging, diff --git a/SafeExamBrowser.Core/Operations/CommunicationHostOperation.cs b/SafeExamBrowser.Core/Operations/CommunicationHostOperation.cs index 81f49400..5ab31a19 100644 --- a/SafeExamBrowser.Core/Operations/CommunicationHostOperation.cs +++ b/SafeExamBrowser.Core/Operations/CommunicationHostOperation.cs @@ -35,7 +35,7 @@ namespace SafeExamBrowser.Core.Operations public OperationResult Perform() { logger.Info("Starting communication host..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StartCommunicationHost); + StatusChanged?.Invoke(TextKey.OperationStatus_StartCommunicationHost); host.Start(); @@ -47,7 +47,7 @@ namespace SafeExamBrowser.Core.Operations if (!host.IsRunning) { logger.Info("Restarting communication host..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_RestartCommunicationHost); + StatusChanged?.Invoke(TextKey.OperationStatus_RestartCommunicationHost); host.Stop(); host.Start(); @@ -59,7 +59,7 @@ namespace SafeExamBrowser.Core.Operations public void Revert() { logger.Info("Stopping communication host..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopCommunicationHost); + StatusChanged?.Invoke(TextKey.OperationStatus_StopCommunicationHost); host.Stop(); } diff --git a/SafeExamBrowser.I18n/Text.xml b/SafeExamBrowser.I18n/Text.xml index 14c1426e..b7b8897a 100644 --- a/SafeExamBrowser.I18n/Text.xml +++ b/SafeExamBrowser.I18n/Text.xml @@ -84,6 +84,108 @@ Application Log + + Closing runtime connection + + + Emptying clipboard + + + Finalizing service session + + + Initializing browser + + + Initializing application configuration + + + Initializing kiosk mode + + + Initializing process monitoring + + + Initializing runtime connection + + + Initializing service session + + + Initializing new session + + + Initializing taskbar + + + Initializing window monitoring + + + Initializing working area + + + Restarting communication host + + + Restoring working area + + + Reverting kiosk mode + + + Initiating shutdown procedure + + + Starting client + + + Starting communication host + + + Starting event handling + + + Starting keyboard interception + + + Starting mouse interception + + + Stopping client + + + Stopping communication host + + + Stopping event handling + + + Stopping keyboard interception + + + Stopping mouse interception + + + Stopping process monitoring + + + Stopping window monitoring + + + Terminating browser + + + Terminating taskbar + + + Waiting for Windows explorer to start up + + + Waiting for Windows explorer to shut down + + + Waiting for the runtime to disconnect + Please enter the administrator password for the application configuration: @@ -102,105 +204,6 @@ Settings Password Required - - Closing runtime connection - - - Emptying clipboard - - - Finalizing service session - - - Initializing browser - - - Initializing application configuration - - - Initializing kiosk mode - - - Initializing process monitoring - - - Initializing runtime connection - - - Initializing service session - - - Initializing new session - - - Initializing taskbar - - - Initializing window monitoring - - - Initializing working area - - - Restarting communication host - - - Restoring working area - - - Reverting kiosk mode - - - Initiating shutdown procedure - - - Starting client - - - Starting communication host - - - Starting event handling - - - Starting keyboard interception - - - Starting mouse interception - - - Stopping client - - - Stopping communication host - - - Stopping event handling - - - Stopping keyboard interception - - - Stopping mouse interception - - - Stopping process monitoring - - - Stopping window monitoring - - - Terminating browser - - - Terminating taskbar - - - Waiting for Windows explorer to start up - - - Waiting for Windows explorer to shut down - The application is running. diff --git a/SafeExamBrowser.Runtime/Operations/ClientOperation.cs b/SafeExamBrowser.Runtime/Operations/ClientOperation.cs index ad1fa6e6..490b6a64 100644 --- a/SafeExamBrowser.Runtime/Operations/ClientOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ClientOperation.cs @@ -63,7 +63,7 @@ namespace SafeExamBrowser.Runtime.Operations public virtual OperationResult Perform() { - StatusChanged?.Invoke(TextKey.ProgressIndicator_StartClient); + StatusChanged?.Invoke(TextKey.OperationStatus_StartClient); var success = TryStartClient(); @@ -88,7 +88,7 @@ namespace SafeExamBrowser.Runtime.Operations { if (ClientProcess != null && !ClientProcess.HasTerminated) { - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopClient); + StatusChanged?.Invoke(TextKey.OperationStatus_StopClient); TryStopClient(); } } diff --git a/SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs b/SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs index 126045e5..7a67ba5b 100644 --- a/SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs @@ -43,7 +43,7 @@ namespace SafeExamBrowser.Runtime.Operations if (ClientProcess != null && !ClientProcess.HasTerminated) { - StatusChanged?.Invoke(TextKey.ProgressIndicator_StopClient); + StatusChanged?.Invoke(TextKey.OperationStatus_StopClient); success = TryStopClient(); } diff --git a/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs index 52b25fce..1ed1b7ea 100644 --- a/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs @@ -47,7 +47,7 @@ namespace SafeExamBrowser.Runtime.Operations public OperationResult Perform() { logger.Info("Initializing application configuration..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeConfiguration); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeConfiguration); var isValidUri = TryInitializeSettingsUri(out Uri uri); @@ -72,7 +72,7 @@ namespace SafeExamBrowser.Runtime.Operations public OperationResult Repeat() { logger.Info("Initializing new application configuration..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeConfiguration); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeConfiguration); var isValidUri = TryValidateSettingsUri(configuration.ReconfigurationFilePath, out Uri uri); diff --git a/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs b/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs index 159aaa77..5f5fb871 100644 --- a/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs @@ -49,7 +49,7 @@ namespace SafeExamBrowser.Runtime.Operations kioskMode = configuration.CurrentSettings.KioskMode; logger.Info($"Initializing kiosk mode '{kioskMode}'..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeKioskMode); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeKioskMode); switch (kioskMode) { @@ -87,7 +87,7 @@ namespace SafeExamBrowser.Runtime.Operations public void Revert() { logger.Info($"Reverting kiosk mode '{kioskMode}'..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_RevertKioskMode); + StatusChanged?.Invoke(TextKey.OperationStatus_RevertKioskMode); switch (kioskMode) { @@ -143,13 +143,13 @@ namespace SafeExamBrowser.Runtime.Operations private void TerminateExplorerShell() { - StatusChanged?.Invoke(TextKey.ProgressIndicator_WaitExplorerTermination); + StatusChanged?.Invoke(TextKey.OperationStatus_WaitExplorerTermination); explorerShell.Terminate(); } private void RestartExplorerShell() { - StatusChanged?.Invoke(TextKey.ProgressIndicator_WaitExplorerStartup); + StatusChanged?.Invoke(TextKey.OperationStatus_WaitExplorerStartup); explorerShell.Start(); } } diff --git a/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs index 70918297..85513736 100644 --- a/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs @@ -36,7 +36,7 @@ namespace SafeExamBrowser.Runtime.Operations public OperationResult Perform() { logger.Info($"Initializing service session..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeServiceSession); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeServiceSession); mandatory = configuration.CurrentSettings.ServicePolicy == ServicePolicy.Mandatory; connected = service.Connect(); @@ -74,7 +74,7 @@ namespace SafeExamBrowser.Runtime.Operations public void Revert() { logger.Info("Finalizing service session..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_FinalizeServiceSession); + StatusChanged?.Invoke(TextKey.OperationStatus_FinalizeServiceSession); if (connected) { diff --git a/SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs b/SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs index aaecfd9b..d71180fe 100644 --- a/SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs @@ -53,7 +53,7 @@ namespace SafeExamBrowser.Runtime.Operations private void InitializeSessionConfiguration() { logger.Info("Initializing new session configuration..."); - StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeSession); + StatusChanged?.Invoke(TextKey.OperationStatus_InitializeSession); configuration.InitializeSessionConfiguration(); runtimeHost.StartupToken = configuration.CurrentSession.StartupToken;