zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-219: Renamed text keys for operations.

Browse source
This commit is contained in:
dbuechel 2018-02-02 09:30:41 +01:00
parent 5b57734406
commit c10e141e7f
14 changed files with 124 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs
View file

@ -44,7 +44,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Initializing browser..."); logger.Info("Initializing browser...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeBrowser, true); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeBrowser, true);
var browserButton = uiFactory.CreateApplicationButton(browserInfo); var browserButton = uiFactory.CreateApplicationButton(browserInfo);
@ -62,7 +62,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Terminating browser..."); logger.Info("Terminating browser...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_TerminateBrowser, true); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_TerminateBrowser, true);
browserController.Terminate(); browserController.Terminate();
} }

4
SafeExamBrowser.Client/Behaviour/Operations/ClientControllerOperation.cs
View file

@ -31,7 +31,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Starting event handling..."); logger.Info("Starting event handling...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StartEventHandling); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StartEventHandling);
controller.Start(); controller.Start();
} }
@ -44,7 +44,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Stopping event handling..."); logger.Info("Stopping event handling...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StopEventHandling); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StopEventHandling);
controller.Stop(); controller.Stop();
} }

2
SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs
View file

@ -46,7 +46,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
private void EmptyClipboard() private void EmptyClipboard()
{ {
logger.Info("Emptying clipboard..."); logger.Info("Emptying clipboard...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_EmptyClipboard); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_EmptyClipboard);
nativeMethods.EmptyClipboard(); nativeMethods.EmptyClipboard();
} }

4
SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs
View file

@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Initializing working area..."); logger.Info("Initializing working area...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeWorkingArea); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeWorkingArea);
displayMonitor.PreventSleepMode(); displayMonitor.PreventSleepMode();
displayMonitor.InitializePrimaryDisplay(taskbar.GetAbsoluteHeight()); displayMonitor.InitializePrimaryDisplay(taskbar.GetAbsoluteHeight());
@ -49,7 +49,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Restoring working area..."); logger.Info("Restoring working area...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_RestoreWorkingArea); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_RestoreWorkingArea);
displayMonitor.StopMonitoringDisplayChanges(); displayMonitor.StopMonitoringDisplayChanges();
displayMonitor.ResetPrimaryDisplay(); displayMonitor.ResetPrimaryDisplay();

4
SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs
View file

@ -37,7 +37,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Starting keyboard interception..."); logger.Info("Starting keyboard interception...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StartKeyboardInterception); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StartKeyboardInterception);
nativeMethods.RegisterKeyboardHook(keyboardInterceptor); nativeMethods.RegisterKeyboardHook(keyboardInterceptor);
} }
@ -50,7 +50,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Stopping keyboard interception..."); logger.Info("Stopping keyboard interception...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StopKeyboardInterception); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StopKeyboardInterception);
nativeMethods.DeregisterKeyboardHook(keyboardInterceptor); nativeMethods.DeregisterKeyboardHook(keyboardInterceptor);
} }

4
SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs
View file

@ -37,7 +37,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Starting mouse interception..."); logger.Info("Starting mouse interception...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StartMouseInterception); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StartMouseInterception);
nativeMethods.RegisterMouseHook(mouseInterceptor); nativeMethods.RegisterMouseHook(mouseInterceptor);
} }
@ -50,7 +50,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Stopping mouse interception..."); logger.Info("Stopping mouse interception...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StopMouseInterception); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StopMouseInterception);
nativeMethods.DeregisterMouseHook(mouseInterceptor); nativeMethods.DeregisterMouseHook(mouseInterceptor);
} }

8
SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs
View file

@ -31,12 +31,12 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Initializing process monitoring..."); logger.Info("Initializing process monitoring...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_WaitExplorerTermination, true); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_WaitExplorerTermination, true);
processMonitor.CloseExplorerShell(); processMonitor.CloseExplorerShell();
processMonitor.StartMonitoringExplorer(); processMonitor.StartMonitoringExplorer();
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeProcessMonitoring); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeProcessMonitoring);
// TODO // TODO
} }
@ -49,11 +49,11 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Stopping process monitoring..."); logger.Info("Stopping process monitoring...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StopProcessMonitoring); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StopProcessMonitoring);
// TODO // TODO
ProgressIndicator?.UpdateText(TextKey.SplashScreen_WaitExplorerStartup, true); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_WaitExplorerStartup, true);
processMonitor.StopMonitoringExplorer(); processMonitor.StopMonitoringExplorer();
processMonitor.StartExplorerShell(); processMonitor.StartExplorerShell();

