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

SEBWIN-342: Removed UI dependencies from audio system component.

Browse source
This commit is contained in:
dbuechel 2019-08-30 17:33:28 +02:00
parent d8752b5558
commit 7506ebaf10
24 changed files with 451 additions and 528 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs
View file

@ -15,6 +15,7 @@ using SafeExamBrowser.Configuration.Contracts.Settings;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell;
@ -28,6 +29,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
private Mock<IActionCenter> actionCenter;
private List<IActionCenterActivator> activators;
private ActionCenterSettings actionCenterSettings;
private Mock<IAudio> audio;
private Mock<ILogger> logger;
private TaskbarSettings taskbarSettings;
private Mock<ITerminationActivator> terminationActivator;
@ -37,7 +39,6 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
private Mock<INotificationInfo> logInfo;
private Mock<INotificationController> logController;
// TODO
//private Mock<ISystemComponent<ISystemAudioControl>> audio;
//private Mock<ISystemComponent<ISystemPowerSupplyControl>> powerSupply;
//private Mock<ISystemComponent<ISystemWirelessNetworkControl>> wirelessNetwork;
private Mock<ISystemInfo> systemInfo;
@ -53,6 +54,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
actionCenter = new Mock<IActionCenter>();
activators = new List<IActionCenterActivator>();
actionCenterSettings = new ActionCenterSettings();
audio = new Mock<IAudio>();
logger = new Mock<ILogger>();
aboutInfo = new Mock<INotificationInfo>();
aboutController = new Mock<INotificationController>();
@ -60,7 +62,6 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
logInfo = new Mock<INotificationInfo>();
logController = new Mock<INotificationController>();
// TODO
//audio = new Mock<ISystemComponent<ISystemAudioControl>>();
//powerSupply = new Mock<ISystemComponent<ISystemPowerSupplyControl>>();
//wirelessNetwork = new Mock<ISystemComponent<ISystemWirelessNetworkControl>>();
systemInfo = new Mock<ISystemInfo>();
@ -76,6 +77,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
actionCenter.Object,
activators,
actionCenterSettings,
audio.Object,
logger.Object,
aboutInfo.Object,
aboutController.Object,
@ -196,7 +198,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
taskbarSettings.ShowWirelessNetwork = true;
systemInfo.SetupGet(s => s.HasBattery).Returns(true);
uiFactory.Setup(f => f.CreateAudioControl(It.IsAny<Location>())).Returns(new Mock<ISystemAudioControl>().Object);
uiFactory.Setup(f => f.CreateAudioControl(It.IsAny<IAudio>(), It.IsAny<Location>())).Returns(new Mock<ISystemControl>().Object);
uiFactory.Setup(f => f.CreateKeyboardLayoutControl(It.IsAny<IKeyboard>(), It.IsAny<Location>())).Returns(new Mock<ISystemControl>().Object);
uiFactory.Setup(f => f.CreatePowerSupplyControl(It.IsAny<Location>())).Returns(new Mock<ISystemPowerSupplyControl>().Object);
uiFactory.Setup(f => f.CreateWirelessNetworkControl(It.IsAny<Location>())).Returns(new Mock<ISystemWirelessNetworkControl>().Object);
@ -225,7 +227,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
taskbarSettings.ShowWirelessNetwork = false;
systemInfo.SetupGet(s => s.HasBattery).Returns(false);
uiFactory.Setup(f => f.CreateAudioControl(It.IsAny<Location>())).Returns(new Mock<ISystemAudioControl>().Object);
uiFactory.Setup(f => f.CreateAudioControl(It.IsAny<IAudio>(), It.IsAny<Location>())).Returns(new Mock<ISystemControl>().Object);
uiFactory.Setup(f => f.CreateKeyboardLayoutControl(It.IsAny<IKeyboard>(), It.IsAny<Location>())).Returns(new Mock<ISystemControl>().Object);
uiFactory.Setup(f => f.CreatePowerSupplyControl(It.IsAny<Location>())).Returns(new Mock<ISystemPowerSupplyControl>().Object);
uiFactory.Setup(f => f.CreateWirelessNetworkControl(It.IsAny<Location>())).Returns(new Mock<ISystemWirelessNetworkControl>().Object);

4
SafeExamBrowser.Client/CompositionRoot.cs
View file

@ -39,7 +39,9 @@ using SafeExamBrowser.Monitoring.Mouse;
using SafeExamBrowser.Monitoring.Processes;
using SafeExamBrowser.Monitoring.Windows;
using SafeExamBrowser.SystemComponents;
using SafeExamBrowser.SystemComponents.Audio;
using SafeExamBrowser.SystemComponents.Contracts;
using SafeExamBrowser.SystemComponents.Keyboard;
using SafeExamBrowser.UserInterface.Contracts;
using SafeExamBrowser.UserInterface.Contracts.MessageBox;
using SafeExamBrowser.UserInterface.Contracts.Shell;
@ -270,6 +272,7 @@ namespace SafeExamBrowser.Client
actionCenter,
activators,
configuration.Settings.ActionCenter,
audio,
logger,
aboutInfo,
aboutController,
@ -277,7 +280,6 @@ namespace SafeExamBrowser.Client
logInfo,
logController,
// TODO
//audio,
//powerSupply,
//wirelessNetwork,
systemInfo,

25
SafeExamBrowser.Client/Operations/ShellOperation.cs
View file

