Compare commits

...

1 commit

6 changed files with 28 additions and 0 deletions

View file

@ -17,6 +17,9 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{ {
switch (key) switch (key)
{ {
case Keys.Proctoring.ForceRaiseHandMessage:
MapForceRaiseHandMessage(settings, value);
break;
case Keys.Proctoring.JitsiMeet.AllowChat: case Keys.Proctoring.JitsiMeet.AllowChat:
MapJitsiMeetAllowChat(settings, value); MapJitsiMeetAllowChat(settings, value);
break; break;
@ -71,6 +74,9 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Proctoring.JitsiMeet.VideoMuted: case Keys.Proctoring.JitsiMeet.VideoMuted:
MapJitsiMeetVideoMuted(settings, value); MapJitsiMeetVideoMuted(settings, value);
break; break;
case Keys.Proctoring.ShowRaiseHand:
MapShowRaiseHand(settings, value);
break;
case Keys.Proctoring.ShowTaskbarNotification: case Keys.Proctoring.ShowTaskbarNotification:
MapShowTaskbarNotification(settings, value); MapShowTaskbarNotification(settings, value);
break; break;
@ -128,6 +134,14 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
} }
} }
private void MapForceRaiseHandMessage(AppSettings settings, object value)
{
if (value is bool force)
{
settings.Proctoring.ForceRaiseHandMessage = force;
}
}
private void MapJitsiMeetAllowChat(AppSettings settings, object value) private void MapJitsiMeetAllowChat(AppSettings settings, object value)
{ {
if (value is bool allow) if (value is bool allow)
@ -272,6 +286,14 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
} }
} }
private void MapShowRaiseHand(AppSettings settings, object value)
{
if (value is bool show)
{
settings.Proctoring.ShowRaiseHandNotification = show;
}
}
private void MapShowTaskbarNotification(AppSettings settings, object value) private void MapShowTaskbarNotification(AppSettings settings, object value)
{ {
if (value is bool show) if (value is bool show)

View file

@ -225,6 +225,8 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal static class Proctoring internal static class Proctoring
{ {
internal const string ForceRaiseHandMessage = "raiseHandButtonAlwaysPromptMessage";
internal const string ShowRaiseHand = "raiseHandButtonShow";
internal const string ShowTaskbarNotification = "showProctoringViewButton"; internal const string ShowTaskbarNotification = "showProctoringViewButton";
internal const string WindowVisibility = "remoteProctoringViewShow"; internal const string WindowVisibility = "remoteProctoringViewShow";

View file

@ -117,6 +117,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
Icon.Content = IconResourceLoader.Load(LoweredIcon); Icon.Content = IconResourceLoader.Load(LoweredIcon);
Message.IsEnabled = true; Message.IsEnabled = true;
NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
Popup.IsOpen = false;
Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered); Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered);
} }

View file

@ -123,6 +123,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
Icon.Content = IconResourceLoader.Load(LoweredIcon); Icon.Content = IconResourceLoader.Load(LoweredIcon);
Message.IsEnabled = true; Message.IsEnabled = true;
NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
Popup.IsOpen = false;
} }
private void ShowRaised() private void ShowRaised()

View file

@ -117,6 +117,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
Icon.Content = IconResourceLoader.Load(LoweredIcon); Icon.Content = IconResourceLoader.Load(LoweredIcon);
Message.IsEnabled = true; Message.IsEnabled = true;
NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
Popup.IsOpen = false;
Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered); Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered);
} }

View file

@ -124,6 +124,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
Icon.Content = IconResourceLoader.Load(LoweredIcon); Icon.Content = IconResourceLoader.Load(LoweredIcon);
Message.IsEnabled = true; Message.IsEnabled = true;
NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
Popup.IsOpen = false;
} }
private void ShowRaised() private void ShowRaised()