4
SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs
View file

@ -60,7 +60,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Initializing taskbar..."); logger.Info("Initializing taskbar...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeTaskbar); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeTaskbar);
if (settings.AllowApplicationLog) if (settings.AllowApplicationLog)
{ {
@ -91,7 +91,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Terminating taskbar..."); logger.Info("Terminating taskbar...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_TerminateTaskbar); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_TerminateTaskbar);
if (settings.AllowApplicationLog) if (settings.AllowApplicationLog)
{ {

4
SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs
View file

@ -31,7 +31,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Initializing window monitoring..."); logger.Info("Initializing window monitoring...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeWindowMonitoring); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeWindowMonitoring);
windowMonitor.HideAllWindows(); windowMonitor.HideAllWindows();
windowMonitor.StartMonitoringWindows(); windowMonitor.StartMonitoringWindows();
@ -45,7 +45,7 @@ namespace SafeExamBrowser.Client.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Stopping window monitoring..."); logger.Info("Stopping window monitoring...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_StopWindowMonitoring); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_StopWindowMonitoring);
windowMonitor.StopMonitoringWindows(); windowMonitor.StopMonitoringWindows();
windowMonitor.RestoreHiddenWindows(); windowMonitor.RestoreHiddenWindows();

50
SafeExamBrowser.Contracts/I18n/TextKey.cs
View file

@ -25,34 +25,34 @@ namespace SafeExamBrowser.Contracts.I18n
MessageBox_StartupErrorTitle, MessageBox_StartupErrorTitle,
Notification_AboutTooltip, Notification_AboutTooltip,
Notification_LogTooltip, Notification_LogTooltip,
ProgressIndicator_CloseServiceConnection,
ProgressIndicator_EmptyClipboard,
ProgressIndicator_InitializeBrowser,
ProgressIndicator_InitializeConfiguration,
ProgressIndicator_InitializeKioskMode,
ProgressIndicator_InitializeProcessMonitoring,
ProgressIndicator_InitializeServiceConnection,
ProgressIndicator_InitializeTaskbar,
ProgressIndicator_InitializeWindowMonitoring,
ProgressIndicator_InitializeWorkingArea,
ProgressIndicator_RestoreWorkingArea,
ProgressIndicator_RevertKioskMode,
ProgressIndicator_ShutdownProcedure,
ProgressIndicator_StartEventHandling,
ProgressIndicator_StartKeyboardInterception,
ProgressIndicator_StartMouseInterception,
ProgressIndicator_StopEventHandling,
ProgressIndicator_StopKeyboardInterception,
ProgressIndicator_StopMouseInterception,
ProgressIndicator_StopProcessMonitoring,
ProgressIndicator_StopWindowMonitoring,
ProgressIndicator_TerminateBrowser,
ProgressIndicator_TerminateTaskbar,
ProgressIndicator_WaitExplorerStartup,
ProgressIndicator_WaitExplorerTermination,
RuntimeWindow_ApplicationRunning, RuntimeWindow_ApplicationRunning,
RuntimeWindow_StartSession, RuntimeWindow_StartSession,
RuntimeWindow_StopSession, RuntimeWindow_StopSession,
SplashScreen_CloseServiceConnection,
SplashScreen_EmptyClipboard,
SplashScreen_InitializeBrowser,
SplashScreen_InitializeConfiguration,
SplashScreen_InitializeKioskMode,
SplashScreen_InitializeProcessMonitoring,
SplashScreen_InitializeServiceConnection,
SplashScreen_InitializeTaskbar,
SplashScreen_InitializeWindowMonitoring,
SplashScreen_InitializeWorkingArea,
SplashScreen_RestoreWorkingArea,
SplashScreen_RevertKioskMode,
SplashScreen_ShutdownProcedure,
SplashScreen_StartEventHandling,
SplashScreen_StartKeyboardInterception,
SplashScreen_StartMouseInterception,
SplashScreen_StopEventHandling,
SplashScreen_StopKeyboardInterception,
SplashScreen_StopMouseInterception,
SplashScreen_StopProcessMonitoring,
SplashScreen_StopWindowMonitoring,
SplashScreen_TerminateBrowser,
SplashScreen_TerminateTaskbar,
SplashScreen_WaitExplorerStartup,
SplashScreen_WaitExplorerTermination,
SystemControl_BatteryCharged, SystemControl_BatteryCharged,
SystemControl_BatteryCharging, SystemControl_BatteryCharging,
SystemControl_BatteryChargeCriticalWarning, SystemControl_BatteryChargeCriticalWarning,

