diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index 423ab593..0e1249ca 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -274,7 +274,7 @@ namespace SafeExamBrowser.Client switch (uiMode) { case UserInterfaceMode.Mobile: - return new Mobile.ActionCenter(); + return new Mobile.Windows.ActionCenter(); default: return new Desktop.Windows.ActionCenter(); } @@ -307,7 +307,7 @@ namespace SafeExamBrowser.Client switch (uiMode) { case UserInterfaceMode.Mobile: - return new Mobile.Taskbar(ModuleLogger(nameof(Mobile.Taskbar))); + return new Mobile.Windows.Taskbar(ModuleLogger(nameof(Mobile.Windows.Taskbar))); default: return new Desktop.Windows.Taskbar(ModuleLogger(nameof(Desktop.Windows.Taskbar))); } @@ -318,7 +318,7 @@ namespace SafeExamBrowser.Client switch (uiMode) { case UserInterfaceMode.Mobile: - return new Mobile.Taskview(); + return new Mobile.Windows.Taskview(); default: return new Desktop.Windows.Taskview(); } diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml similarity index 85% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml index 8bea69f8..ded32ad0 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml.cs similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml.cs index 48334660..4053f3c8 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/ActionCenterApplicationControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml similarity index 82% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml index 3e574918..62fb1508 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml.cs similarity index 81% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml.cs index 4653ece6..381ef8a9 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile.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.Mobile/Controls/ActionCenterAudioControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml similarity index 91% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml index bac9251a..b6c38225 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml.cs index ec1f2fee..8b8c6c54 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterAudioControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/ActionCenterClock.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml similarity index 90% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml index cdf1e581..dea869f7 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml.cs similarity index 82% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml.cs index e768eaa6..73e1048a 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml.cs @@ -9,13 +9,13 @@ using System.Windows.Controls; using SafeExamBrowser.UserInterface.Mobile.ViewModels; -namespace SafeExamBrowser.UserInterface.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/ActionCenterKeyboardLayoutButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml index 58d50726..10a91466 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs similarity index 76% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs index a6a57e4a..e48b9d55 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs @@ -11,25 +11,25 @@ using System.Windows; using System.Windows.Controls; using SafeExamBrowser.SystemComponents.Contracts.Keyboard; -namespace SafeExamBrowser.UserInterface.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml similarity index 86% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml index 2c427e6f..5e6f62a2 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs index 41707019..dfc3692c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile.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.Mobile/Controls/ActionCenterNotificationButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml index 3a21edec..38cb5aed 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml.cs similarity index 79% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml.cs index b9790fe7..56cd294b 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/ActionCenterPowerSupplyControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterPowerSupplyControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml index 7c5c6725..81e259cd 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterPowerSupplyControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterPowerSupplyControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterPowerSupplyControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml.cs index 5113b3f5..4effb37e 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterPowerSupplyControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/ActionCenterQuitButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml index 648b40b4..352551a6 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml.cs similarity index 82% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml.cs index 187d80f1..963ebe58 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/ActionCenterWirelessNetworkButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml index 0d4451ea..b85b316f 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml.cs similarity index 79% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml.cs index 54501191..77ee0ece 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml.cs @@ -11,15 +11,15 @@ using System.Windows; using System.Windows.Controls; using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork; -namespace SafeExamBrowser.UserInterface.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml similarity index 89% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml index 5c59c893..b69ad39d 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml.cs index 01f53bc3..0f72217c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/TaskbarApplicationControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml similarity index 83% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml index 03b478ca..6a42777c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs similarity index 90% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs index b96be069..414ed2f0 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/TaskbarApplicationWindowButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml similarity index 85% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationWindowButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml index e151bda3..4e249d07 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationWindowButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationWindowButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml.cs similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationWindowButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml.cs index 553741d3..93c07c91 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarApplicationWindowButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/TaskbarAudioControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml similarity index 90% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml index 8a8f7b3b..12d82ce2 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml.cs index 47c1313d..ad51834e 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarAudioControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/TaskbarClock.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/Clock.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarClock.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/Clock.xaml index 8569e435..50c52b81 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarClock.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/Clock.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutButton.xaml.cs similarity index 76% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutButton.xaml.cs index ace34cd1..871a7077 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutButton.xaml.cs @@ -11,25 +11,25 @@ using System.Windows; using System.Windows.Controls; using SafeExamBrowser.SystemComponents.Contracts.Keyboard; -namespace SafeExamBrowser.UserInterface.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/TaskbarKeyboardLayoutControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml similarity index 84% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml index 50d02085..e54cae82 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml.cs similarity index 90% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml.cs index 115bbca7..a5106c76 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarKeyboardLayoutControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile.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.Mobile/Controls/TaskbarNotificationButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml similarity index 81% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarNotificationButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml index 61aa49a4..4cd4b099 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarNotificationButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarNotificationButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml.cs similarity index 80% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarNotificationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml.cs index 9583ec24..d1e36579 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarNotificationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/TaskbarPowerSupplyControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarPowerSupplyControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml index 34338ca5..62973263 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarPowerSupplyControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarPowerSupplyControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarPowerSupplyControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml.cs index 91a7be88..7de73593 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarPowerSupplyControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/TaskbarQuitButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml similarity index 82% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarQuitButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml index 06d89d2e..b9ecf231 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarQuitButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarQuitButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml.cs similarity index 83% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarQuitButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml.cs index 90554929..4ece76d7 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarQuitButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/TaskbarWirelessNetworkButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml similarity index 88% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkButton.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml index 5d80d452..e0377dd1 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkButton.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml @@ -1,4 +1,4 @@ - - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkButton.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml.cs similarity index 80% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkButton.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml.cs index d3c92ecd..538c6634 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml.cs @@ -11,15 +11,15 @@ using System.Windows; using System.Windows.Controls; using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork; -namespace SafeExamBrowser.UserInterface.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/Controls/TaskbarWirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml index 71a867bf..7ab16afd 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml @@ -1,4 +1,4 @@ - - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml.cs index 22d2c0ef..6ca122f9 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskbarWirelessNetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile.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.Mobile/Controls/TaskViewWindowControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskViewWindowControl.xaml rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml index 3e67479f..448267d5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskViewWindowControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskViewWindowControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Mobile/Controls/TaskViewWindowControl.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml.cs index a791375b..a47a0a2a 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/TaskViewWindowControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml.cs @@ -13,15 +13,15 @@ using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts.Resources.Icons; using SafeExamBrowser.UserInterface.Shared.Utilities; -namespace SafeExamBrowser.UserInterface.Mobile.Controls +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile/FileSystemDialogFactory.cs b/SafeExamBrowser.UserInterface.Mobile/FileSystemDialogFactory.cs index 2e770e85..d4a92cb8 100644 --- a/SafeExamBrowser.UserInterface.Mobile/FileSystemDialogFactory.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Windows; namespace SafeExamBrowser.UserInterface.Mobile { diff --git a/SafeExamBrowser.UserInterface.Mobile/MessageBox.cs b/SafeExamBrowser.UserInterface.Mobile/MessageBox.cs index 4b39912d..65a48a6d 100644 --- a/SafeExamBrowser.UserInterface.Mobile/MessageBox.cs +++ b/SafeExamBrowser.UserInterface.Mobile/MessageBox.cs @@ -10,6 +10,7 @@ using System.Windows; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts.MessageBox; using SafeExamBrowser.UserInterface.Contracts.Windows; +using SafeExamBrowser.UserInterface.Mobile.Windows; using MessageBoxResult = SafeExamBrowser.UserInterface.Contracts.MessageBox.MessageBoxResult; namespace SafeExamBrowser.UserInterface.Mobile diff --git a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj index 90ae825d..f9bc4362 100644 --- a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj +++ b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj @@ -68,117 +68,117 @@ - + AboutWindow.xaml - + ActionCenter.xaml - + BrowserWindow.xaml - - ActionCenterApplicationButton.xaml + + ApplicationButton.xaml - - ActionCenterApplicationControl.xaml + + ApplicationControl.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 - + MessageBoxDialog.xaml - + PasswordDialog.xaml Code - + RuntimeWindow.xaml - + SplashScreen.xaml - + Taskbar.xaml - + Taskview.xaml @@ -226,59 +226,59 @@ - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + 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 @@ -286,47 +286,47 @@ 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 @@ -366,11 +366,11 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile @@ -450,35 +450,35 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer diff --git a/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs index c1a9abb7..3eafae20 100644 --- a/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls; +using SafeExamBrowser.UserInterface.Mobile.Windows; +using SplashScreen = SafeExamBrowser.UserInterface.Mobile.Windows.SplashScreen; namespace SafeExamBrowser.UserInterface.Mobile { @@ -50,11 +51,11 @@ namespace SafeExamBrowser.UserInterface.Mobile { 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.Mobile { 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.Mobile { 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.Mobile { 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.Mobile { 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.Mobile { 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.Mobile/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml index f849e96f..26018f3b 100644 --- a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml @@ -1,15 +1,15 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml.cs similarity index 91% rename from SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml.cs index e294881e..1018d5b4 100644 --- a/SafeExamBrowser.UserInterface.Mobile/AboutWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile 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.Mobile/ActionCenter.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml similarity index 78% rename from SafeExamBrowser.UserInterface.Mobile/ActionCenter.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml index 84ce5ea4..0378b6af 100644 --- a/SafeExamBrowser.UserInterface.Mobile/ActionCenter.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml @@ -1,16 +1,16 @@ - - - + + @@ -23,8 +23,8 @@ - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/ActionCenter.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Mobile/ActionCenter.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml.cs index c081cb55..4dff9128 100644 --- a/SafeExamBrowser.UserInterface.Mobile/ActionCenter.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.Windows { public partial class ActionCenter : Window, IActionCenter { diff --git a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml index a29633c7..5b84eb9b 100644 --- a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml @@ -1,17 +1,17 @@ - + mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" FontSize="16" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon="../Images/SafeExamBrowser.ico"> - - - + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs index f6673f25..954451e9 100644 --- a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs @@ -26,9 +26,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Mobile.Controls.Browser; using SafeExamBrowser.UserInterface.Shared.Utilities; -namespace SafeExamBrowser.UserInterface.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile 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.Mobile/FileSystemDialog.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/FileSystemDialog.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml index c0dac204..7bc8a8a7 100644 --- a/SafeExamBrowser.UserInterface.Mobile/FileSystemDialog.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/FileSystemDialog.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Mobile/FileSystemDialog.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml.cs index 75c0a251..d87ba3ad 100644 --- a/SafeExamBrowser.UserInterface.Mobile/FileSystemDialog.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.Windows { - public partial class FileSystemDialog : Window + internal partial class FileSystemDialog : Window { private FileSystemElement element; private string initialPath; @@ -32,7 +32,7 @@ namespace SafeExamBrowser.UserInterface.Mobile private string title; private IWindow parent; - public FileSystemDialog( + internal FileSystemDialog( FileSystemElement element, FileSystemOperation operation, IText text, diff --git a/SafeExamBrowser.UserInterface.Mobile/LockScreen.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/LockScreen.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml index 74ce6e1d..b5745bf5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/LockScreen.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/LockScreen.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/LockScreen.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs index ea87bd5a..ff7fb10f 100644 --- a/SafeExamBrowser.UserInterface.Mobile/LockScreen.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile 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.Mobile/LogWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml similarity index 87% rename from SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml index 8382f27f..9b99e20c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml @@ -1,15 +1,15 @@ - + MinWidth="350" Topmost="True" WindowState="Maximized" WindowStartupLocation="CenterScreen" Icon="../Images/LogNotification.ico"> - + diff --git a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml.cs similarity index 92% rename from SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml.cs index 5d40abc6..5f116b44 100644 --- a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml.cs @@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Mobile.ViewModels; -namespace SafeExamBrowser.UserInterface.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile remove { closing -= value; } } - public LogWindow(ILogger logger, IText text) + internal LogWindow(ILogger logger, IText text) { InitializeComponent(); diff --git a/SafeExamBrowser.UserInterface.Mobile/MessageBoxDialog.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Mobile/MessageBoxDialog.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml index 5252c062..ecc292d5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/MessageBoxDialog.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/MessageBoxDialog.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/MessageBoxDialog.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml.cs index 244f71c4..b7749ce4 100644 --- a/SafeExamBrowser.UserInterface.Mobile/MessageBoxDialog.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml.cs @@ -16,9 +16,9 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts.MessageBox; using MessageBoxResult = SafeExamBrowser.UserInterface.Contracts.MessageBox.MessageBoxResult; -namespace SafeExamBrowser.UserInterface.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.Windows { - public partial class MessageBoxDialog : Window + internal partial class MessageBoxDialog : Window { private readonly IText text; @@ -30,7 +30,7 @@ namespace SafeExamBrowser.UserInterface.Mobile InitializeMessageBox(); } - public MessageBoxResult Show(string message, string title, MessageBoxAction action, MessageBoxIcon icon, Window parent = null) + internal MessageBoxResult Show(string message, string title, MessageBoxAction action, MessageBoxIcon icon, Window parent = null) { Message.Text = message; Title = title; diff --git a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml index 73b76968..8515fb00 100644 --- a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml.cs index b8946b4c..1a1ff55d 100644 --- a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile 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.Mobile/RuntimeWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml index 8ac480da..ddb41c3c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml @@ -1,4 +1,4 @@ - + Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True"> - + diff --git a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml.cs index 97858bf0..0f6146b0 100644 --- a/SafeExamBrowser.UserInterface.Mobile/RuntimeWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml.cs @@ -16,9 +16,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Mobile.ViewModels; -namespace SafeExamBrowser.UserInterface.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile set => Dispatcher.Invoke(() => LogScrollViewer.Visibility = value ? Visibility.Visible : Visibility.Collapsed); } - bool IRuntimeWindow.ShowProgressBar + public bool ShowProgressBar { set { @@ -54,7 +54,7 @@ namespace SafeExamBrowser.UserInterface.Mobile 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.Mobile/SplashScreen.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml similarity index 89% rename from SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml index c6d0791c..792212ee 100644 --- a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml @@ -1,4 +1,4 @@ - + Cursor="Wait" Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True"> diff --git a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml.cs index 9292c459..ca4ba6e2 100644 --- a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml.cs @@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Mobile.ViewModels; -namespace SafeExamBrowser.UserInterface.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile 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.Mobile/Taskbar.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml similarity index 75% rename from SafeExamBrowser.UserInterface.Mobile/Taskbar.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml index a0b40401..087e3754 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Taskbar.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml @@ -1,17 +1,17 @@ - + Topmost="True" ResizeMode="NoResize" Icon="../Images/SafeExamBrowser.ico"> - - + + @@ -28,7 +28,7 @@ - - + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Mobile/Taskbar.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs index ffb98e79..861b02c5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Taskbar.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.Windows { public partial class Taskbar : Window, ITaskbar { diff --git a/SafeExamBrowser.UserInterface.Mobile/TaskView.xaml b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml similarity index 86% rename from SafeExamBrowser.UserInterface.Mobile/TaskView.xaml rename to SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml index b701343e..e3d48b04 100644 --- a/SafeExamBrowser.UserInterface.Mobile/TaskView.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml @@ -1,4 +1,4 @@ - - + diff --git a/SafeExamBrowser.UserInterface.Mobile/TaskView.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml.cs similarity index 91% rename from SafeExamBrowser.UserInterface.Mobile/TaskView.xaml.cs rename to SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml.cs index afd4b591..960e86ce 100644 --- a/SafeExamBrowser.UserInterface.Mobile/TaskView.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/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.Mobile.Controls; +using SafeExamBrowser.UserInterface.Mobile.Controls.Taskview; -namespace SafeExamBrowser.UserInterface.Mobile +namespace SafeExamBrowser.UserInterface.Mobile.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.Mobile 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);