From 0e120998b8ae5d82f16ae897115874c34e80c9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Mon, 12 Apr 2021 19:57:11 +0200 Subject: [PATCH] SEBWIN-448: Added text for remote proctoring. --- SafeExamBrowser.I18n.Contracts/TextKey.cs | 6 ++---- SafeExamBrowser.I18n/Data/de.xml | 12 ++++++++++++ SafeExamBrowser.I18n/Data/en.xml | 12 ++++++++++++ SafeExamBrowser.I18n/Data/fr.xml | 12 ++++++++++++ SafeExamBrowser.I18n/Data/it.xml | 12 ++++++++++++ SafeExamBrowser.I18n/Data/zh.xml | 12 ++++++++++++ SafeExamBrowser.Proctoring/ProctoringController.cs | 5 +++-- 7 files changed, 65 insertions(+), 6 deletions(-) diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs index af528476..7cb909e0 100644 --- a/SafeExamBrowser.I18n.Contracts/TextKey.cs +++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs @@ -129,8 +129,8 @@ namespace SafeExamBrowser.I18n.Contracts MessageBox_YesButton, Notification_AboutTooltip, Notification_LogTooltip, - // TODO - Notification_ProctoringTooltip, + Notification_ProctoringActiveTooltip, + Notification_ProctoringInactiveTooltip, OperationStatus_CloseRuntimeConnection, OperationStatus_EmptyClipboard, OperationStatus_FinalizeApplications, @@ -141,7 +141,6 @@ namespace SafeExamBrowser.I18n.Contracts OperationStatus_InitializeBrowser, OperationStatus_InitializeConfiguration, OperationStatus_InitializeKioskMode, - // TODO OperationStatus_InitializeProctoring, OperationStatus_InitializeRuntimeConnection, OperationStatus_InitializeServer, @@ -162,7 +161,6 @@ namespace SafeExamBrowser.I18n.Contracts OperationStatus_StopKeyboardInterception, OperationStatus_StopMouseInterception, OperationStatus_TerminateBrowser, - // TODO OperationStatus_TerminateProctoring, OperationStatus_TerminateShell, OperationStatus_ValidateRemoteSessionPolicy, diff --git a/SafeExamBrowser.I18n/Data/de.xml b/SafeExamBrowser.I18n/Data/de.xml index bf9c2884..c4db39f7 100644 --- a/SafeExamBrowser.I18n/Data/de.xml +++ b/SafeExamBrowser.I18n/Data/de.xml @@ -345,6 +345,12 @@ Applikations-Protokoll + + Fernüberwachung ist aktiv + + + Fernüberwachung ist nicht aktiv + Schliesse Verbindung zur Runtime @@ -375,6 +381,9 @@ Initialisiere Kiosk-Modus + + Initialisiere Fernüberwachung + Initialisiere Verbindung zur Runtime @@ -432,6 +441,9 @@ Beende Browser + + Beende Fernüberwachung + Beende Benutzeroberfläche diff --git a/SafeExamBrowser.I18n/Data/en.xml b/SafeExamBrowser.I18n/Data/en.xml index 9844e07a..37f4ae04 100644 --- a/SafeExamBrowser.I18n/Data/en.xml +++ b/SafeExamBrowser.I18n/Data/en.xml @@ -345,6 +345,12 @@ Application Log + + Remote proctoring is active + + + Remote proctoring is inactive + Closing runtime connection @@ -375,6 +381,9 @@ Initializing kiosk mode + + Initializing remote proctoring + Initializing runtime connection @@ -432,6 +441,9 @@ Terminating browser + + Terminating remote proctoring + Terminating user interface diff --git a/SafeExamBrowser.I18n/Data/fr.xml b/SafeExamBrowser.I18n/Data/fr.xml index 9a054bd0..18213329 100644 --- a/SafeExamBrowser.I18n/Data/fr.xml +++ b/SafeExamBrowser.I18n/Data/fr.xml @@ -345,6 +345,12 @@ Journal d’application + + La surveillance à distance est active + + + La surveillance à distance est inactive + Fermeture de la connexion @@ -375,6 +381,9 @@ Initialisation du mode kiosque + + Initialisation de la surveillance à distance + Initialisation de la connexion d'exécution @@ -432,6 +441,9 @@ Arrêt du navigateur + + Arrêt de la surveillance à distance + Arrêt de l’interface utilisateur diff --git a/SafeExamBrowser.I18n/Data/it.xml b/SafeExamBrowser.I18n/Data/it.xml index acaaebde..07641dee 100644 --- a/SafeExamBrowser.I18n/Data/it.xml +++ b/SafeExamBrowser.I18n/Data/it.xml @@ -345,6 +345,12 @@ Registro applicazione + + Il proctoring remoto è attivo + + + Il proctoring remoto è inattivo + Chiusura della connessione runtime @@ -375,6 +381,9 @@ Inizializzazione della modalità kiosk + + Inizializzazione del proctoring remoto + Inizializzazione della connessione runtime @@ -432,6 +441,9 @@ Chiusura del browser + + Terminare il proctoring remoto + Chiusura dell'interfaccia utente diff --git a/SafeExamBrowser.I18n/Data/zh.xml b/SafeExamBrowser.I18n/Data/zh.xml index 6b1ffda7..4ce73144 100644 --- a/SafeExamBrowser.I18n/Data/zh.xml +++ b/SafeExamBrowser.I18n/Data/zh.xml @@ -309,6 +309,12 @@ 应用程序日志 + + 远程监理处于活动状态 + + + 远程监理处于不活动状态 + 关闭运行时连接 @@ -333,6 +339,9 @@ 初始化全屏模式 + + 初始化远程监理 + 初始化运行时连接 @@ -384,6 +393,9 @@ 终止浏览器 + + 终止远程监督 + 终止用户界面 diff --git a/SafeExamBrowser.Proctoring/ProctoringController.cs b/SafeExamBrowser.Proctoring/ProctoringController.cs index 7161c9dc..1c376f5a 100644 --- a/SafeExamBrowser.Proctoring/ProctoringController.cs +++ b/SafeExamBrowser.Proctoring/ProctoringController.cs @@ -40,7 +40,7 @@ namespace SafeExamBrowser.Proctoring private IProctoringWindow window; public IconResource IconResource { get; set; } - public string Tooltip { get; } + public string Tooltip { get; set; } public event NotificationChangedEventHandler NotificationChanged; @@ -60,7 +60,7 @@ namespace SafeExamBrowser.Proctoring this.uiFactory = uiFactory; IconResource = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/ProctoringNotification_Inactive.xaml") }; - Tooltip = text.Get(TextKey.Notification_ProctoringTooltip); + Tooltip = text.Get(TextKey.Notification_ProctoringInactiveTooltip); } public void Activate() @@ -168,6 +168,7 @@ namespace SafeExamBrowser.Proctoring } IconResource = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/ProctoringNotification_Active.xaml") }; + Tooltip = text.Get(TextKey.Notification_ProctoringActiveTooltip); NotificationChanged?.Invoke(); logger.Info($"Started proctoring with {(settings.JitsiMeet.Enabled ? "Jitsi Meet" : "Zoom")}.");