@ -14,6 +14,7 @@ using SafeExamBrowser.Core.Contracts.OperationModel.Events;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell;
@ -26,13 +27,13 @@ namespace SafeExamBrowser.Client.Operations
private IActionCenter actionCenter;
private IEnumerable<IActionCenterActivator> activators;
private ActionCenterSettings actionCenterSettings;
private IAudio audio;
private ILogger logger;
private INotificationInfo aboutInfo;
private INotificationController aboutController;
private IKeyboard keyboard;
private INotificationInfo logInfo;
private INotificationController logController;
// TODO private ISystemComponent<ISystemAudioControl> audio;
// TODO private ISystemComponent<ISystemPowerSupplyControl> powerSupply;
// TODO private ISystemComponent<ISystemWirelessNetworkControl> wirelessNetwork;
private ISystemInfo systemInfo;
@ -49,13 +50,13 @@ namespace SafeExamBrowser.Client.Operations
IActionCenter actionCenter,
IEnumerable<IActionCenterActivator> activators,
ActionCenterSettings actionCenterSettings,
IAudio audio,
ILogger logger,
INotificationInfo aboutInfo,
INotificationController aboutController,
IKeyboard keyboard,
INotificationInfo logInfo,
INotificationController logController,
// TODO ISystemComponent<ISystemAudioControl> audio,
// TODO ISystemComponent<ISystemPowerSupplyControl> powerSupply,
// TODO ISystemComponent<ISystemWirelessNetworkControl> wirelessNetwork,
ISystemInfo systemInfo,
@ -70,11 +71,11 @@ namespace SafeExamBrowser.Client.Operations
this.actionCenter = actionCenter;
this.activators = activators;
this.actionCenterSettings = actionCenterSettings;
this.audio = audio;
this.keyboard = keyboard;
this.logger = logger;
this.logInfo = logInfo;
this.logController = logController;
// TODO this.audio = audio;
// TODO this.powerSupply = powerSupply;
this.systemInfo = systemInfo;
this.taskbarSettings = taskbarSettings;
@ -168,9 +169,9 @@ namespace SafeExamBrowser.Client.Operations
private void InitializeSystemComponents()
{
// TODO
//audio.Initialize();
audio.Initialize();
keyboard.Initialize();
// TODO
//powerSupply.Initialize();
//wirelessNetwork.Initialize();
}
@ -201,10 +202,7 @@ namespace SafeExamBrowser.Client.Operations
{
if (actionCenterSettings.ShowAudio)
{
var control = uiFactory.CreateAudioControl(Location.ActionCenter);
// TODO audio.Register(control);
actionCenter.AddSystemControl(control);
actionCenter.AddSystemControl(uiFactory.CreateAudioControl(audio, Location.ActionCenter));
}
}
@ -212,10 +210,7 @@ namespace SafeExamBrowser.Client.Operations
{
if (taskbarSettings.ShowAudio)
{
var control = uiFactory.CreateAudioControl(Location.Taskbar);
// TODO audio.Register(control);
taskbar.AddSystemControl(control);
taskbar.AddSystemControl(uiFactory.CreateAudioControl(audio, Location.Taskbar));
}
}
@ -332,11 +327,11 @@ namespace SafeExamBrowser.Client.Operations
private void TerminateSystemComponents()
{
audio.Terminate();
keyboard.Terminate();
// TODO
//audio.Terminate();
//powerSupply.Terminate();
//wirelessNetwork.Terminate();
keyboard.Terminate();
}
}
}

6
SafeExamBrowser.UserInterface.Contracts/Shell/Events/AudioMuteRequestedEventHandler.cs → SafeExamBrowser.SystemComponents.Contracts/Audio/Events/AudioVolumeChangedEventHandler.cs
View file

@ -6,10 +6,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
namespace SafeExamBrowser.UserInterface.Contracts.Shell.Events
namespace SafeExamBrowser.SystemComponents.Contracts.Audio.Events
{
/// <summary>
/// Indicates that the user would like to change the audio mute status to the given value.
/// Indicates that the volume of the system audio component has changed.
/// </summary>
public delegate void AudioMuteRequestedEventHandler(bool mute);
public delegate void AudioVolumeChangedEventHandler(double volume, bool muted);
}

63
SafeExamBrowser.SystemComponents.Contracts/Audio/IAudio.cs Normal file
View file

@ -0,0 +1,63 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
using SafeExamBrowser.SystemComponents.Contracts.Audio.Events;
namespace SafeExamBrowser.SystemComponents.Contracts.Audio
{
/// <summary>
/// Defines the functionality of the audio system component.
/// </summary>
public interface IAudio : ISystemComponent
{
/// <summary>
/// The full name of the audio device, or an empty string if not available.
/// </summary>
string DeviceFullName { get; }
/// <summary>
/// The short audio device name, or an empty string if not available.
/// </summary>
string DeviceShortName { get; }
/// <summary>
/// Indicates whether an audio output device is available.
/// </summary>
bool HasOutputDevice { get; }
/// <summary>
/// Indicates whether the audio output is currently muted.
/// </summary>
bool OutputMuted { get; }
/// <summary>
/// The current audio output volume.
/// </summary>
double OutputVolume { get; }
/// <summary>
/// Fired when the volume of the audio device has changed.
/// </summary>
event AudioVolumeChangedEventHandler VolumeChanged;
/// <summary>
/// Mutes the currently active audio device.
/// </summary>
void Mute();
/// <summary>
/// Unmutes the currently active audio device.
/// </summary>
void Unmute();
/// <summary>
/// Sets the volume of the currently active audio device to the given value.
/// </summary>
void SetVolume(double value);
}
}

