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

SEBWIN-362: Cleaned up desktop UI implementations.

Browse source
This commit is contained in:
Damian Büchel 2020-03-16 18:29:06 +01:00
parent 6032cdf688
commit 9c889ac82d
74 changed files with 348 additions and 345 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SafeExamBrowser.Client/CompositionRoot.cs
View file

@ -276,7 +276,7 @@ namespace SafeExamBrowser.Client
case UserInterfaceMode.Mobile: case UserInterfaceMode.Mobile:
return new Mobile.ActionCenter(); return new Mobile.ActionCenter();
default: default:
return new Desktop.ActionCenter(); return new Desktop.Windows.ActionCenter();
} }
} }
@ -309,7 +309,7 @@ namespace SafeExamBrowser.Client
case UserInterfaceMode.Mobile: case UserInterfaceMode.Mobile:
return new Mobile.Taskbar(ModuleLogger(nameof(Mobile.Taskbar))); return new Mobile.Taskbar(ModuleLogger(nameof(Mobile.Taskbar)));
default: default:
return new Desktop.Taskbar(ModuleLogger(nameof(Desktop.Taskbar))); return new Desktop.Windows.Taskbar(ModuleLogger(nameof(Desktop.Windows.Taskbar)));
} }
} }
@ -320,7 +320,7 @@ namespace SafeExamBrowser.Client
case UserInterfaceMode.Mobile: case UserInterfaceMode.Mobile:
return new Mobile.Taskview(); return new Mobile.Taskview();
default: default:
return new Desktop.Taskview(); return new Desktop.Windows.Taskview();
} }
} }

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterApplicationButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.ApplicationButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml.cs
View file

