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

SEBWIN-104: Made about notification configurable and removed it and log notification from taskbar by default.

Browse source
This commit is contained in:
dbuechel 2019-05-08 10:12:22 +02:00
parent 137b463044
commit 305110f239
5 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,8 +146,10 @@ namespace SafeExamBrowser.Client.UnitTests.Operations
public void Perform_MustInitializeNotifications() public void Perform_MustInitializeNotifications()
{ {
actionCenterSettings.EnableActionCenter = true; actionCenterSettings.EnableActionCenter = true;
actionCenterSettings.ShowApplicationInfo = true;
actionCenterSettings.ShowApplicationLog = true; actionCenterSettings.ShowApplicationLog = true;
taskbarSettings.EnableTaskbar = true; taskbarSettings.EnableTaskbar = true;
taskbarSettings.ShowApplicationInfo = true;
taskbarSettings.ShowApplicationLog = true; taskbarSettings.ShowApplicationLog = true;
sut.Perform(); sut.Perform();

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

@ -169,18 +169,24 @@ namespace SafeExamBrowser.Client.Operations
private void InitializeAboutNotificationForActionCenter() private void InitializeAboutNotificationForActionCenter()
{ {
var notification = uiFactory.CreateNotificationControl(aboutInfo, Location.ActionCenter); if (actionCenterSettings.ShowApplicationInfo)
{
var notification = uiFactory.CreateNotificationControl(aboutInfo, Location.ActionCenter);
aboutController.RegisterNotification(notification); aboutController.RegisterNotification(notification);
actionCenter.AddNotificationControl(notification); actionCenter.AddNotificationControl(notification);
}
} }
private void InitializeAboutNotificationForTaskbar() private void InitializeAboutNotificationForTaskbar()
{ {
var notification = uiFactory.CreateNotificationControl(aboutInfo, Location.Taskbar); if (taskbarSettings.ShowApplicationInfo)
{
var notification = uiFactory.CreateNotificationControl(aboutInfo, Location.Taskbar);
aboutController.RegisterNotification(notification); aboutController.RegisterNotification(notification);
taskbar.AddNotificationControl(notification); taskbar.AddNotificationControl(notification);
}
} }
private void InitializeClockForActionCenter() private void InitializeClockForActionCenter()

4
SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
View file

@ -89,6 +89,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
var settings = new Settings(); var settings = new Settings();
settings.ActionCenter.EnableActionCenter = true; settings.ActionCenter.EnableActionCenter = true;
settings.ActionCenter.ShowApplicationInfo = true;
settings.ActionCenter.ShowApplicationLog = false; settings.ActionCenter.ShowApplicationLog = false;
settings.ActionCenter.ShowKeyboardLayout = true; settings.ActionCenter.ShowKeyboardLayout = true;
settings.ActionCenter.ShowWirelessNetwork = false; settings.ActionCenter.ShowWirelessNetwork = false;
@ -142,10 +143,11 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
settings.ServicePolicy = ServicePolicy.Optional; settings.ServicePolicy = ServicePolicy.Optional;
settings.Taskbar.EnableTaskbar = true;
settings.Taskbar.ShowApplicationInfo = false;
settings.Taskbar.ShowApplicationLog = false; settings.Taskbar.ShowApplicationLog = false;
settings.Taskbar.ShowKeyboardLayout = true; settings.Taskbar.ShowKeyboardLayout = true;
settings.Taskbar.ShowWirelessNetwork = false; settings.Taskbar.ShowWirelessNetwork = false;
settings.Taskbar.EnableTaskbar = true;
settings.Taskbar.ShowClock = true; settings.Taskbar.ShowClock = true;
settings.UserInterfaceMode = UserInterfaceMode.Desktop; settings.UserInterfaceMode = UserInterfaceMode.Desktop;

5
SafeExamBrowser.Contracts/Configuration/Settings/ActionCenterSettings.cs
View file

@ -21,6 +21,11 @@ namespace SafeExamBrowser.Contracts.Configuration.Settings
/// </summary> /// </summary>
public bool EnableActionCenter { get; set; } public bool EnableActionCenter { get; set; }
/// <summary>
/// Determines whether the about window is accessible via the action center.
/// </summary>
public bool ShowApplicationInfo { get; set; }
/// <summary> /// <summary>
/// Determines whether the application log is accessible via the action center. /// Determines whether the application log is accessible via the action center.
/// </summary> /// </summary>

5
SafeExamBrowser.Contracts/Configuration/Settings/TaskbarSettings.cs
View file

@ -21,6 +21,11 @@ namespace SafeExamBrowser.Contracts.Configuration.Settings
/// </summary> /// </summary>
public bool EnableTaskbar { get; set; } public bool EnableTaskbar { get; set; }
/// <summary>
/// Determines whether the about window is accessible via the taskbar.
/// </summary>
public bool ShowApplicationInfo { get; set; }
/// <summary> /// <summary>
/// Determines whether the application log is accessible via the taskbar. /// Determines whether the application log is accessible via the taskbar.
/// </summary> /// </summary>