2
SafeExamBrowser.SystemComponents.Contracts/SafeExamBrowser.SystemComponents.Contracts.csproj
View file

@ -53,6 +53,8 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="Audio\Events\AudioVolumeChangedEventHandler.cs" />
<Compile Include="Audio\IAudio.cs" />
<Compile Include="BatteryChargeStatus.cs" />
<Compile Include="Keyboard\Events\KeyboardLayoutChangedEventHandler.cs" />
<Compile Include="Keyboard\IKeyboard.cs" />

124
SafeExamBrowser.SystemComponents/Audio.cs → SafeExamBrowser.SystemComponents/Audio/Audio.cs
View file

@ -12,24 +12,33 @@ using NAudio.CoreAudioApi;
using SafeExamBrowser.Configuration.Contracts.Settings;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.SystemComponents.Contracts.Audio.Events;
namespace SafeExamBrowser.SystemComponents
namespace SafeExamBrowser.SystemComponents.Audio
{
public class Audio// TODO : ISystemComponent<ISystemAudioControl>
public class Audio : IAudio
{
private readonly object @lock = new object();
private AudioSettings settings;
private MMDevice audioDevice;
private string audioDeviceFullName;
private string audioDeviceShortName;
// TODOprivate List<ISystemAudioControl> controls;
private float originalVolume;
private ILogger logger;
private IText text;
public string DeviceFullName => audioDeviceFullName ?? string.Empty;
public string DeviceShortName => audioDeviceShortName ?? string.Empty;
public bool HasOutputDevice => audioDevice != default(MMDevice);
public bool OutputMuted => audioDevice?.AudioEndpointVolume.Mute == true;
public double OutputVolume => audioDevice?.AudioEndpointVolume.MasterVolumeLevelScalar ?? 0;
public event AudioVolumeChangedEventHandler VolumeChanged;
public Audio(AudioSettings settings, ILogger logger, IText text)
{
// TODOthis.controls = new List<ISystemAudioControl>();
this.settings = settings;
this.logger = logger;
this.text = text;
@ -48,19 +57,29 @@ namespace SafeExamBrowser.SystemComponents
}
}
// TODO
//public void Register(ISystemAudioControl control)
//{
// control.MuteRequested += Control_MuteRequested;
// control.VolumeSelected += Control_VolumeSelected;
public void Mute()
{
if (audioDevice != default(MMDevice))
{
audioDevice.AudioEndpointVolume.Mute = true;
}
}
// lock (@lock)
// {
// controls.Add(control);
// }
public void Unmute()
{
if (audioDevice != default(MMDevice))
{
audioDevice.AudioEndpointVolume.Mute = false;
}
}
// UpdateControls();
//}
public void SetVolume(double value)
{
if (audioDevice != default(MMDevice))
{
audioDevice.AudioEndpointVolume.MasterVolumeLevelScalar = (float) value;
}
}
public void Terminate()
{
@ -69,12 +88,6 @@ namespace SafeExamBrowser.SystemComponents
RevertSettings();
FinalizeAudioDevice();
}
// TODO
//foreach (var control in controls)
//{
// control.Close();
//}
}
private bool TryLoadAudioDevice()
@ -98,6 +111,7 @@ namespace SafeExamBrowser.SystemComponents
{
logger.Info($"Found '{audioDevice}' to be the active audio device.");
audioDevice.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
audioDeviceFullName = audioDevice.FriendlyName;
audioDeviceShortName = audioDevice.FriendlyName.Length > 25 ? audioDevice.FriendlyName.Split(' ').First() : audioDevice.FriendlyName;
logger.Info("Started monitoring the audio device.");
}
@ -145,75 +159,9 @@ namespace SafeExamBrowser.SystemComponents
{
lock (@lock)
{
var info = BuildInfoText(data.MasterVolume, data.Muted);
logger.Debug($"Volume is set to {data.MasterVolume * 100}%, audio device is {(data.Muted ? "muted" : "not muted")}.");
// TODO
//foreach (var control in controls)
//{
// control.OutputDeviceMuted = data.Muted;
// control.OutputDeviceVolume = data.MasterVolume;
// control.SetInformation(info);
//}
VolumeChanged?.Invoke(data.MasterVolume, data.Muted);
}
}
private void Control_MuteRequested(bool mute)
{
audioDevice.AudioEndpointVolume.Mute = mute;
}
private void Control_VolumeSelected(double volume)
{
audioDevice.AudioEndpointVolume.MasterVolumeLevelScalar = (float) volume;
}
private void UpdateControls()
{
lock (@lock)
{
try
{
if (audioDevice != default(MMDevice))
{
var info = BuildInfoText(audioDevice.AudioEndpointVolume.MasterVolumeLevelScalar, audioDevice.AudioEndpointVolume.Mute);
// TODO
//foreach (var control in controls)
//{
// control.HasOutputDevice = true;
// control.OutputDeviceMuted = audioDevice.AudioEndpointVolume.Mute;
// control.OutputDeviceName = audioDevice.FriendlyName;
// control.OutputDeviceVolume = audioDevice.AudioEndpointVolume.MasterVolumeLevelScalar;
// control.SetInformation(info);
//}
}
else
{
// TODO
//foreach (var control in controls)
//{
// control.HasOutputDevice = false;
// control.SetInformation(text.Get(TextKey.SystemControl_AudioDeviceNotFound));
//}
}
}
catch (Exception e)
{
logger.Error("Failed to update audio device status!", e);
}
}
}
private string BuildInfoText(float volume, bool muted)
{
var info = text.Get(muted ? TextKey.SystemControl_AudioDeviceInfoMuted : TextKey.SystemControl_AudioDeviceInfo);
info = info.Replace("%%NAME%%", audioDeviceShortName);
info = info.Replace("%%VOLUME%%", Convert.ToString(Math.Round(volume * 100)));
return info;
}
}
}

