diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index 081e5a26..423ab593 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -276,7 +276,7 @@ namespace SafeExamBrowser.Client case UserInterfaceMode.Mobile: return new Mobile.ActionCenter(); default: - return new Desktop.ActionCenter(); + return new Desktop.Windows.ActionCenter(); } } @@ -309,7 +309,7 @@ namespace SafeExamBrowser.Client case UserInterfaceMode.Mobile: return new Mobile.Taskbar(ModuleLogger(nameof(Mobile.Taskbar))); 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: return new Mobile.Taskview(); default: - return new Desktop.Taskview(); + return new Desktop.Windows.Taskview(); } } diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml similarity index 85% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml index 627c5f4d..ca45ac61 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml.cs similarity index 87% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml.cs index dc5da1dd..0c177680 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationButton.xaml.cs @@ -12,16 +12,16 @@ using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts.Resources.Icons; 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 IApplicationWindow window; internal event EventHandler Clicked; - public ActionCenterApplicationButton(IApplication application, IApplicationWindow window = null) + internal ApplicationButton(IApplication application, IApplicationWindow window = null) { this.application = application; this.window = window; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml similarity index 82% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml index a6d057f6..d224a294 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml.cs similarity index 81% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml.cs index 7f1c14ae..ce577ec9 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/ApplicationControl.xaml.cs @@ -11,13 +11,13 @@ using System.Windows.Controls; using SafeExamBrowser.Applications.Contracts; 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; - public ActionCenterApplicationControl(IApplication application) + internal ApplicationControl(IApplication application) { this.application = application; @@ -27,7 +27,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls private void InitializeApplicationControl() { - var button = new ActionCenterApplicationButton(application); + var button = new ApplicationButton(application); application.WindowsChanged += Application_WindowsChanged; button.Clicked += (o, args) => application.Start(); @@ -49,7 +49,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls foreach (var window in windows) { - var button = new ActionCenterApplicationButton(application, window); + var button = new ApplicationButton(application, window); button.Clicked += (o, args) => window.Activate(); WindowPanel.Children.Add(button); diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml similarity index 90% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml index 0e454563..d81f0bf8 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml.cs index 6a1ef1b5..251c15dd 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterAudioControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/AudioControl.xaml.cs @@ -19,9 +19,9 @@ using SafeExamBrowser.SystemComponents.Contracts.Audio; using SafeExamBrowser.UserInterface.Contracts.Shell; 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 IText text; @@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls private IconResource MutedIcon; private IconResource NoDeviceIcon; - public ActionCenterAudioControl(IAudio audio, IText text) + internal AudioControl(IAudio audio, IText text) { this.audio = audio; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml similarity index 90% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml index ab5d8090..27ac0a64 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml.cs similarity index 82% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml.cs index 43c8c18c..3ded34f5 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterClock.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/Clock.xaml.cs @@ -9,13 +9,13 @@ using System.Windows.Controls; 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; - public ActionCenterClock() + public Clock() { InitializeComponent(); InitializeControl(); diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml index ffcf0fe8..85af0d8a 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs similarity index 76% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs index 1cd823d8..6c55c121 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs @@ -11,25 +11,25 @@ using System.Windows; using System.Windows.Controls; 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; - public bool IsCurrent + internal bool IsCurrent { set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; } } - public Guid LayoutId + internal Guid LayoutId { get { return layout.Id; } } - public event EventHandler LayoutSelected; + internal event EventHandler LayoutSelected; - public ActionCenterKeyboardLayoutButton(IKeyboardLayout layout) + internal KeyboardLayoutButton(IKeyboardLayout layout) { this.layout = layout; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml similarity index 86% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml index ae81bfae..4ccf82d2 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs similarity index 87% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs index a0d0884f..e196ba06 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterKeyboardLayoutControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs @@ -13,14 +13,14 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.SystemComponents.Contracts.Keyboard; 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 IText text; - public ActionCenterKeyboardLayoutControl(IKeyboard keyboard, IText text) + internal KeyboardLayoutControl(IKeyboard keyboard, IText text) { this.keyboard = keyboard; this.text = text; @@ -57,7 +57,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls { foreach (var layout in keyboard.GetLayouts()) { - var button = new ActionCenterKeyboardLayoutButton(layout); + var button = new KeyboardLayoutButton(layout); button.LayoutSelected += (o, args) => ActivateLayout(layout); LayoutsStackPanel.Children.Add(button); @@ -81,7 +81,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls foreach (var child in LayoutsStackPanel.Children) { - if (child is ActionCenterKeyboardLayoutButton layoutButton) + if (child is KeyboardLayoutButton layoutButton) { layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId; } diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml index 5c6b8091..1d8cfcc4 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml.cs similarity index 79% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml.cs index 720600e0..543ae8c6 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterNotificationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NotificationButton.xaml.cs @@ -12,13 +12,13 @@ using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.UserInterface.Contracts.Shell; 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; - public ActionCenterNotificationButton(INotificationController controller, INotificationInfo info) + internal NotificationButton(INotificationController controller, INotificationInfo info) { this.controller = controller; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml similarity index 94% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml index 62571393..db8ee104 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml.cs index 9de5b4f4..979a4efb 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterPowerSupplyControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/PowerSupplyControl.xaml.cs @@ -14,9 +14,9 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.SystemComponents.Contracts.PowerSupply; 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 bool infoShown, warningShown; @@ -24,7 +24,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls private IPowerSupply powerSupply; private IText text; - public ActionCenterPowerSupplyControl(IPowerSupply powerSupply, IText text) + internal PowerSupplyControl(IPowerSupply powerSupply, IText text) { this.powerSupply = powerSupply; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml index 91770a36..da3dd414 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml.cs similarity index 82% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml.cs index 7e8d240f..9a1cdccb 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterQuitButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/QuitButton.xaml.cs @@ -13,13 +13,13 @@ using SafeExamBrowser.Applications.Contracts.Resources.Icons; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; 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(); InitializeControl(); diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml index ed6cf9fe..bb6d5151 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml.cs similarity index 79% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml.cs index 61f53f65..b9e7ea79 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkButton.xaml.cs @@ -11,15 +11,15 @@ using System.Windows; using System.Windows.Controls; 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; - public event EventHandler NetworkSelected; + internal event EventHandler NetworkSelected; - public ActionCenterWirelessNetworkButton(IWirelessNetwork network) + internal WirelessNetworkButton(IWirelessNetwork network) { this.network = network; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml similarity index 89% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml index 6fa74ae8..8e68db1f 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml.cs index 9c5ab2fb..175e5d33 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterWirelessNetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/WirelessNetworkControl.xaml.cs @@ -18,14 +18,14 @@ using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork; using SafeExamBrowser.UserInterface.Contracts.Shell; 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 IText text; - public ActionCenterWirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text) + internal WirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text) { this.wirelessAdapter = wirelessAdapter; this.text = text; @@ -82,7 +82,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls foreach (var network in wirelessAdapter.GetNetworks()) { - var button = new ActionCenterWirelessNetworkButton(network); + var button = new WirelessNetworkButton(network); button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id); diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Browser/DownloadItemControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Browser/DownloadItemControl.xaml index 142c0f18..5de9df56 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/Browser/DownloadItemControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Browser/DownloadItemControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs similarity index 90% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs index afe1255b..fcf741cc 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs @@ -17,14 +17,14 @@ using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.UserInterface.Contracts.Shell; 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 IApplicationWindow single; - public TaskbarApplicationControl(IApplication application) + internal ApplicationControl(IApplication application) { this.application = application; @@ -92,7 +92,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls foreach (var window in windows) { - WindowStackPanel.Children.Add(new TaskbarApplicationWindowButton(window)); + WindowStackPanel.Children.Add(new ApplicationWindowButton(window)); } if (WindowStackPanel.Children.Count == 1) diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml similarity index 85% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml index 666ebaa7..b269fe0f 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml.cs similarity index 87% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml.cs index dc58f454..a279e255 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarApplicationWindowButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationWindowButton.xaml.cs @@ -12,13 +12,13 @@ using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts.Resources.Icons; 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; - public TaskbarApplicationWindowButton(IApplicationWindow window) + internal ApplicationWindowButton(IApplicationWindow window) { this.window = window; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml similarity index 89% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml index 64d94868..cb433bf0 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml.cs index c7cbc4fa..8051a5b6 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarAudioControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/AudioControl.xaml.cs @@ -18,9 +18,9 @@ using SafeExamBrowser.SystemComponents.Contracts.Audio; using SafeExamBrowser.UserInterface.Contracts.Shell; 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 IText text; @@ -28,7 +28,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls private IconResource MutedIcon; private IconResource NoDeviceIcon; - public TaskbarAudioControl(IAudio audio, IText text) + internal AudioControl(IAudio audio, IText text) { this.audio = audio; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarClock.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/Clock.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarClock.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/Clock.xaml index 62f12c4d..4d3ec857 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarClock.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/Clock.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutButton.xaml.cs similarity index 76% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutButton.xaml.cs index 1184d394..484852e1 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutButton.xaml.cs @@ -11,25 +11,25 @@ using System.Windows; using System.Windows.Controls; 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; - public bool IsCurrent + internal bool IsCurrent { set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; } } - public Guid LayoutId + internal Guid LayoutId { get { return layout.Id; } } - public event EventHandler LayoutSelected; + internal event EventHandler LayoutSelected; - public TaskbarKeyboardLayoutButton(IKeyboardLayout layout) + internal KeyboardLayoutButton(IKeyboardLayout layout) { this.layout = layout; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml similarity index 84% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml index 62e8e324..4f745fd4 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml.cs similarity index 90% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml.cs index 5f828f3d..eef4ec64 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarKeyboardLayoutControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/KeyboardLayoutControl.xaml.cs @@ -17,14 +17,14 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.SystemComponents.Contracts.Keyboard; 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 IText text; - public TaskbarKeyboardLayoutControl(IKeyboard keyboard, IText text) + internal KeyboardLayoutControl(IKeyboard keyboard, IText text) { this.keyboard = keyboard; this.text = text; @@ -80,7 +80,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls { foreach (var layout in keyboard.GetLayouts()) { - var button = new TaskbarKeyboardLayoutButton(layout); + var button = new KeyboardLayoutButton(layout); button.LayoutSelected += (o, args) => ActivateLayout(layout); LayoutsStackPanel.Children.Add(button); @@ -105,7 +105,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls foreach (var child in LayoutsStackPanel.Children) { - if (child is TaskbarKeyboardLayoutButton layoutButton) + if (child is KeyboardLayoutButton layoutButton) { layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId; } diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml similarity index 81% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml index 054aa87d..ce86af4a 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml.cs similarity index 79% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml.cs index 6bd7cdb0..2d5c8f5d 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarNotificationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NotificationButton.xaml.cs @@ -12,13 +12,13 @@ using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.UserInterface.Contracts.Shell; 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; - public TaskbarNotificationButton(INotificationController controller, INotificationInfo info) + internal NotificationButton(INotificationController controller, INotificationInfo info) { this.controller = controller; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml index c91e5811..09c2e8a1 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml.cs index 0e6ea96f..39224ad0 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarPowerSupplyControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/PowerSupplyControl.xaml.cs @@ -16,9 +16,9 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.SystemComponents.Contracts.PowerSupply; 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 bool infoShown, warningShown; @@ -26,7 +26,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls private IPowerSupply powerSupply; private IText text; - public TaskbarPowerSupplyControl(IPowerSupply powerSupply, IText text) + internal PowerSupplyControl(IPowerSupply powerSupply, IText text) { this.powerSupply = powerSupply; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml similarity index 82% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml index 88b7d07c..27a637d7 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml.cs similarity index 83% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml.cs index f503d141..a802a9ab 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarQuitButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml.cs @@ -14,13 +14,13 @@ using SafeExamBrowser.Applications.Contracts.Resources.Icons; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; 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(); LoadIcon(); diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml index 6b972368..ede4473f 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml.cs similarity index 80% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml.cs index 292b79b1..67712024 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkButton.xaml.cs @@ -11,15 +11,15 @@ using System.Windows; using System.Windows.Controls; 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; - public event EventHandler NetworkSelected; + internal event EventHandler NetworkSelected; - public TaskbarWirelessNetworkButton(IWirelessNetwork network) + internal WirelessNetworkButton(IWirelessNetwork network) { this.network = network; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml index 69455a64..a9b0a640 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml.cs index 597ac002..9427ab10 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskbarWirelessNetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/WirelessNetworkControl.xaml.cs @@ -19,14 +19,14 @@ using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork; using SafeExamBrowser.UserInterface.Contracts.Shell; 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 IText text; - public TaskbarWirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text) + internal WirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text) { this.wirelessAdapter = wirelessAdapter; this.text = text; @@ -102,7 +102,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls foreach (var network in wirelessAdapter.GetNetworks()) { - var button = new TaskbarWirelessNetworkButton(network); + var button = new WirelessNetworkButton(network); button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id); diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml index 4a71b36c..fec65f9b 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml.cs index cc3346d0..ac439929 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/TaskViewWindowControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskview/WindowControl.xaml.cs @@ -14,15 +14,15 @@ using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts.Resources.Icons; 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 IApplicationWindow window; - public TaskviewWindowControl(IApplicationWindow window, Taskview taskview) + internal WindowControl(IApplicationWindow window, Windows.Taskview taskview) { this.window = window; this.taskview = taskview; diff --git a/SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs b/SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs index fda32392..16fffa54 100644 --- a/SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs +++ b/SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs @@ -10,6 +10,7 @@ using System.Windows; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.Windows; +using SafeExamBrowser.UserInterface.Desktop.Windows; namespace SafeExamBrowser.UserInterface.Desktop { diff --git a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj index 6c4ae2c2..a6979de7 100644 --- a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj +++ b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj @@ -67,108 +67,108 @@ - + AboutWindow.xaml - + ActionCenter.xaml - + BrowserWindow.xaml - - ActionCenterApplicationControl.xaml + + ApplicationControl.xaml - - ActionCenterApplicationButton.xaml + + ApplicationButton.xaml - - ActionCenterAudioControl.xaml + + AudioControl.xaml - - ActionCenterClock.xaml + + Clock.xaml - - ActionCenterKeyboardLayoutButton.xaml + + KeyboardLayoutButton.xaml - - ActionCenterKeyboardLayoutControl.xaml + + KeyboardLayoutControl.xaml - - ActionCenterNotificationButton.xaml + + NotificationButton.xaml - - ActionCenterPowerSupplyControl.xaml + + PowerSupplyControl.xaml - - ActionCenterQuitButton.xaml + + QuitButton.xaml - - ActionCenterWirelessNetworkButton.xaml + + WirelessNetworkButton.xaml - - ActionCenterWirelessNetworkControl.xaml + + WirelessNetworkControl.xaml DownloadItemControl.xaml - - TaskbarApplicationControl.xaml + + ApplicationControl.xaml - - TaskbarApplicationWindowButton.xaml + + ApplicationWindowButton.xaml - - TaskbarAudioControl.xaml + + AudioControl.xaml - - TaskbarClock.xaml + + Clock.xaml - - TaskbarKeyboardLayoutButton.xaml + + KeyboardLayoutButton.xaml - - TaskbarKeyboardLayoutControl.xaml + + KeyboardLayoutControl.xaml - - TaskbarNotificationButton.xaml + + NotificationButton.xaml - - TaskbarPowerSupplyControl.xaml + + PowerSupplyControl.xaml - - TaskbarQuitButton.xaml + + QuitButton.xaml - - TaskbarWirelessNetworkButton.xaml + + WirelessNetworkButton.xaml - - TaskbarWirelessNetworkControl.xaml + + WirelessNetworkControl.xaml - - TaskviewWindowControl.xaml + + WindowControl.xaml - + FileSystemDialog.xaml - + LockScreen.xaml - + LogWindow.xaml - + PasswordDialog.xaml - + RuntimeWindow.xaml - + SplashScreen.xaml - + Taskview.xaml @@ -176,59 +176,59 @@ - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -236,39 +236,39 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + Designer MSBuild:Compile @@ -328,19 +328,19 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -400,11 +400,11 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -412,27 +412,27 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + Taskbar.xaml Code @@ -500,5 +500,6 @@ + \ No newline at end of file diff --git a/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs index 4a25ac58..67d2cfbd 100644 --- a/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs +++ b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs @@ -26,7 +26,8 @@ using SafeExamBrowser.UserInterface.Contracts.Browser; using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Windows; 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 { @@ -50,11 +51,11 @@ namespace SafeExamBrowser.UserInterface.Desktop { if (location == Location.ActionCenter) { - return new ActionCenterApplicationControl(application); + return new Controls.ActionCenter.ApplicationControl(application); } else { - return new TaskbarApplicationControl(application); + return new Controls.Taskbar.ApplicationControl(application); } } @@ -62,11 +63,11 @@ namespace SafeExamBrowser.UserInterface.Desktop { if (location == Location.ActionCenter) { - return new ActionCenterAudioControl(audio, text); + return new Controls.ActionCenter.AudioControl(audio, text); } 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) { - return new ActionCenterKeyboardLayoutControl(keyboard, text); + return new Controls.ActionCenter.KeyboardLayoutControl(keyboard, text); } 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) { - return new ActionCenterNotificationButton(controller, info); + return new Controls.ActionCenter.NotificationButton(controller, info); } 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) { - return new ActionCenterPowerSupplyControl(powerSupply, text); + return new Controls.ActionCenter.PowerSupplyControl(powerSupply, text); } 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) { - return new ActionCenterWirelessNetworkControl(wirelessAdapter, text); + return new Controls.ActionCenter.WirelessNetworkControl(wirelessAdapter, text); } else { - return new TaskbarWirelessNetworkControl(wirelessAdapter, text); + return new Controls.Taskbar.WirelessNetworkControl(wirelessAdapter, text); } } diff --git a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml index c7c291a1..54000f85 100644 --- a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml @@ -1,15 +1,15 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml.cs similarity index 91% rename from SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml.cs index 88cd7d39..c27e341d 100644 --- a/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/AboutWindow.xaml.cs @@ -14,9 +14,9 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts.Windows; 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 IText text; @@ -28,7 +28,7 @@ namespace SafeExamBrowser.UserInterface.Desktop remove { closing -= value; } } - public AboutWindow(AppConfig appConfig, IText text) + internal AboutWindow(AppConfig appConfig, IText text) { this.appConfig = appConfig; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml similarity index 78% rename from SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml index f628a65e..552d6771 100644 --- a/SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml @@ -1,16 +1,16 @@ - - - + + @@ -23,8 +23,8 @@ - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml.cs index 5c522c90..cf669be3 100644 --- a/SafeExamBrowser.UserInterface.Desktop/ActionCenter.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/ActionCenter.xaml.cs @@ -13,7 +13,7 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; -namespace SafeExamBrowser.UserInterface.Desktop +namespace SafeExamBrowser.UserInterface.Desktop.Windows { public partial class ActionCenter : Window, IActionCenter { diff --git a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml similarity index 94% rename from SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml index d7cdbe8b..19bc3228 100644 --- a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml @@ -1,17 +1,17 @@ - + mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon="../Images/SafeExamBrowser.ico"> - - - + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs index b0a3dca1..0a1a5f13 100644 --- a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs @@ -26,9 +26,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Desktop.Controls.Browser; 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 BrowserSettings settings; @@ -59,7 +59,7 @@ namespace SafeExamBrowser.UserInterface.Desktop 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.settings = settings; diff --git a/SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml index 83dfed50..214c5729 100644 --- a/SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs index 6c149eb8..46540adb 100644 --- a/SafeExamBrowser.UserInterface.Desktop/FileSystemDialog.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs @@ -20,9 +20,9 @@ using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.Windows; 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 string initialPath; @@ -32,7 +32,7 @@ namespace SafeExamBrowser.UserInterface.Desktop private IText text; private string title; - public FileSystemDialog( + internal FileSystemDialog( FileSystemElement element, FileSystemOperation operation, IText text, diff --git a/SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml index 7d6448ac..9ef9382b 100644 --- a/SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs index dc27eafb..02e8e171 100644 --- a/SafeExamBrowser.UserInterface.Desktop/LockScreen.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs @@ -21,9 +21,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Shared.Utilities; 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 IList windows; @@ -35,7 +35,7 @@ namespace SafeExamBrowser.UserInterface.Desktop remove { throw new NotImplementedException(); } } - public LockScreen(string message, string title, IText text, IEnumerable options) + internal LockScreen(string message, string title, IText text, IEnumerable options) { this.autoResetEvent = new AutoResetEvent(false); this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml index c2767b9e..1b91d106 100644 --- a/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml @@ -1,15 +1,15 @@ - + MinWidth="350" Topmost="True" WindowStartupLocation="CenterScreen" Icon="../Images/LogNotification.ico"> - + diff --git a/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml.cs similarity index 92% rename from SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml.cs index 3281e339..23381b77 100644 --- a/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/LogWindow.xaml.cs @@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; 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 LogViewModel model; @@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Desktop remove { closing -= value; } } - public LogWindow(ILogger logger, IText text) + internal LogWindow(ILogger logger, IText text) { InitializeComponent(); diff --git a/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml index c3414ef8..8a21f1f6 100644 --- a/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml.cs similarity index 92% rename from SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml.cs index 07b58391..832825da 100644 --- a/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/PasswordDialog.xaml.cs @@ -13,9 +13,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Data; 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 WindowClosingEventHandler closing; @@ -26,7 +26,7 @@ namespace SafeExamBrowser.UserInterface.Desktop remove { closing -= value; } } - public PasswordDialog(string message, string title, IText text) + internal PasswordDialog(string message, string title, IText text) { this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml index 19825e6d..8dbd615f 100644 --- a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml @@ -1,4 +1,4 @@ - + Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True"> - + diff --git a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml.cs index 91c77e8b..7db76d24 100644 --- a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/RuntimeWindow.xaml.cs @@ -16,9 +16,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; 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 AppConfig appConfig; @@ -31,7 +31,7 @@ namespace SafeExamBrowser.UserInterface.Desktop set => Dispatcher.Invoke(() => LogScrollViewer.Visibility = value ? Visibility.Visible : Visibility.Collapsed); } - bool IRuntimeWindow.ShowProgressBar + public bool ShowProgressBar { set { @@ -54,7 +54,7 @@ namespace SafeExamBrowser.UserInterface.Desktop remove { closing -= value; } } - public RuntimeWindow(AppConfig appConfig, IText text) + internal RuntimeWindow(AppConfig appConfig, IText text) { this.appConfig = appConfig; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml similarity index 89% rename from SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml index 4f87d301..ba8a7e04 100644 --- a/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml @@ -1,4 +1,4 @@ - + Cursor="Wait" Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True"> diff --git a/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml.cs index 57aa79c1..79355d65 100644 --- a/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/SplashScreen.xaml.cs @@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; 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 ProgressIndicatorViewModel model = new ProgressIndicatorViewModel(); @@ -43,7 +43,7 @@ namespace SafeExamBrowser.UserInterface.Desktop remove { closing -= value; } } - public SplashScreen(IText text, AppConfig appConfig = null) + internal SplashScreen(IText text, AppConfig appConfig = null) { this.appConfig = appConfig; this.text = text; diff --git a/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml similarity index 75% rename from SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml index 50bc14ce..457bb3dd 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml @@ -1,17 +1,17 @@ - + ResizeMode="NoResize" Icon="../Images/SafeExamBrowser.ico"> - - + + @@ -28,7 +28,7 @@ - - + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs index 8eb492ec..a2749071 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs @@ -14,7 +14,7 @@ using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Shared.Utilities; -namespace SafeExamBrowser.UserInterface.Desktop +namespace SafeExamBrowser.UserInterface.Desktop.Windows { public partial class Taskbar : Window, ITaskbar { diff --git a/SafeExamBrowser.UserInterface.Desktop/TaskView.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml similarity index 86% rename from SafeExamBrowser.UserInterface.Desktop/TaskView.xaml rename to SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml index 1a61fe1f..020d883f 100644 --- a/SafeExamBrowser.UserInterface.Desktop/TaskView.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Desktop/TaskView.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml.cs similarity index 91% rename from SafeExamBrowser.UserInterface.Desktop/TaskView.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml.cs index 441c6fd2..dc111004 100644 --- a/SafeExamBrowser.UserInterface.Desktop/TaskView.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskview.xaml.cs @@ -14,22 +14,22 @@ using System.Windows.Controls; using System.Windows.Interop; using SafeExamBrowser.Applications.Contracts; 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 { private IList applications; - private LinkedListNode current; - private LinkedList controls; + private LinkedListNode current; + private LinkedList controls; internal IntPtr Handle { get; private set; } public Taskview() { applications = new List(); - controls = new LinkedList(); + controls = new LinkedList(); InitializeComponent(); InitializeTaskview(); @@ -152,7 +152,7 @@ namespace SafeExamBrowser.UserInterface.Desktop for (var column = 0; column < maxColumns && windows.Any(); column++) { var window = windows.Pop(); - var control = new TaskviewWindowControl(window, this); + var control = new WindowControl(window, this); controls.AddLast(control); row.Children.Add(control);