150
SafeExamBrowser.Core/I18n/Text.xml
View file

@ -30,6 +30,81 @@
<Entry key="Notification_LogTooltip"> <Entry key="Notification_LogTooltip">
Application Log Application Log
</Entry> </Entry>
<Entry key="ProgressIndicator_CloseServiceConnection">
Closing service connection
</Entry>
<Entry key="ProgressIndicator_EmptyClipboard">
Emptying clipboard
</Entry>
<Entry key="ProgressIndicator_InitializeBrowser">
Initializing browser
</Entry>
<Entry key="ProgressIndicator_InitializeConfiguration">
Initializing application configuration
</Entry>
<Entry key="ProgressIndicator_InitializeKioskMode">
Initializing kiosk mode
</Entry>
<Entry key="ProgressIndicator_InitializeProcessMonitoring">
Initializing process monitoring
</Entry>
<Entry key="ProgressIndicator_InitializeServiceConnection">
Initializing service connection
</Entry>
<Entry key="ProgressIndicator_InitializeTaskbar">
Initializing taskbar
</Entry>
<Entry key="ProgressIndicator_InitializeWindowMonitoring">
Initializing window monitoring
</Entry>
<Entry key="ProgressIndicator_InitializeWorkingArea">
Initializing working area
</Entry>
<Entry key="ProgressIndicator_RestoreWorkingArea">
Restoring working area
</Entry>
<Entry key="ProgressIndicator_RevertKioskMode">
Reverting kiosk mode
</Entry>
<Entry key="ProgressIndicator_ShutdownProcedure">
Initiating shutdown procedure
</Entry>
<Entry key="ProgressIndicator_StartEventHandling">
Starting event handling
</Entry>
<Entry key="ProgressIndicator_StartKeyboardInterception">
Starting keyboard interception
</Entry>
<Entry key="ProgressIndicator_StartMouseInterception">
Starting mouse interception
</Entry>
<Entry key="ProgressIndicator_StopEventHandling">
Stopping event handling
</Entry>
<Entry key="ProgressIndicator_StopKeyboardInterception">
Stopping keyboard interception
</Entry>
<Entry key="ProgressIndicator_StopMouseInterception">
Stopping mouse interception
</Entry>
<Entry key="ProgressIndicator_StopProcessMonitoring">
Stopping process monitoring
</Entry>
<Entry key="ProgressIndicator_StopWindowMonitoring">
Stopping window monitoring
</Entry>
<Entry key="ProgressIndicator_TerminateBrowser">
Terminating browser
</Entry>
<Entry key="ProgressIndicator_TerminateTaskbar">
Terminating taskbar
</Entry>
<Entry key="ProgressIndicator_WaitExplorerStartup">
Waiting for Windows explorer to start up
</Entry>
<Entry key="ProgressIndicator_WaitExplorerTermination">
Waiting for Windows explorer to shut down
</Entry>
<Entry key="RuntimeWindow_ApplicationRunning"> <Entry key="RuntimeWindow_ApplicationRunning">
The application is running. The application is running.
</Entry> </Entry>
@ -39,81 +114,6 @@
<Entry key="RuntimeWindow_StopSession"> <Entry key="RuntimeWindow_StopSession">
Stopping current session Stopping current session
</Entry> </Entry>
<Entry key="SplashScreen_CloseServiceConnection">
Closing service connection
</Entry>
<Entry key="SplashScreen_EmptyClipboard">
Emptying clipboard
</Entry>
<Entry key="SplashScreen_InitializeBrowser">
Initializing browser
</Entry>
<Entry key="SplashScreen_InitializeConfiguration">
Initializing application configuration
</Entry>
<Entry key="SplashScreen_InitializeKioskMode">
Initializing kiosk mode
</Entry>
<Entry key="SplashScreen_InitializeProcessMonitoring">
Initializing process monitoring
</Entry>
<Entry key="SplashScreen_InitializeServiceConnection">
Initializing service connection
</Entry>
<Entry key="SplashScreen_InitializeTaskbar">
Initializing taskbar
</Entry>
<Entry key="SplashScreen_InitializeWindowMonitoring">
Initializing window monitoring
</Entry>
<Entry key="SplashScreen_InitializeWorkingArea">
Initializing working area
</Entry>
<Entry key="SplashScreen_RestoreWorkingArea">
Restoring working area
</Entry>
<Entry key="SplashScreen_RevertKioskMode">
Reverting kiosk mode
</Entry>
<Entry key="SplashScreen_ShutdownProcedure">
Initiating shutdown procedure
</Entry>
<Entry key="SplashScreen_StartEventHandling">
Starting event handling
</Entry>
<Entry key="SplashScreen_StartKeyboardInterception">
Starting keyboard interception
</Entry>
<Entry key="SplashScreen_StartMouseInterception">
Starting mouse interception
</Entry>
<Entry key="SplashScreen_StopEventHandling">
Stopping event handling
</Entry>
<Entry key="SplashScreen_StopKeyboardInterception">
Stopping keyboard interception
</Entry>
<Entry key="SplashScreen_StopMouseInterception">
Stopping mouse interception
</Entry>
<Entry key="SplashScreen_StopProcessMonitoring">
Stopping process monitoring
</Entry>
<Entry key="SplashScreen_StopWindowMonitoring">
Stopping window monitoring
</Entry>
<Entry key="SplashScreen_TerminateBrowser">
Terminating browser
</Entry>
<Entry key="SplashScreen_TerminateTaskbar">
Terminating taskbar
</Entry>
<Entry key="SplashScreen_WaitExplorerStartup">
Waiting for Windows explorer to start up
</Entry>
<Entry key="SplashScreen_WaitExplorerTermination">
Waiting for Windows explorer to shut down
</Entry>
<Entry key="SystemControl_BatteryCharging"> <Entry key="SystemControl_BatteryCharging">
Plugged in, charging... (%%CHARGE%%%) Plugged in, charging... (%%CHARGE%%%)
</Entry> </Entry>