2
SafeExamBrowser.SystemComponents/Keyboard.cs → SafeExamBrowser.SystemComponents/Keyboard/Keyboard.cs
View file

@ -16,7 +16,7 @@ using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard.Events;
namespace SafeExamBrowser.SystemComponents
namespace SafeExamBrowser.SystemComponents.Keyboard
{
public class Keyboard : IKeyboard
{

2
SafeExamBrowser.SystemComponents/KeyboardLayout.cs → SafeExamBrowser.SystemComponents/Keyboard/KeyboardLayout.cs
View file

@ -10,7 +10,7 @@ using System;
using System.Globalization;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
namespace SafeExamBrowser.SystemComponents
namespace SafeExamBrowser.SystemComponents.Keyboard
{
internal class KeyboardLayout : IKeyboardLayout
{

6
SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj
View file

@ -62,9 +62,9 @@
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="Audio.cs" />
<Compile Include="KeyboardLayout.cs" />
<Compile Include="Keyboard.cs" />
<Compile Include="Audio\Audio.cs" />
<Compile Include="Keyboard\KeyboardLayout.cs" />
<Compile Include="Keyboard\Keyboard.cs" />
<Compile Include="PowerSupply.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SystemInfo.cs" />

3
SafeExamBrowser.UserInterface.Contracts/IUserInterfaceFactory.cs
View file

@ -12,6 +12,7 @@ using SafeExamBrowser.Configuration.Contracts;
using SafeExamBrowser.Configuration.Contracts.Settings;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts.Browser;
using SafeExamBrowser.UserInterface.Contracts.Shell;
@ -37,7 +38,7 @@ namespace SafeExamBrowser.UserInterface.Contracts
/// <summary>
/// Creates a system control which allows to change the audio settings of the computer.
/// </summary>
ISystemAudioControl CreateAudioControl(Location location);
ISystemControl CreateAudioControl(IAudio audio, Location location);
/// <summary>
/// Creates a new browser window loaded with the given browser control and settings.

3
SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj
View file

@ -67,8 +67,6 @@
<Compile Include="MessageBox\MessageBoxResult.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Shell\Events\ActivatorEventHandler.cs" />
<Compile Include="Shell\Events\AudioMuteRequestedEventHandler.cs" />
<Compile Include="Shell\Events\AudioVolumeSelectedEventHandler.cs" />
<Compile Include="Shell\Events\NotificationControlClickedEventHandler.cs" />
<Compile Include="Shell\Events\QuitButtonClickedEventHandler.cs" />
<Compile Include="Shell\Events\WirelessNetworkSelectedEventHandler.cs" />
@ -76,7 +74,6 @@
<Compile Include="Shell\IActionCenterActivator.cs" />
<Compile Include="Shell\IApplicationControl.cs" />
<Compile Include="Shell\INotificationControl.cs" />
<Compile Include="Shell\ISystemAudioControl.cs" />
<Compile Include="Shell\ISystemControl.cs" />
<Compile Include="Shell\ISystemPowerSupplyControl.cs" />
<Compile Include="Shell\ISystemWirelessNetworkControl.cs" />

16
SafeExamBrowser.UserInterface.Contracts/Shell/Events/AudioVolumeSelectedEventHandler.cs
View file

@ -1,16 +0,0 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
namespace SafeExamBrowser.UserInterface.Contracts.Shell.Events
{
/// <summary>
/// Indicates that the user would like to set the audio volume to the given value, where <c>0.0</c> is the lowest and <c>1.0</c> the highest
/// possible value.
/// </summary>
public delegate void AudioVolumeSelectedEventHandler(double volume);
}

48
SafeExamBrowser.UserInterface.Contracts/Shell/ISystemAudioControl.cs
View file

@ -1,48 +0,0 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
namespace SafeExamBrowser.UserInterface.Contracts.Shell
{
/// <summary>
/// The control of the audio system component.
/// </summary>
public interface ISystemAudioControl : ISystemControl
{
/// <summary>
/// Defines whether the computer has an audio output device.
/// </summary>
bool HasOutputDevice { set; }
/// <summary>
/// Indicates whether the current output device is muted.
/// </summary>
bool OutputDeviceMuted { set; }
/// <summary>
/// Shows the name of the currently active audio output device.
/// </summary>
string OutputDeviceName { set; }
/// <summary>
/// Shows the current audio output volume, where <c>0.0</c> is the lowest and <c>1.0</c> the highest possible value.
/// </summary>
double OutputDeviceVolume { set; }
/// <summary>
/// Event fired when the user requests to mute the current output device.
/// </summary>
event AudioMuteRequestedEventHandler MuteRequested;
/// <summary>
/// Event fired when the user requests to set the volume of the current output device.
/// </summary>
event AudioVolumeSelectedEventHandler VolumeSelected;
}
}

2
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml
View file

@ -37,7 +37,7 @@
<RowDefinition Height="2*" />
<RowDefinition Height="3*" />
</Grid.RowDefinitions>
<ContentControl x:Name="TaskbarIcon" />
<ContentControl x:Name="ButtonIcon" />
<TextBlock Grid.Row="1" x:Name="Text" FontSize="11" Foreground="White" TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" VerticalAlignment="Bottom" />
</Grid>
</Button>

161
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml.cs
View file

@ -14,123 +14,80 @@ using System.Windows.Controls.Primitives;
using System.Windows.Media;
using System.Windows.Threading;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls
{
public partial class ActionCenterAudioControl : UserControl, ISystemAudioControl
public partial class ActionCenterAudioControl : UserControl, ISystemControl
{
private readonly IAudio audio;
private readonly IText text;
private bool muted;
private XamlIconResource MutedIcon;
private XamlIconResource NoDeviceIcon;
public event AudioMuteRequestedEventHandler MuteRequested;
public event AudioVolumeSelectedEventHandler VolumeSelected;
public ActionCenterAudioControl(IText text)
public ActionCenterAudioControl(IAudio audio, IText text)
{
this.audio = audio;
this.text = text;
InitializeComponent();
InitializeAudioControl();
}
public bool HasOutputDevice
{
set
{
Dispatcher.InvokeAsync(() =>
{
Button.IsEnabled = value;
if (!value)
{
TaskbarIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
});
}
}
public bool OutputDeviceMuted
{
set
{
Dispatcher.InvokeAsync(() =>
{
muted = value;
if (value)
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
TaskbarIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
TaskbarIcon.Content = LoadIcon(Volume.Value / 100);
}
});
}
}
public string OutputDeviceName
{
set
{
Dispatcher.InvokeAsync(() => AudioDeviceName.Text = value);
}
}
public double OutputDeviceVolume
{
set
{
Dispatcher.InvokeAsync(() =>
{
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(value * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (!muted)
{
PopupIcon.Content = LoadIcon(value);
TaskbarIcon.Content = LoadIcon(value);
}
});
}
}
public void Close()
{
Popup.IsOpen = false;
}
public void SetInformation(string text)
{
Dispatcher.InvokeAsync(() =>
{
Button.ToolTip = text;
Text.Text = text;
});
}
private void InitializeAudioControl()
{
var originalBrush = Grid.Background;
audio.VolumeChanged += Audio_VolumeChanged;
Button.Click += (o, args) => Popup.IsOpen = !Popup.IsOpen;
Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver));
MuteButton.Click += (o, args) => MuteRequested?.Invoke(!muted);
MuteButton.Click += MuteButton_Click;
MutedIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Muted.xaml"));
NoDeviceIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Light_NoDevice.xaml"));
Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = IsMouseOver));
Popup.Opened += (o, args) => Grid.Background = Brushes.Gray;
Popup.Closed += (o, args) => Grid.Background = originalBrush;
Volume.ValueChanged += Volume_ValueChanged;
if (audio.HasOutputDevice)
{
AudioDeviceName.Text = audio.DeviceFullName;
Button.IsEnabled = true;
UpdateVolume(audio.OutputVolume, audio.OutputMuted);
}
else
{
AudioDeviceName.Text = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
Button.IsEnabled = false;
Button.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
ButtonIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
Text.Text = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
}
}
private void Audio_VolumeChanged(double volume, bool muted)
{
Dispatcher.InvokeAsync(() => UpdateVolume(volume, muted));
}
private void MuteButton_Click(object sender, RoutedEventArgs e)
{
if (muted)
{
audio.Unmute();
}
else
{
audio.Mute();
}
}
private void Volume_DragStarted(object sender, DragStartedEventArgs e)
@ -140,13 +97,49 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private void Volume_DragCompleted(object sender, DragCompletedEventArgs e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
Volume.ValueChanged += Volume_ValueChanged;
}
private void Volume_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
}
private void UpdateVolume(double volume, bool muted)
{
var info = BuildInfoText(volume, muted);
this.muted = muted;
Button.ToolTip = info;
Text.Text = info;
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(volume * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (muted)
{
ButtonIcon.Content = IconResourceLoader.Load(MutedIcon);
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
ButtonIcon.Content = LoadIcon(volume);
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
PopupIcon.Content = LoadIcon(volume);
}
}
private string BuildInfoText(double volume, bool muted)
{
var info = text.Get(muted ? TextKey.SystemControl_AudioDeviceInfoMuted : TextKey.SystemControl_AudioDeviceInfo);
info = info.Replace("%%NAME%%", audio.DeviceShortName);
info = info.Replace("%%VOLUME%%", Convert.ToString(Math.Round(volume * 100)));
return info;
}
private UIElement LoadIcon(double volume)

2
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml
View file

@ -33,7 +33,7 @@
</Border>
</Popup>
<Button x:Name="Button" Background="Transparent" Padding="5" Template="{StaticResource TaskbarButton}" ToolTipService.ShowOnDisabled="True" Width="40">
<ContentControl x:Name="TaskbarIcon" />
<ContentControl x:Name="ButtonIcon" />
</Button>
</Grid>
</UserControl>

155
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml.cs
View file

@ -13,113 +13,42 @@ using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Media;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls
{
public partial class TaskbarAudioControl : UserControl, ISystemAudioControl
public partial class TaskbarAudioControl : UserControl, ISystemControl
{
private readonly IAudio audio;
private readonly IText text;
private bool muted;
private XamlIconResource MutedIcon;
private XamlIconResource NoDeviceIcon;
public event AudioMuteRequestedEventHandler MuteRequested;
public event AudioVolumeSelectedEventHandler VolumeSelected;
public TaskbarAudioControl(IText text)
public TaskbarAudioControl(IAudio audio, IText text)
{
this.audio = audio;
this.text = text;
InitializeComponent();
InitializeAudioControl();
}
public bool HasOutputDevice
{
set
{
Dispatcher.InvokeAsync(() =>
{
Button.IsEnabled = value;
if (!value)
{
TaskbarIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
});
}
}
public bool OutputDeviceMuted
{
set
{
Dispatcher.InvokeAsync(() =>
{
muted = value;
if (value)
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
TaskbarIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
TaskbarIcon.Content = LoadIcon(Volume.Value / 100);
}
});
}
}
public string OutputDeviceName
{
set
{
Dispatcher.InvokeAsync(() => AudioDeviceName.Text = value);
}
}
public double OutputDeviceVolume
{
set
{
Dispatcher.InvokeAsync(() =>
{
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(value * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (!muted)
{
PopupIcon.Content = LoadIcon(value);
TaskbarIcon.Content = LoadIcon(value);
}
});
}
}
public void Close()
{
Popup.IsOpen = false;
}
public void SetInformation(string text)
{
Dispatcher.InvokeAsync(() => Button.ToolTip = text);
}
private void InitializeAudioControl()
{
var originalBrush = Button.Background;
audio.VolumeChanged += Audio_VolumeChanged;
Button.Click += (o, args) => Popup.IsOpen = !Popup.IsOpen;
Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver));
MuteButton.Click += (o, args) => MuteRequested?.Invoke(!muted);
MuteButton.Click += MuteButton_Click;
MutedIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Muted.xaml"));
NoDeviceIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_NoDevice.xaml"));
Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = IsMouseOver));
@ -136,6 +65,37 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
Background = originalBrush;
Button.Background = originalBrush;
};
if (audio.HasOutputDevice)
{
AudioDeviceName.Text = audio.DeviceFullName;
Button.IsEnabled = true;
UpdateVolume(audio.OutputVolume, audio.OutputMuted);
}
else
{
AudioDeviceName.Text = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
Button.IsEnabled = false;
Button.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
ButtonIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
}
private void Audio_VolumeChanged(double volume, bool muted)
{
Dispatcher.InvokeAsync(() => UpdateVolume(volume, muted));
}
private void MuteButton_Click(object sender, RoutedEventArgs e)
{
if (muted)
{
audio.Unmute();
}
else
{
audio.Mute();
}
}
private void Volume_DragStarted(object sender, DragStartedEventArgs e)
@ -145,13 +105,48 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private void Volume_DragCompleted(object sender, DragCompletedEventArgs e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
Volume.ValueChanged += Volume_ValueChanged;
}
private void Volume_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
}
private void UpdateVolume(double volume, bool muted)
{
var info = BuildInfoText(volume, muted);
this.muted = muted;
Button.ToolTip = info;
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(volume * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (muted)
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
ButtonIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
PopupIcon.Content = LoadIcon(volume);
ButtonIcon.Content = LoadIcon(volume);
}
}
private string BuildInfoText(double volume, bool muted)
{
var info = text.Get(muted ? TextKey.SystemControl_AudioDeviceInfoMuted : TextKey.SystemControl_AudioDeviceInfo);
info = info.Replace("%%NAME%%", audio.DeviceShortName);
info = info.Replace("%%VOLUME%%", Convert.ToString(Math.Round(volume * 100)));
return info;
}
private UIElement LoadIcon(double volume)

7
SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs
View file

@ -16,6 +16,7 @@ using SafeExamBrowser.Configuration.Contracts;
using SafeExamBrowser.Configuration.Contracts.Settings;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Browser;
@ -53,15 +54,15 @@ namespace SafeExamBrowser.UserInterface.Desktop
}
}
public ISystemAudioControl CreateAudioControl(Location location)
public ISystemControl CreateAudioControl(IAudio audio, Location location)
{
if (location == Location.ActionCenter)
{
return new ActionCenterAudioControl(text);
return new ActionCenterAudioControl(audio, text);
}
else
{
return new TaskbarAudioControl(text);
return new TaskbarAudioControl(audio, text);
}
}