@ -12,16 +12,16 @@ using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.Applications.Contracts.Resources.Icons; using SafeExamBrowser.Applications.Contracts.Resources.Icons;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterApplicationButton : UserControl internal partial class ApplicationButton : UserControl
{ {
private IApplication application; private IApplication application;
private IApplicationWindow window; private IApplicationWindow window;
internal event EventHandler Clicked; internal event EventHandler Clicked;
public ActionCenterApplicationButton(IApplication application, IApplicationWindow window = null) internal ApplicationButton(IApplication application, IApplicationWindow window = null)
{ {
this.application = application; this.application = application;
this.window = window; this.window = window;

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterApplicationControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.ApplicationControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,9 +8,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

10
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml.cs
View file

@ -11,13 +11,13 @@ using System.Windows.Controls;
using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterApplicationControl : UserControl, IApplicationControl internal partial class ApplicationControl : UserControl, IApplicationControl
{ {
private IApplication application; private IApplication application;
public ActionCenterApplicationControl(IApplication application) internal ApplicationControl(IApplication application)
{ {
this.application = application; this.application = application;
@ -27,7 +27,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private void InitializeApplicationControl() private void InitializeApplicationControl()
{ {
var button = new ActionCenterApplicationButton(application); var button = new ApplicationButton(application);
application.WindowsChanged += Application_WindowsChanged; application.WindowsChanged += Application_WindowsChanged;
button.Clicked += (o, args) => application.Start(); button.Clicked += (o, args) => application.Start();
@ -49,7 +49,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
foreach (var window in windows) foreach (var window in windows)
{ {
var button = new ActionCenterApplicationButton(application, window); var button = new ApplicationButton(application, window);
button.Clicked += (o, args) => window.Activate(); button.Clicked += (o, args) => window.Activate();
WindowPanel.Children.Add(button); WindowPanel.Children.Add(button);

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterAudioControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.AudioControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,9 +8,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml.cs
View file

@ -19,9 +19,9 @@ using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterAudioControl : UserControl, ISystemControl internal partial class AudioControl : UserControl, ISystemControl
{ {
private readonly IAudio audio; private readonly IAudio audio;
private readonly IText text; private readonly IText text;
@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private IconResource MutedIcon; private IconResource MutedIcon;
private IconResource NoDeviceIcon; private IconResource NoDeviceIcon;
public ActionCenterAudioControl(IAudio audio, IText text) internal AudioControl(IAudio audio, IText text)
{ {
this.audio = audio; this.audio = audio;
this.text = text; this.text = text;

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterClock" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.Clock" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -9,8 +9,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml.cs
View file

@ -9,13 +9,13 @@
using System.Windows.Controls; using System.Windows.Controls;
using SafeExamBrowser.UserInterface.Desktop.ViewModels; using SafeExamBrowser.UserInterface.Desktop.ViewModels;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterClock : UserControl internal partial class Clock : UserControl
{ {
private DateTimeViewModel model; private DateTimeViewModel model;
public ActionCenterClock() public Clock()
{ {
InitializeComponent(); InitializeComponent();
InitializeControl(); InitializeControl();

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterKeyboardLayoutButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.KeyboardLayoutButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

12
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs
View file

@ -11,25 +11,25 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard; using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterKeyboardLayoutButton : UserControl internal partial class KeyboardLayoutButton : UserControl
{ {
private IKeyboardLayout layout; private IKeyboardLayout layout;
public bool IsCurrent internal bool IsCurrent
{ {
set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; } set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
} }
public Guid LayoutId internal Guid LayoutId
{ {
get { return layout.Id; } get { return layout.Id; }
} }
public event EventHandler LayoutSelected; internal event EventHandler LayoutSelected;
public ActionCenterKeyboardLayoutButton(IKeyboardLayout layout) internal KeyboardLayoutButton(IKeyboardLayout layout)
{ {
this.layout = layout; this.layout = layout;

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterKeyboardLayoutControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.KeyboardLayoutControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -9,9 +9,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

10
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs
View file

@ -13,14 +13,14 @@ using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard; using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterKeyboardLayoutControl : UserControl, ISystemControl internal partial class KeyboardLayoutControl : UserControl, ISystemControl
{ {
private IKeyboard keyboard; private IKeyboard keyboard;
private IText text; private IText text;
public ActionCenterKeyboardLayoutControl(IKeyboard keyboard, IText text) internal KeyboardLayoutControl(IKeyboard keyboard, IText text)
{ {
this.keyboard = keyboard; this.keyboard = keyboard;
this.text = text; this.text = text;
@ -57,7 +57,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
{ {
foreach (var layout in keyboard.GetLayouts()) foreach (var layout in keyboard.GetLayouts())
{ {
var button = new ActionCenterKeyboardLayoutButton(layout); var button = new KeyboardLayoutButton(layout);
button.LayoutSelected += (o, args) => ActivateLayout(layout); button.LayoutSelected += (o, args) => ActivateLayout(layout);
LayoutsStackPanel.Children.Add(button); LayoutsStackPanel.Children.Add(button);
@ -81,7 +81,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
foreach (var child in LayoutsStackPanel.Children) foreach (var child in LayoutsStackPanel.Children)
{ {
if (child is ActionCenterKeyboardLayoutButton layoutButton) if (child is KeyboardLayoutButton layoutButton)
{ {
layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId; layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId;
} }

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterNotificationButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.NotificationButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml.cs
View file

@ -12,13 +12,13 @@ using SafeExamBrowser.Client.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterNotificationButton : UserControl, INotificationControl internal partial class NotificationButton : UserControl, INotificationControl
{ {
private INotificationController controller; private INotificationController controller;
public ActionCenterNotificationButton(INotificationController controller, INotificationInfo info) internal NotificationButton(INotificationController controller, INotificationInfo info)
{ {
this.controller = controller; this.controller = controller;

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterPowerSupplyControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.PowerSupplyControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml.cs
View file

@ -14,9 +14,9 @@ using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.PowerSupply; using SafeExamBrowser.SystemComponents.Contracts.PowerSupply;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterPowerSupplyControl : UserControl, ISystemControl internal partial class PowerSupplyControl : UserControl, ISystemControl
{ {
private Brush initialBrush; private Brush initialBrush;
private bool infoShown, warningShown; private bool infoShown, warningShown;
@ -24,7 +24,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private IPowerSupply powerSupply; private IPowerSupply powerSupply;
private IText text; private IText text;
public ActionCenterPowerSupplyControl(IPowerSupply powerSupply, IText text) internal PowerSupplyControl(IPowerSupply powerSupply, IText text)
{ {
this.powerSupply = powerSupply; this.powerSupply = powerSupply;
this.text = text; this.text = text;

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterQuitButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.QuitButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml.cs
View file

@ -13,13 +13,13 @@ using SafeExamBrowser.Applications.Contracts.Resources.Icons;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterQuitButton : UserControl internal partial class QuitButton : UserControl
{ {
public event QuitButtonClickedEventHandler Clicked; internal event QuitButtonClickedEventHandler Clicked;
public ActionCenterQuitButton() public QuitButton()
{ {
InitializeComponent(); InitializeComponent();
InitializeControl(); InitializeControl();

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterWirelessNetworkButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.WirelessNetworkButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml.cs
View file

@ -11,15 +11,15 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork; using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterWirelessNetworkButton : UserControl internal partial class WirelessNetworkButton : UserControl
{ {
private IWirelessNetwork network; private IWirelessNetwork network;
public event EventHandler NetworkSelected; internal event EventHandler NetworkSelected;
public ActionCenterWirelessNetworkButton(IWirelessNetwork network) internal WirelessNetworkButton(IWirelessNetwork network)
{ {
this.network = network; this.network = network;

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenterWirelessNetworkControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter.WirelessNetworkControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -9,9 +9,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml.cs
View file

@ -18,14 +18,14 @@ using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter
{ {
public partial class ActionCenterWirelessNetworkControl : UserControl, ISystemControl internal partial class WirelessNetworkControl : UserControl, ISystemControl
{ {
private IWirelessAdapter wirelessAdapter; private IWirelessAdapter wirelessAdapter;
private IText text; private IText text;
public ActionCenterWirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text) internal WirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text)
{ {
this.wirelessAdapter = wirelessAdapter; this.wirelessAdapter = wirelessAdapter;
this.text = text; this.text = text;
@ -82,7 +82,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
foreach (var network in wirelessAdapter.GetNetworks()) foreach (var network in wirelessAdapter.GetNetworks())
{ {
var button = new ActionCenterWirelessNetworkButton(network); var button = new WirelessNetworkButton(network);
button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id); button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id);

2
SafeExamBrowser.UserInterface.Desktop/Controls/Browser/DownloadItemControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Browser.DownloadItemControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Browser.DownloadItemControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

8
SafeExamBrowser.UserInterface.Desktop/Controls/Browser/DownloadItemControl.xaml.cs
View file

@ -15,13 +15,13 @@ using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls.Browser namespace SafeExamBrowser.UserInterface.Desktop.Controls.Browser
{ {
public partial class DownloadItemControl : UserControl internal partial class DownloadItemControl : UserControl
{ {
private IText text; private IText text;
public Guid Id { get; } internal Guid Id { get; }
public DownloadItemControl(Guid id, IText text) internal DownloadItemControl(Guid id, IText text)
{ {
this.Id = id; this.Id = id;
this.text = text; this.text = text;
@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Browser
InitializeComponent(); InitializeComponent();
} }
public void Update(DownloadItemState state) internal void Update(DownloadItemState state)
{ {
ItemName.Text = Uri.TryCreate(state.Url, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.AbsolutePath) : state.Url; ItemName.Text = Uri.TryCreate(state.Url, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.AbsolutePath) : state.Url;
Progress.Value = state.Completion * 100; Progress.Value = state.Completion * 100;

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarApplicationControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.ApplicationControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -9,9 +9,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs
View file

@ -17,14 +17,14 @@ using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarApplicationControl : UserControl, IApplicationControl internal partial class ApplicationControl : UserControl, IApplicationControl
{ {
private IApplication application; private IApplication application;
private IApplicationWindow single; private IApplicationWindow single;
public TaskbarApplicationControl(IApplication application) internal ApplicationControl(IApplication application)
{ {
this.application = application; this.application = application;
@ -92,7 +92,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
foreach (var window in windows) foreach (var window in windows)
{ {
WindowStackPanel.Children.Add(new TaskbarApplicationWindowButton(window)); WindowStackPanel.Children.Add(new ApplicationWindowButton(window));
} }
if (WindowStackPanel.Children.Count == 1) if (WindowStackPanel.Children.Count == 1)

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarApplicationWindowButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.ApplicationWindowButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml.cs
View file

@ -12,13 +12,13 @@ using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.Applications.Contracts.Resources.Icons; using SafeExamBrowser.Applications.Contracts.Resources.Icons;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarApplicationWindowButton : UserControl internal partial class ApplicationWindowButton : UserControl
{ {
private IApplicationWindow window; private IApplicationWindow window;
public TaskbarApplicationWindowButton(IApplicationWindow window) internal ApplicationWindowButton(IApplicationWindow window)
{ {
this.window = window; this.window = window;

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarAudioControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.AudioControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -9,9 +9,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml.cs
View file

@ -18,9 +18,9 @@ using SafeExamBrowser.SystemComponents.Contracts.Audio;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarAudioControl : UserControl, ISystemControl internal partial class AudioControl : UserControl, ISystemControl
{ {
private readonly IAudio audio; private readonly IAudio audio;
private readonly IText text; private readonly IText text;
@ -28,7 +28,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private IconResource MutedIcon; private IconResource MutedIcon;
private IconResource NoDeviceIcon; private IconResource NoDeviceIcon;
public TaskbarAudioControl(IAudio audio, IText text) internal AudioControl(IAudio audio, IText text)
{ {
this.audio = audio; this.audio = audio;
this.text = text; this.text = text;

2
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarClock.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/Clock.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarClock" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.Clock" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarClock.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/Clock.xaml.cs
View file

@ -9,13 +9,13 @@
using System.Windows.Controls; using System.Windows.Controls;
using SafeExamBrowser.UserInterface.Desktop.ViewModels; using SafeExamBrowser.UserInterface.Desktop.ViewModels;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarClock : UserControl internal partial class Clock : UserControl
{ {
private DateTimeViewModel model; private DateTimeViewModel model;
public TaskbarClock() public Clock()
{ {
InitializeComponent(); InitializeComponent();
InitializeControl(); InitializeControl();

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarKeyboardLayoutButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.KeyboardLayoutButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

12
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutButton.xaml.cs
View file

@ -11,25 +11,25 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard; using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarKeyboardLayoutButton : UserControl internal partial class KeyboardLayoutButton : UserControl
{ {
private IKeyboardLayout layout; private IKeyboardLayout layout;
public bool IsCurrent internal bool IsCurrent
{ {
set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; } set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
} }
public Guid LayoutId internal Guid LayoutId
{ {
get { return layout.Id; } get { return layout.Id; }
} }
public event EventHandler LayoutSelected; internal event EventHandler LayoutSelected;
public TaskbarKeyboardLayoutButton(IKeyboardLayout layout) internal KeyboardLayoutButton(IKeyboardLayout layout)
{ {
this.layout = layout; this.layout = layout;

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarKeyboardLayoutControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.KeyboardLayoutControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -9,9 +9,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

10
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml.cs
View file

@ -17,14 +17,14 @@ using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.Keyboard; using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarKeyboardLayoutControl : UserControl, ISystemControl internal partial class KeyboardLayoutControl : UserControl, ISystemControl
{ {
private IKeyboard keyboard; private IKeyboard keyboard;
private IText text; private IText text;
public TaskbarKeyboardLayoutControl(IKeyboard keyboard, IText text) internal KeyboardLayoutControl(IKeyboard keyboard, IText text)
{ {
this.keyboard = keyboard; this.keyboard = keyboard;
this.text = text; this.text = text;
@ -80,7 +80,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
{ {
foreach (var layout in keyboard.GetLayouts()) foreach (var layout in keyboard.GetLayouts())
{ {
var button = new TaskbarKeyboardLayoutButton(layout); var button = new KeyboardLayoutButton(layout);
button.LayoutSelected += (o, args) => ActivateLayout(layout); button.LayoutSelected += (o, args) => ActivateLayout(layout);
LayoutsStackPanel.Children.Add(button); LayoutsStackPanel.Children.Add(button);
@ -105,7 +105,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
foreach (var child in LayoutsStackPanel.Children) foreach (var child in LayoutsStackPanel.Children)
{ {
if (child is TaskbarKeyboardLayoutButton layoutButton) if (child is KeyboardLayoutButton layoutButton)
{ {
layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId; layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId;
} }

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarNotificationButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.NotificationButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml.cs
View file

@ -12,13 +12,13 @@ using SafeExamBrowser.Client.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarNotificationButton : UserControl, INotificationControl internal partial class NotificationButton : UserControl, INotificationControl
{ {
private INotificationController controller; private INotificationController controller;
public TaskbarNotificationButton(INotificationController controller, INotificationInfo info) internal NotificationButton(INotificationController controller, INotificationInfo info)
{ {
this.controller = controller; this.controller = controller;

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarPowerSupplyControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.PowerSupplyControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml.cs
View file

@ -16,9 +16,9 @@ using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.SystemComponents.Contracts.PowerSupply; using SafeExamBrowser.SystemComponents.Contracts.PowerSupply;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarPowerSupplyControl : UserControl, ISystemControl internal partial class PowerSupplyControl : UserControl, ISystemControl
{ {
private Brush initialBrush; private Brush initialBrush;
private bool infoShown, warningShown; private bool infoShown, warningShown;
@ -26,7 +26,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
private IPowerSupply powerSupply; private IPowerSupply powerSupply;
private IText text; private IText text;
public TaskbarPowerSupplyControl(IPowerSupply powerSupply, IText text) internal PowerSupplyControl(IPowerSupply powerSupply, IText text)
{ {
this.powerSupply = powerSupply; this.powerSupply = powerSupply;
this.text = text; this.text = text;

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarQuitButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.QuitButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml.cs
View file

@ -14,13 +14,13 @@ using SafeExamBrowser.Applications.Contracts.Resources.Icons;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarQuitButton : UserControl internal partial class QuitButton : UserControl
{ {
public event QuitButtonClickedEventHandler Clicked; internal event QuitButtonClickedEventHandler Clicked;
public TaskbarQuitButton() public QuitButton()
{ {
InitializeComponent(); InitializeComponent();
LoadIcon(); LoadIcon();

6
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarWirelessNetworkButton" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.WirelessNetworkButton" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -8,8 +8,8 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml.cs
View file

@ -11,15 +11,15 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork; using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarWirelessNetworkButton : UserControl internal partial class WirelessNetworkButton : UserControl
{ {
private IWirelessNetwork network; private IWirelessNetwork network;
public event EventHandler NetworkSelected; internal event EventHandler NetworkSelected;
public TaskbarWirelessNetworkButton(IWirelessNetwork network) internal WirelessNetworkButton(IWirelessNetwork network)
{ {
this.network = network; this.network = network;

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskbarWirelessNetworkControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar.WirelessNetworkControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -10,9 +10,9 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Buttons.xaml" /> <ResourceDictionary Source="../../Templates/Buttons.xaml" />
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
<ResourceDictionary Source="../Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml.cs
View file

@ -19,14 +19,14 @@ using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
{ {
public partial class TaskbarWirelessNetworkControl : UserControl, ISystemControl internal partial class WirelessNetworkControl : UserControl, ISystemControl
{ {
private IWirelessAdapter wirelessAdapter; private IWirelessAdapter wirelessAdapter;
private IText text; private IText text;
public TaskbarWirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text) internal WirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text)
{ {
this.wirelessAdapter = wirelessAdapter; this.wirelessAdapter = wirelessAdapter;
this.text = text; this.text = text;
@ -102,7 +102,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
foreach (var network in wirelessAdapter.GetNetworks()) foreach (var network in wirelessAdapter.GetNetworks())
{ {
var button = new TaskbarWirelessNetworkButton(network); var button = new WirelessNetworkButton(network);
button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id); button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id);

4
SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml → SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.TaskviewWindowControl" <UserControl x:Class="SafeExamBrowser.UserInterface.Desktop.Controls.Taskview.WindowControl" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -7,7 +7,7 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Templates/Colors.xaml" /> <ResourceDictionary Source="../../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>

8
SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml.cs
View file

@ -14,15 +14,15 @@ using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.Applications.Contracts.Resources.Icons; using SafeExamBrowser.Applications.Contracts.Resources.Icons;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop.Controls namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskview
{ {
public partial class TaskviewWindowControl : UserControl internal partial class WindowControl : UserControl
{ {
private Taskview taskview; private Windows.Taskview taskview;
private IntPtr thumbnail; private IntPtr thumbnail;
private IApplicationWindow window; private IApplicationWindow window;
public TaskviewWindowControl(IApplicationWindow window, Taskview taskview) internal WindowControl(IApplicationWindow window, Windows.Taskview taskview)
{ {
this.window = window; this.window = window;
this.taskview = taskview; this.taskview = taskview;

1
SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs
View file

@ -10,6 +10,7 @@ using System.Windows;
using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Desktop.Windows;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop
{ {

183
SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj
View file

@ -67,108 +67,108 @@
<Reference Include="WindowsFormsIntegration" /> <Reference Include="WindowsFormsIntegration" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AboutWindow.xaml.cs"> <Compile Include="Windows\AboutWindow.xaml.cs">
<DependentUpon>AboutWindow.xaml</DependentUpon> <DependentUpon>AboutWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ActionCenter.xaml.cs"> <Compile Include="Windows\ActionCenter.xaml.cs">
<DependentUpon>ActionCenter.xaml</DependentUpon> <DependentUpon>ActionCenter.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="BrowserWindow.xaml.cs"> <Compile Include="Windows\BrowserWindow.xaml.cs">
<DependentUpon>BrowserWindow.xaml</DependentUpon> <DependentUpon>BrowserWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterApplicationControl.xaml.cs"> <Compile Include="Controls\ActionCenter\ApplicationControl.xaml.cs">
<DependentUpon>ActionCenterApplicationControl.xaml</DependentUpon> <DependentUpon>ApplicationControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterApplicationButton.xaml.cs"> <Compile Include="Controls\ActionCenter\ApplicationButton.xaml.cs">
<DependentUpon>ActionCenterApplicationButton.xaml</DependentUpon> <DependentUpon>ApplicationButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterAudioControl.xaml.cs"> <Compile Include="Controls\ActionCenter\AudioControl.xaml.cs">
<DependentUpon>ActionCenterAudioControl.xaml</DependentUpon> <DependentUpon>AudioControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterClock.xaml.cs"> <Compile Include="Controls\ActionCenter\Clock.xaml.cs">
<DependentUpon>ActionCenterClock.xaml</DependentUpon> <DependentUpon>Clock.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterKeyboardLayoutButton.xaml.cs"> <Compile Include="Controls\ActionCenter\KeyboardLayoutButton.xaml.cs">
<DependentUpon>ActionCenterKeyboardLayoutButton.xaml</DependentUpon> <DependentUpon>KeyboardLayoutButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterKeyboardLayoutControl.xaml.cs"> <Compile Include="Controls\ActionCenter\KeyboardLayoutControl.xaml.cs">
<DependentUpon>ActionCenterKeyboardLayoutControl.xaml</DependentUpon> <DependentUpon>KeyboardLayoutControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterNotificationButton.xaml.cs"> <Compile Include="Controls\ActionCenter\NotificationButton.xaml.cs">
<DependentUpon>ActionCenterNotificationButton.xaml</DependentUpon> <DependentUpon>NotificationButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterPowerSupplyControl.xaml.cs"> <Compile Include="Controls\ActionCenter\PowerSupplyControl.xaml.cs">
<DependentUpon>ActionCenterPowerSupplyControl.xaml</DependentUpon> <DependentUpon>PowerSupplyControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterQuitButton.xaml.cs"> <Compile Include="Controls\ActionCenter\QuitButton.xaml.cs">
<DependentUpon>ActionCenterQuitButton.xaml</DependentUpon> <DependentUpon>QuitButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterWirelessNetworkButton.xaml.cs"> <Compile Include="Controls\ActionCenter\WirelessNetworkButton.xaml.cs">
<DependentUpon>ActionCenterWirelessNetworkButton.xaml</DependentUpon> <DependentUpon>WirelessNetworkButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ActionCenterWirelessNetworkControl.xaml.cs"> <Compile Include="Controls\ActionCenter\WirelessNetworkControl.xaml.cs">
<DependentUpon>ActionCenterWirelessNetworkControl.xaml</DependentUpon> <DependentUpon>WirelessNetworkControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\Browser\DownloadItemControl.xaml.cs"> <Compile Include="Controls\Browser\DownloadItemControl.xaml.cs">
<DependentUpon>DownloadItemControl.xaml</DependentUpon> <DependentUpon>DownloadItemControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarApplicationControl.xaml.cs"> <Compile Include="Controls\Taskbar\ApplicationControl.xaml.cs">
<DependentUpon>TaskbarApplicationControl.xaml</DependentUpon> <DependentUpon>ApplicationControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarApplicationWindowButton.xaml.cs"> <Compile Include="Controls\Taskbar\ApplicationWindowButton.xaml.cs">
<DependentUpon>TaskbarApplicationWindowButton.xaml</DependentUpon> <DependentUpon>ApplicationWindowButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarAudioControl.xaml.cs"> <Compile Include="Controls\Taskbar\AudioControl.xaml.cs">
<DependentUpon>TaskbarAudioControl.xaml</DependentUpon> <DependentUpon>AudioControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarClock.xaml.cs"> <Compile Include="Controls\Taskbar\Clock.xaml.cs">
<DependentUpon>TaskbarClock.xaml</DependentUpon> <DependentUpon>Clock.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarKeyboardLayoutButton.xaml.cs"> <Compile Include="Controls\Taskbar\KeyboardLayoutButton.xaml.cs">
<DependentUpon>TaskbarKeyboardLayoutButton.xaml</DependentUpon> <DependentUpon>KeyboardLayoutButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarKeyboardLayoutControl.xaml.cs"> <Compile Include="Controls\Taskbar\KeyboardLayoutControl.xaml.cs">
<DependentUpon>TaskbarKeyboardLayoutControl.xaml</DependentUpon> <DependentUpon>KeyboardLayoutControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarNotificationButton.xaml.cs"> <Compile Include="Controls\Taskbar\NotificationButton.xaml.cs">
<DependentUpon>TaskbarNotificationButton.xaml</DependentUpon> <DependentUpon>NotificationButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarPowerSupplyControl.xaml.cs"> <Compile Include="Controls\Taskbar\PowerSupplyControl.xaml.cs">
<DependentUpon>TaskbarPowerSupplyControl.xaml</DependentUpon> <DependentUpon>PowerSupplyControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarQuitButton.xaml.cs"> <Compile Include="Controls\Taskbar\QuitButton.xaml.cs">
<DependentUpon>TaskbarQuitButton.xaml</DependentUpon> <DependentUpon>QuitButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarWirelessNetworkButton.xaml.cs"> <Compile Include="Controls\Taskbar\WirelessNetworkButton.xaml.cs">
<DependentUpon>TaskbarWirelessNetworkButton.xaml</DependentUpon> <DependentUpon>WirelessNetworkButton.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskbarWirelessNetworkControl.xaml.cs"> <Compile Include="Controls\Taskbar\WirelessNetworkControl.xaml.cs">
<DependentUpon>TaskbarWirelessNetworkControl.xaml</DependentUpon> <DependentUpon>WirelessNetworkControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TaskviewWindowControl.xaml.cs"> <Compile Include="Controls\Taskview\WindowControl.xaml.cs">
<DependentUpon>TaskviewWindowControl.xaml</DependentUpon> <DependentUpon>WindowControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="FileSystemDialog.xaml.cs"> <Compile Include="Windows\FileSystemDialog.xaml.cs">
<DependentUpon>FileSystemDialog.xaml</DependentUpon> <DependentUpon>FileSystemDialog.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="FileSystemDialogFactory.cs" /> <Compile Include="FileSystemDialogFactory.cs" />
<Compile Include="LockScreen.xaml.cs"> <Compile Include="Windows\LockScreen.xaml.cs">
<DependentUpon>LockScreen.xaml</DependentUpon> <DependentUpon>LockScreen.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="LogWindow.xaml.cs"> <Compile Include="Windows\LogWindow.xaml.cs">
<DependentUpon>LogWindow.xaml</DependentUpon> <DependentUpon>LogWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="MessageBox.cs" /> <Compile Include="MessageBox.cs" />
<Compile Include="PasswordDialog.xaml.cs"> <Compile Include="Windows\PasswordDialog.xaml.cs">
<DependentUpon>PasswordDialog.xaml</DependentUpon> <DependentUpon>PasswordDialog.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="RuntimeWindow.xaml.cs"> <Compile Include="Windows\RuntimeWindow.xaml.cs">
<DependentUpon>RuntimeWindow.xaml</DependentUpon> <DependentUpon>RuntimeWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="SplashScreen.xaml.cs"> <Compile Include="Windows\SplashScreen.xaml.cs">
<DependentUpon>SplashScreen.xaml</DependentUpon> <DependentUpon>SplashScreen.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Taskview.xaml.cs"> <Compile Include="Windows\Taskview.xaml.cs">
<DependentUpon>Taskview.xaml</DependentUpon> <DependentUpon>Taskview.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UserInterfaceFactory.cs" /> <Compile Include="UserInterfaceFactory.cs" />
@ -176,59 +176,59 @@
<Compile Include="ViewModels\LogViewModel.cs" /> <Compile Include="ViewModels\LogViewModel.cs" />
<Compile Include="ViewModels\ProgressIndicatorViewModel.cs" /> <Compile Include="ViewModels\ProgressIndicatorViewModel.cs" />
<Compile Include="ViewModels\RuntimeWindowViewModel.cs" /> <Compile Include="ViewModels\RuntimeWindowViewModel.cs" />
<Page Include="AboutWindow.xaml"> <Page Include="Windows\AboutWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="ActionCenter.xaml"> <Page Include="Windows\ActionCenter.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="BrowserWindow.xaml"> <Page Include="Windows\BrowserWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterApplicationControl.xaml"> <Page Include="Controls\ActionCenter\ApplicationControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterApplicationButton.xaml"> <Page Include="Controls\ActionCenter\ApplicationButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterAudioControl.xaml"> <Page Include="Controls\ActionCenter\AudioControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterClock.xaml"> <Page Include="Controls\ActionCenter\Clock.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterKeyboardLayoutButton.xaml"> <Page Include="Controls\ActionCenter\KeyboardLayoutButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterKeyboardLayoutControl.xaml"> <Page Include="Controls\ActionCenter\KeyboardLayoutControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterNotificationButton.xaml"> <Page Include="Controls\ActionCenter\NotificationButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterPowerSupplyControl.xaml"> <Page Include="Controls\ActionCenter\PowerSupplyControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterQuitButton.xaml"> <Page Include="Controls\ActionCenter\QuitButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterWirelessNetworkButton.xaml"> <Page Include="Controls\ActionCenter\WirelessNetworkButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\ActionCenterWirelessNetworkControl.xaml"> <Page Include="Controls\ActionCenter\WirelessNetworkControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -236,39 +236,39 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarApplicationControl.xaml"> <Page Include="Controls\Taskbar\ApplicationControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarApplicationWindowButton.xaml"> <Page Include="Controls\Taskbar\ApplicationWindowButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarAudioControl.xaml"> <Page Include="Controls\Taskbar\AudioControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarClock.xaml"> <Page Include="Controls\Taskbar\Clock.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarKeyboardLayoutButton.xaml"> <Page Include="Controls\Taskbar\KeyboardLayoutButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarKeyboardLayoutControl.xaml"> <Page Include="Controls\Taskbar\KeyboardLayoutControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarNotificationButton.xaml"> <Page Include="Controls\Taskbar\NotificationButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarPowerSupplyControl.xaml"> <Page Include="Controls\Taskbar\PowerSupplyControl.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Controls\TaskbarQuitButton.xaml"> <Page Include="Controls\Taskbar\QuitButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -328,19 +328,19 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Resource> </Resource>
<Page Include="Controls\TaskviewWindowControl.xaml"> <Page Include="Controls\Taskview\WindowControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="FileSystemDialog.xaml"> <Page Include="Windows\FileSystemDialog.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="LockScreen.xaml"> <Page Include="Windows\LockScreen.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Taskview.xaml"> <Page Include="Windows\Taskview.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -400,11 +400,11 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Resource> </Resource>
<Page Include="Controls\TaskbarWirelessNetworkButton.xaml"> <Page Include="Controls\Taskbar\WirelessNetworkButton.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\TaskbarWirelessNetworkControl.xaml"> <Page Include="Controls\Taskbar\WirelessNetworkControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -412,27 +412,27 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Resource> </Resource>
<Page Include="LogWindow.xaml"> <Page Include="Windows\LogWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="PasswordDialog.xaml"> <Page Include="Windows\PasswordDialog.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="RuntimeWindow.xaml"> <Page Include="Windows\RuntimeWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="SplashScreen.xaml"> <Page Include="Windows\SplashScreen.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Taskbar.xaml"> <Page Include="Windows\Taskbar.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Compile Include="Taskbar.xaml.cs"> <Compile Include="Windows\Taskbar.xaml.cs">
<DependentUpon>Taskbar.xaml</DependentUpon> <DependentUpon>Taskbar.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -500,5 +500,6 @@
<ItemGroup> <ItemGroup>
<Resource Include="Images\SplashScreen.png" /> <Resource Include="Images\SplashScreen.png" />
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

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

@ -26,7 +26,8 @@ using SafeExamBrowser.UserInterface.Contracts.Browser;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Contracts.Windows.Data; using SafeExamBrowser.UserInterface.Contracts.Windows.Data;
using SafeExamBrowser.UserInterface.Desktop.Controls; using SafeExamBrowser.UserInterface.Desktop.Windows;
using SplashScreen = SafeExamBrowser.UserInterface.Desktop.Windows.SplashScreen;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop
{ {
@ -50,11 +51,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
{ {
if (location == Location.ActionCenter) if (location == Location.ActionCenter)
{ {
return new ActionCenterApplicationControl(application); return new Controls.ActionCenter.ApplicationControl(application);
} }
else else
{ {
return new TaskbarApplicationControl(application); return new Controls.Taskbar.ApplicationControl(application);
} }
} }
@ -62,11 +63,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
{ {
if (location == Location.ActionCenter) if (location == Location.ActionCenter)
{ {
return new ActionCenterAudioControl(audio, text); return new Controls.ActionCenter.AudioControl(audio, text);
} }
else else
{ {
return new TaskbarAudioControl(audio, text); return new Controls.Taskbar.AudioControl(audio, text);
} }
} }
@ -79,11 +80,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
{ {
if (location == Location.ActionCenter) if (location == Location.ActionCenter)
{ {
return new ActionCenterKeyboardLayoutControl(keyboard, text); return new Controls.ActionCenter.KeyboardLayoutControl(keyboard, text);
} }
else else
{ {
return new TaskbarKeyboardLayoutControl(keyboard, text); return new Controls.Taskbar.KeyboardLayoutControl(keyboard, text);
} }
} }
@ -120,11 +121,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
{ {
if (location == Location.ActionCenter) if (location == Location.ActionCenter)
{ {
return new ActionCenterNotificationButton(controller, info); return new Controls.ActionCenter.NotificationButton(controller, info);
} }
else else
{ {
return new TaskbarNotificationButton(controller, info); return new Controls.Taskbar.NotificationButton(controller, info);
} }
} }
@ -142,11 +143,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
{ {
if (location == Location.ActionCenter) if (location == Location.ActionCenter)
{ {
return new ActionCenterPowerSupplyControl(powerSupply, text); return new Controls.ActionCenter.PowerSupplyControl(powerSupply, text);
} }
else else
{ {
return new TaskbarPowerSupplyControl(powerSupply, text); return new Controls.Taskbar.PowerSupplyControl(powerSupply, text);
} }
} }
@ -183,11 +184,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
{ {
if (location == Location.ActionCenter) if (location == Location.ActionCenter)
{ {
return new ActionCenterWirelessNetworkControl(wirelessAdapter, text); return new Controls.ActionCenter.WirelessNetworkControl(wirelessAdapter, text);
} }
else else
{ {
return new TaskbarWirelessNetworkControl(wirelessAdapter, text); return new Controls.Taskbar.WirelessNetworkControl(wirelessAdapter, text);
} }
} }

6
SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml
View file

@ -1,15 +1,15 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.AboutWindow" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.AboutWindow" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop"
mc:Ignorable="d" Background="White" Height="350" Width="575" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico" ShowInTaskbar="False" mc:Ignorable="d" Background="White" Height="350" Width="575" ResizeMode="NoResize" Icon="../Images/SafeExamBrowser.ico" ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

6
SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml.cs
View file

@ -14,9 +14,9 @@ using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class AboutWindow : Window, IWindow internal partial class AboutWindow : Window, IWindow
{ {
private AppConfig appConfig; private AppConfig appConfig;
private IText text; private IText text;
@ -28,7 +28,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { closing -= value; } remove { closing -= value; }
} }
public AboutWindow(AppConfig appConfig, IText text) internal AboutWindow(AppConfig appConfig, IText text)
{ {
this.appConfig = appConfig; this.appConfig = appConfig;
this.text = text; this.text = text;

12
SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml
View file

@ -1,16 +1,16 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.ActionCenter" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.ActionCenter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter"
mc:Ignorable="d" Title="ActionCenter" Height="1000" Width="400" Background="{DynamicResource BackgroundTransparentBrush}" mc:Ignorable="d" Title="ActionCenter" Height="1000" Width="400" Background="{DynamicResource BackgroundTransparentBrush}"
AllowsTransparency="True" WindowStyle="None" Topmost="True" ResizeMode="NoResize"> AllowsTransparency="True" WindowStyle="None" Topmost="True" ResizeMode="NoResize">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/Colors.xaml" /> <ResourceDictionary Source="../Templates/Colors.xaml" />
<ResourceDictionary Source="./Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
@ -23,8 +23,8 @@
<StackPanel x:Name="ApplicationPanel" Orientation="Vertical" /> <StackPanel x:Name="ApplicationPanel" Orientation="Vertical" />
</ScrollViewer> </ScrollViewer>
<UniformGrid x:Name="ControlPanel" Grid.Row="1" Columns="4" Margin="10"> <UniformGrid x:Name="ControlPanel" Grid.Row="1" Columns="4" Margin="10">
<local:ActionCenterClock x:Name="Clock" /> <local:Clock x:Name="Clock" />
<local:ActionCenterQuitButton x:Name="QuitButton" /> <local:QuitButton x:Name="QuitButton" />
</UniformGrid> </UniformGrid>
</Grid> </Grid>
</Window> </Window>

2
SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml.cs
View file

@ -13,7 +13,7 @@ using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class ActionCenter : Window, IActionCenter public partial class ActionCenter : Window, IActionCenter
{ {

10
SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml
View file

@ -1,17 +1,17 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.BrowserWindow" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.BrowserWindow" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:fa="http://schemas.fontawesome.io/icons/" xmlns:fa="http://schemas.fontawesome.io/icons/"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls"
mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon=".\Images\SafeExamBrowser.ico"> mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon="../Images/SafeExamBrowser.ico">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/Buttons.xaml" /> <ResourceDictionary Source="../Templates/Buttons.xaml" />
<ResourceDictionary Source="./Templates/Colors.xaml" /> <ResourceDictionary Source="../Templates/Colors.xaml" />
<ResourceDictionary Source="./Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

6
SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
View file

@ -26,9 +26,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
using SafeExamBrowser.UserInterface.Desktop.Controls.Browser; using SafeExamBrowser.UserInterface.Desktop.Controls.Browser;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class BrowserWindow : Window, IBrowserWindow internal partial class BrowserWindow : Window, IBrowserWindow
{ {
private bool isMainWindow; private bool isMainWindow;
private BrowserSettings settings; private BrowserSettings settings;
@ -59,7 +59,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { closing -= value; } remove { closing -= value; }
} }
public BrowserWindow(IBrowserControl browserControl, BrowserSettings settings, bool isMainWindow, IText text) internal BrowserWindow(IBrowserControl browserControl, BrowserSettings settings, bool isMainWindow, IText text)
{ {
this.isMainWindow = isMainWindow; this.isMainWindow = isMainWindow;
this.settings = settings; this.settings = settings;

4
SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml
View file

@ -1,4 +1,4 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.FileSystemDialog" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.FileSystemDialog" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -9,7 +9,7 @@
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/Colors.xaml" /> <ResourceDictionary Source="../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

6
SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs
View file

@ -20,9 +20,9 @@ using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class FileSystemDialog : Window internal partial class FileSystemDialog : Window
{ {
private FileSystemElement element; private FileSystemElement element;
private string initialPath; private string initialPath;
@ -32,7 +32,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
private IText text; private IText text;
private string title; private string title;
public FileSystemDialog( internal FileSystemDialog(
FileSystemElement element, FileSystemElement element,
FileSystemOperation operation, FileSystemOperation operation,
IText text, IText text,

4
SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml
View file

@ -1,4 +1,4 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.LockScreen" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.LockScreen" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -19,7 +19,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Grid.Column="1" Orientation="Vertical"> <StackPanel Grid.Column="1" Orientation="Vertical">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,10"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,10">
<Image Height="75" Margin="0,0,20,0" Source="./Images/SafeExamBrowser.ico" /> <Image Height="75" Margin="0,0,20,0" Source="../Images/SafeExamBrowser.ico" />
<TextBlock Name="Heading" Foreground="White" FontSize="50" FontWeight="ExtraBold" TextAlignment="Center" Text="SEB LOCKED" /> <TextBlock Name="Heading" Foreground="White" FontSize="50" FontWeight="ExtraBold" TextAlignment="Center" Text="SEB LOCKED" />
</StackPanel> </StackPanel>
<TextBlock Name="Message" Foreground="White" FontSize="16" FontWeight="DemiBold" Margin="0,10" Padding="5" TextWrapping="Wrap" /> <TextBlock Name="Message" Foreground="White" FontSize="16" FontWeight="DemiBold" Margin="0,10" Padding="5" TextWrapping="Wrap" />

6
SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs
View file

@ -21,9 +21,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
using Screen = System.Windows.Forms.Screen; using Screen = System.Windows.Forms.Screen;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class LockScreen : Window, ILockScreen internal partial class LockScreen : Window, ILockScreen
{ {
private AutoResetEvent autoResetEvent; private AutoResetEvent autoResetEvent;
private IList<Window> windows; private IList<Window> windows;
@ -35,7 +35,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { throw new NotImplementedException(); } remove { throw new NotImplementedException(); }
} }
public LockScreen(string message, string title, IText text, IEnumerable<LockScreenOption> options) internal LockScreen(string message, string title, IText text, IEnumerable<LockScreenOption> options)
{ {
this.autoResetEvent = new AutoResetEvent(false); this.autoResetEvent = new AutoResetEvent(false);
this.text = text; this.text = text;

6
SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml
View file

@ -1,15 +1,15 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.LogWindow" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.LogWindow" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop"
mc:Ignorable="d" Title="{Binding Path=WindowTitle}" Background="Black" Foreground="White" Height="750" Width="1000" MinHeight="350" mc:Ignorable="d" Title="{Binding Path=WindowTitle}" Background="Black" Foreground="White" Height="750" Width="1000" MinHeight="350"
MinWidth="350" Topmost="True" WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico"> MinWidth="350" Topmost="True" WindowStartupLocation="CenterScreen" Icon="../Images/LogNotification.ico">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

6
SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml.cs
View file

@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
using SafeExamBrowser.UserInterface.Desktop.ViewModels; using SafeExamBrowser.UserInterface.Desktop.ViewModels;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class LogWindow : Window, IWindow internal partial class LogWindow : Window, IWindow
{ {
private ILogger logger; private ILogger logger;
private LogViewModel model; private LogViewModel model;
@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { closing -= value; } remove { closing -= value; }
} }
public LogWindow(ILogger logger, IText text) internal LogWindow(ILogger logger, IText text)
{ {
InitializeComponent(); InitializeComponent();

4
SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml
View file

@ -1,4 +1,4 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.PasswordDialog" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.PasswordDialog" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -9,7 +9,7 @@
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/Colors.xaml" /> <ResourceDictionary Source="../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

6
SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml.cs
View file

@ -13,9 +13,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Contracts.Windows.Data; using SafeExamBrowser.UserInterface.Contracts.Windows.Data;
using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class PasswordDialog : Window, IPasswordDialog internal partial class PasswordDialog : Window, IPasswordDialog
{ {
private IText text; private IText text;
private WindowClosingEventHandler closing; private WindowClosingEventHandler closing;
@ -26,7 +26,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { closing -= value; } remove { closing -= value; }
} }
public PasswordDialog(string message, string title, IText text) internal PasswordDialog(string message, string title, IText text)
{ {
this.text = text; this.text = text;

6
SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml
View file

@ -1,4 +1,4 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.RuntimeWindow" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.RuntimeWindow" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -6,11 +6,11 @@
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop"
xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:s="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d" Background="White" Foreground="Black" Height="500" Width="850" WindowStyle="None" WindowStartupLocation="CenterScreen" mc:Ignorable="d" Background="White" Foreground="Black" Height="500" Width="850" WindowStyle="None" WindowStartupLocation="CenterScreen"
Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True"> Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

8
SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml.cs
View file

@ -16,9 +16,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
using SafeExamBrowser.UserInterface.Desktop.ViewModels; using SafeExamBrowser.UserInterface.Desktop.ViewModels;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class RuntimeWindow : Window, IRuntimeWindow internal partial class RuntimeWindow : Window, IRuntimeWindow
{ {
private bool allowClose; private bool allowClose;
private AppConfig appConfig; private AppConfig appConfig;
@ -31,7 +31,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
set => Dispatcher.Invoke(() => LogScrollViewer.Visibility = value ? Visibility.Visible : Visibility.Collapsed); set => Dispatcher.Invoke(() => LogScrollViewer.Visibility = value ? Visibility.Visible : Visibility.Collapsed);
} }
bool IRuntimeWindow.ShowProgressBar public bool ShowProgressBar
{ {
set set
{ {
@ -54,7 +54,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { closing -= value; } remove { closing -= value; }
} }
public RuntimeWindow(AppConfig appConfig, IText text) internal RuntimeWindow(AppConfig appConfig, IText text)
{ {
this.appConfig = appConfig; this.appConfig = appConfig;
this.text = text; this.text = text;

4
SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml
View file

@ -1,4 +1,4 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.SplashScreen" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.SplashScreen" x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -6,7 +6,7 @@
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop"
mc:Ignorable="d" mc:Ignorable="d"
Title="SplashScreen" Background="White" Height="200" Width="350" WindowStyle="None" WindowStartupLocation="CenterScreen" Title="SplashScreen" Background="White" Height="200" Width="350" WindowStyle="None" WindowStartupLocation="CenterScreen"
Cursor="Wait" Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True"> Cursor="Wait" Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True">
<Border BorderBrush="DodgerBlue" BorderThickness="1"> <Border BorderBrush="DodgerBlue" BorderThickness="1">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>

6
SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml.cs
View file

@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
using SafeExamBrowser.UserInterface.Desktop.ViewModels; using SafeExamBrowser.UserInterface.Desktop.ViewModels;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class SplashScreen : Window, ISplashScreen internal partial class SplashScreen : Window, ISplashScreen
{ {
private bool allowClose; private bool allowClose;
private ProgressIndicatorViewModel model = new ProgressIndicatorViewModel(); private ProgressIndicatorViewModel model = new ProgressIndicatorViewModel();
@ -43,7 +43,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
remove { closing -= value; } remove { closing -= value; }
} }
public SplashScreen(IText text, AppConfig appConfig = null) internal SplashScreen(IText text, AppConfig appConfig = null)
{ {
this.appConfig = appConfig; this.appConfig = appConfig;
this.text = text; this.text = text;

14
SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml
View file

@ -1,17 +1,17 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.Taskbar" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.Taskbar"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar"
xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:s="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d" Title="Taskbar" Background="{DynamicResource BackgroundBrush}" Height="40" Width="750" WindowStyle="None" Topmost="True" mc:Ignorable="d" Title="Taskbar" Background="{DynamicResource BackgroundBrush}" Height="40" Width="750" WindowStyle="None" Topmost="True"
ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico"> ResizeMode="NoResize" Icon="../Images/SafeExamBrowser.ico">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/Colors.xaml" /> <ResourceDictionary Source="../Templates/Colors.xaml" />
<ResourceDictionary Source="./Templates/ScrollViewers.xaml" /> <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
@ -28,7 +28,7 @@
</ScrollViewer> </ScrollViewer>
<StackPanel Grid.Column="1" x:Name="NotificationStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" /> <StackPanel Grid.Column="1" x:Name="NotificationStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" />
<StackPanel Grid.Column="2" x:Name="SystemControlStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" /> <StackPanel Grid.Column="2" x:Name="SystemControlStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" />
<local:TaskbarClock Grid.Column="3" x:Name="Clock" Foreground="{StaticResource SecondaryTextBrush}" Padding="10,0,10,0" /> <local:Clock Grid.Column="3" x:Name="Clock" Foreground="{StaticResource SecondaryTextBrush}" Padding="10,0,10,0" />
<local:TaskbarQuitButton Grid.Column="4" x:Name="QuitButton" /> <local:QuitButton Grid.Column="4" x:Name="QuitButton" />
</Grid> </Grid>
</Window> </Window>

2
SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs
View file

@ -14,7 +14,7 @@ using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class Taskbar : Window, ITaskbar public partial class Taskbar : Window, ITaskbar
{ {

4
SafeExamBrowser.UserInterface.Desktop/TaskView.xaml → SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml
View file

@ -1,4 +1,4 @@
<Window x:Class="SafeExamBrowser.UserInterface.Desktop.Taskview" <Window x:Class="SafeExamBrowser.UserInterface.Desktop.Windows.Taskview"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -9,7 +9,7 @@
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="./Templates/Colors.xaml" /> <ResourceDictionary Source="../Templates/Colors.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>

12
SafeExamBrowser.UserInterface.Desktop/TaskView.xaml.cs → SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml.cs
View file

@ -14,22 +14,22 @@ using System.Windows.Controls;
using System.Windows.Interop; using System.Windows.Interop;
using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell;
using SafeExamBrowser.UserInterface.Desktop.Controls; using SafeExamBrowser.UserInterface.Desktop.Controls.Taskview;
namespace SafeExamBrowser.UserInterface.Desktop namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
public partial class Taskview : Window, ITaskview public partial class Taskview : Window, ITaskview
{ {
private IList<IApplication> applications; private IList<IApplication> applications;
private LinkedListNode<TaskviewWindowControl> current; private LinkedListNode<WindowControl> current;
private LinkedList<TaskviewWindowControl> controls; private LinkedList<WindowControl> controls;
internal IntPtr Handle { get; private set; } internal IntPtr Handle { get; private set; }
public Taskview() public Taskview()
{ {
applications = new List<IApplication>(); applications = new List<IApplication>();
controls = new LinkedList<TaskviewWindowControl>(); controls = new LinkedList<WindowControl>();
InitializeComponent(); InitializeComponent();
InitializeTaskview(); InitializeTaskview();
@ -152,7 +152,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
for (var column = 0; column < maxColumns && windows.Any(); column++) for (var column = 0; column < maxColumns && windows.Any(); column++)
{ {
var window = windows.Pop(); var window = windows.Pop();
var control = new TaskviewWindowControl(window, this); var control = new WindowControl(window, this);
controls.AddLast(control); controls.AddLast(control);
row.Children.Add(control); row.Children.Add(control);