2
SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs
View file

@ -48,7 +48,7 @@ namespace SafeExamBrowser.Runtime.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info("Initializing application configuration..."); logger.Info("Initializing application configuration...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeConfiguration); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeConfiguration);
ISettings settings; ISettings settings;
var isValidUri = TryGetSettingsUri(out Uri uri); var isValidUri = TryGetSettingsUri(out Uri uri);

4
SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs
View file

@ -34,7 +34,7 @@ namespace SafeExamBrowser.Runtime.Behaviour.Operations
kioskMode = settingsRepository.Current.KioskMode; kioskMode = settingsRepository.Current.KioskMode;
logger.Info($"Initializing kiosk mode '{kioskMode}'..."); logger.Info($"Initializing kiosk mode '{kioskMode}'...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeKioskMode); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeKioskMode);
if (kioskMode == KioskMode.CreateNewDesktop) if (kioskMode == KioskMode.CreateNewDesktop)
{ {
@ -54,7 +54,7 @@ namespace SafeExamBrowser.Runtime.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info($"Reverting kiosk mode '{kioskMode}'..."); logger.Info($"Reverting kiosk mode '{kioskMode}'...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_RevertKioskMode); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_RevertKioskMode);
if (kioskMode == KioskMode.CreateNewDesktop) if (kioskMode == KioskMode.CreateNewDesktop)
{ {

4
SafeExamBrowser.Runtime/Behaviour/Operations/ServiceOperation.cs
View file

@ -39,7 +39,7 @@ namespace SafeExamBrowser.Runtime.Behaviour.Operations
public void Perform() public void Perform()
{ {
logger.Info($"Initializing service connection..."); logger.Info($"Initializing service connection...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_InitializeServiceConnection); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_InitializeServiceConnection);
try try
{ {
@ -71,7 +71,7 @@ namespace SafeExamBrowser.Runtime.Behaviour.Operations
public void Revert() public void Revert()
{ {
logger.Info("Closing service connection..."); logger.Info("Closing service connection...");
ProgressIndicator?.UpdateText(TextKey.SplashScreen_CloseServiceConnection); ProgressIndicator?.UpdateText(TextKey.ProgressIndicator_CloseServiceConnection);
if (serviceAvailable) if (serviceAvailable)
{ {