2
SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml
View file

@ -41,7 +41,7 @@
<RowDefinition Height="2*" />
<RowDefinition Height="3*" />
</Grid.RowDefinitions>
<ContentControl x:Name="TaskbarIcon" />
<ContentControl x:Name="ButtonIcon" />
<TextBlock Grid.Row="1" x:Name="Text" FontSize="15" Foreground="White" TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" VerticalAlignment="Bottom" />
</Grid>
</Button>

166
SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml.cs
View file

@ -14,123 +14,79 @@ using System.Windows.Controls.Primitives;
using System.Windows.Media;
using System.Windows.Threading;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Mobile.Controls
{
public partial class ActionCenterAudioControl : UserControl, ISystemAudioControl
public partial class ActionCenterAudioControl : UserControl, ISystemControl
{
private readonly IAudio audio;
private readonly IText text;
private bool muted;
private XamlIconResource MutedIcon;
private XamlIconResource NoDeviceIcon;
public event AudioMuteRequestedEventHandler MuteRequested;
public event AudioVolumeSelectedEventHandler VolumeSelected;
public ActionCenterAudioControl(IText text)
public ActionCenterAudioControl(IAudio audio, IText text)
{
this.audio = audio;
this.text = text;
InitializeComponent();
InitializeAudioControl();
}
public bool HasOutputDevice
{
set
{
Dispatcher.InvokeAsync(() =>
{
Button.IsEnabled = value;
if (!value)
{
TaskbarIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
});
}
}
public bool OutputDeviceMuted
{
set
{
Dispatcher.InvokeAsync(() =>
{
muted = value;
if (value)
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
TaskbarIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
TaskbarIcon.Content = LoadIcon(Volume.Value / 100);
}
});
}
}
public string OutputDeviceName
{
set
{
Dispatcher.InvokeAsync(() => AudioDeviceName.Text = value);
}
}
public double OutputDeviceVolume
{
set
{
Dispatcher.InvokeAsync(() =>
{
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(value * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (!muted)
{
PopupIcon.Content = LoadIcon(value);
TaskbarIcon.Content = LoadIcon(value);
}
});
}
}
public void Close()
{
Popup.IsOpen = false;
}
public void SetInformation(string text)
{
Dispatcher.InvokeAsync(() =>
{
Button.ToolTip = text;
Text.Text = text;
});
}
private void InitializeAudioControl()
{
var originalBrush = Grid.Background;
audio.VolumeChanged += Audio_VolumeChanged;
Button.Click += (o, args) => Popup.IsOpen = !Popup.IsOpen;
Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver));
MuteButton.Click += (o, args) => MuteRequested?.Invoke(!muted);
MutedIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Muted.xaml"));
NoDeviceIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Light_NoDevice.xaml"));
MuteButton.Click += MuteButton_Click;
MutedIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/Audio_Muted.xaml"));
NoDeviceIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/Audio_Light_NoDevice.xaml"));
Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = IsMouseOver));
Popup.Opened += (o, args) => Grid.Background = Brushes.Gray;
Popup.Closed += (o, args) => Grid.Background = originalBrush;
Volume.ValueChanged += Volume_ValueChanged;
if (audio.HasOutputDevice)
{
AudioDeviceName.Text = audio.DeviceFullName;
Button.IsEnabled = true;
UpdateVolume(audio.OutputVolume, audio.OutputMuted);
}
else
{
AudioDeviceName.Text = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
Button.IsEnabled = false;
Button.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
ButtonIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
}
private void Audio_VolumeChanged(double volume, bool muted)
{
Dispatcher.InvokeAsync(() => UpdateVolume(volume, muted));
}
private void MuteButton_Click(object sender, RoutedEventArgs e)
{
if (muted)
{
audio.Unmute();
}
else
{
audio.Mute();
}
}
private void Volume_DragStarted(object sender, DragStartedEventArgs e)
@ -140,19 +96,55 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
private void Volume_DragCompleted(object sender, DragCompletedEventArgs e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
Volume.ValueChanged += Volume_ValueChanged;
}
private void Volume_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
}
private void UpdateVolume(double volume, bool muted)
{
var info = BuildInfoText(volume, muted);
this.muted = muted;
Button.ToolTip = info;
Text.Text = info;
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(volume * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (muted)
{
ButtonIcon.Content = IconResourceLoader.Load(MutedIcon);
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
ButtonIcon.Content = LoadIcon(volume);
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
PopupIcon.Content = LoadIcon(volume);
}
}
private string BuildInfoText(double volume, bool muted)
{
var info = text.Get(muted ? TextKey.SystemControl_AudioDeviceInfoMuted : TextKey.SystemControl_AudioDeviceInfo);
info = info.Replace("%%NAME%%", audio.DeviceShortName);
info = info.Replace("%%VOLUME%%", Convert.ToString(Math.Round(volume * 100)));
return info;
}
private UIElement LoadIcon(double volume)
{
var icon = volume > 0.66 ? "100" : (volume > 0.33 ? "66" : "33");
var uri = new Uri($"pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Light_{icon}.xaml");
var uri = new Uri($"pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/Audio_Light_{icon}.xaml");
var resource = new XamlIconResource(uri);
return IconResourceLoader.Load(resource);

2
SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml
View file

@ -37,7 +37,7 @@
</Border>
</Popup>
<Button x:Name="Button" Background="Transparent" Padding="5" Template="{StaticResource TaskbarButton}" ToolTipService.ShowOnDisabled="True" Width="60">
<ContentControl x:Name="TaskbarIcon" />
<ContentControl x:Name="ButtonIcon" />
</Button>
</Grid>
</UserControl>

161
SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml.cs
View file

@ -13,115 +13,44 @@ using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Media;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Mobile.Controls
{
public partial class TaskbarAudioControl : UserControl, ISystemAudioControl
public partial class TaskbarAudioControl : UserControl, ISystemControl
{
private readonly IAudio audio;
private readonly IText text;
private bool muted;
private XamlIconResource MutedIcon;
private XamlIconResource NoDeviceIcon;
public event AudioMuteRequestedEventHandler MuteRequested;
public event AudioVolumeSelectedEventHandler VolumeSelected;
public TaskbarAudioControl(IText text)
public TaskbarAudioControl(IAudio audio, IText text)
{
this.audio = audio;
this.text = text;
InitializeComponent();
InitializeAudioControl();
}
public bool HasOutputDevice
{
set
{
Dispatcher.InvokeAsync(() =>
{
Button.IsEnabled = value;
if (!value)
{
TaskbarIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
});
}
}
public bool OutputDeviceMuted
{
set
{
Dispatcher.InvokeAsync(() =>
{
muted = value;
if (value)
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
TaskbarIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
TaskbarIcon.Content = LoadIcon(Volume.Value / 100);
}
});
}
}
public string OutputDeviceName
{
set
{
Dispatcher.InvokeAsync(() => AudioDeviceName.Text = value);
}
}
public double OutputDeviceVolume
{
set
{
Dispatcher.InvokeAsync(() =>
{
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(value * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (!muted)
{
PopupIcon.Content = LoadIcon(value);
TaskbarIcon.Content = LoadIcon(value);
}
});
}
}
public void Close()
{
Popup.IsOpen = false;
}
public void SetInformation(string text)
{
Dispatcher.InvokeAsync(() => Button.ToolTip = text);
}
private void InitializeAudioControl()
{
var originalBrush = Button.Background;
audio.VolumeChanged += Audio_VolumeChanged;
Button.Click += (o, args) => Popup.IsOpen = !Popup.IsOpen;
Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver));
MuteButton.Click += (o, args) => MuteRequested?.Invoke(!muted);
MutedIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_Muted.xaml"));
NoDeviceIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_NoDevice.xaml"));
MuteButton.Click += MuteButton_Click;
MutedIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/Audio_Muted.xaml"));
NoDeviceIcon = new XamlIconResource(new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/Audio_NoDevice.xaml"));
Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = IsMouseOver));
Volume.ValueChanged += Volume_ValueChanged;
@ -136,6 +65,37 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
Background = originalBrush;
Button.Background = originalBrush;
};
if (audio.HasOutputDevice)
{
AudioDeviceName.Text = audio.DeviceFullName;
Button.IsEnabled = true;
UpdateVolume(audio.OutputVolume, audio.OutputMuted);
}
else
{
AudioDeviceName.Text = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
Button.IsEnabled = false;
Button.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceNotFound);
ButtonIcon.Content = IconResourceLoader.Load(NoDeviceIcon);
}
}
private void Audio_VolumeChanged(double volume, bool muted)
{
Dispatcher.InvokeAsync(() => UpdateVolume(volume, muted));
}
private void MuteButton_Click(object sender, RoutedEventArgs e)
{
if (muted)
{
audio.Unmute();
}
else
{
audio.Mute();
}
}
private void Volume_DragStarted(object sender, DragStartedEventArgs e)
@ -145,19 +105,54 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
private void Volume_DragCompleted(object sender, DragCompletedEventArgs e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
Volume.ValueChanged += Volume_ValueChanged;
}
private void Volume_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
VolumeSelected?.Invoke(Volume.Value / 100);
audio.SetVolume(Volume.Value / 100);
}
private void UpdateVolume(double volume, bool muted)
{
var info = BuildInfoText(volume, muted);
this.muted = muted;
Button.ToolTip = info;
Volume.ValueChanged -= Volume_ValueChanged;
Volume.Value = Math.Round(volume * 100);
Volume.ValueChanged += Volume_ValueChanged;
if (muted)
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceUnmuteTooltip);
PopupIcon.Content = IconResourceLoader.Load(MutedIcon);
ButtonIcon.Content = IconResourceLoader.Load(MutedIcon);
}
else
{
MuteButton.ToolTip = text.Get(TextKey.SystemControl_AudioDeviceMuteTooltip);
PopupIcon.Content = LoadIcon(volume);
ButtonIcon.Content = LoadIcon(volume);
}
}
private string BuildInfoText(double volume, bool muted)
{
var info = text.Get(muted ? TextKey.SystemControl_AudioDeviceInfoMuted : TextKey.SystemControl_AudioDeviceInfo);
info = info.Replace("%%NAME%%", audio.DeviceShortName);
info = info.Replace("%%VOLUME%%", Convert.ToString(Math.Round(volume * 100)));
return info;
}
private UIElement LoadIcon(double volume)
{
var icon = volume > 0.66 ? "100" : (volume > 0.33 ? "66" : "33");
var uri = new Uri($"pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Audio_{icon}.xaml");
var uri = new Uri($"pack://application:,,,/SafeExamBrowser.UserInterface.Mobile;component/Images/Audio_{icon}.xaml");
var resource = new XamlIconResource(uri);
return IconResourceLoader.Load(resource);

7
SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs
View file

@ -16,6 +16,7 @@ using SafeExamBrowser.Configuration.Contracts;
using SafeExamBrowser.Configuration.Contracts.Settings;
using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Browser;
@ -53,15 +54,15 @@ namespace SafeExamBrowser.UserInterface.Mobile
}
}
public ISystemAudioControl CreateAudioControl(Location location)
public ISystemControl CreateAudioControl(IAudio audio, Location location)
{
if (location == Location.ActionCenter)
{
return new ActionCenterAudioControl(text);
return new ActionCenterAudioControl(audio, text);
}
else
{
return new TaskbarAudioControl(text);
return new TaskbarAudioControl(audio, text);
}
}