diff --git a/SafeExamBrowser.Browser/BrowserIconResource.cs b/SafeExamBrowser.Browser/BrowserIconResource.cs index e329bab3..651f057b 100644 --- a/SafeExamBrowser.Browser/BrowserIconResource.cs +++ b/SafeExamBrowser.Browser/BrowserIconResource.cs @@ -13,7 +13,7 @@ namespace SafeExamBrowser.Browser { public class BrowserIconResource : IIconResource { - public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/SafeExamBrowser.ico"); + public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/SafeExamBrowser.ico"); public bool IsBitmapResource => true; public bool IsXamlResource => false; } diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index c3cfc453..db711b8b 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -41,7 +41,7 @@ using SafeExamBrowser.Monitoring.Mouse; using SafeExamBrowser.Monitoring.Processes; using SafeExamBrowser.Monitoring.Windows; using SafeExamBrowser.SystemComponents; -using SafeExamBrowser.UserInterface.Classic; +using SafeExamBrowser.UserInterface.Desktop; using SafeExamBrowser.WindowsApi; namespace SafeExamBrowser.Client diff --git a/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs b/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs index 203e3995..2d1de3d5 100644 --- a/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs +++ b/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs @@ -13,7 +13,7 @@ namespace SafeExamBrowser.Client.Notifications { internal class AboutNotificationIconResource : IIconResource { - public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/AboutNotification.xaml"); + public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/AboutNotification.xaml"); public bool IsBitmapResource => false; public bool IsXamlResource => true; } diff --git a/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs b/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs index 1ae79b64..59961419 100644 --- a/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs +++ b/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs @@ -13,7 +13,7 @@ namespace SafeExamBrowser.Client.Notifications { internal class LogNotificationIconResource : IIconResource { - public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/LogNotification.ico"); + public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/LogNotification.ico"); public bool IsBitmapResource => true; public bool IsXamlResource => false; } diff --git a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj index e0c79fc2..f056f46a 100644 --- a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj +++ b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj @@ -154,9 +154,9 @@ {ACEE2EF1-14D2-4B52-8994-5C053055BB51} SafeExamBrowser.SystemComponents - + {A502DF54-7169-4647-94BD-18B192924866} - SafeExamBrowser.UserInterface.Classic + SafeExamBrowser.UserInterface.Desktop {73724659-4150-4792-A94E-42F5F3C1B696} diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs index dededcae..550402fe 100644 --- a/SafeExamBrowser.Runtime/CompositionRoot.cs +++ b/SafeExamBrowser.Runtime/CompositionRoot.cs @@ -28,7 +28,7 @@ using SafeExamBrowser.I18n; using SafeExamBrowser.Logging; using SafeExamBrowser.Runtime.Communication; using SafeExamBrowser.Runtime.Operations; -using SafeExamBrowser.UserInterface.Classic; +using SafeExamBrowser.UserInterface.Desktop; using SafeExamBrowser.WindowsApi; namespace SafeExamBrowser.Runtime diff --git a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj index 80687c57..9ce50189 100644 --- a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj +++ b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj @@ -160,9 +160,9 @@ {e107026c-2011-4552-a7d8-3a0d37881df6} SafeExamBrowser.Logging - + {a502df54-7169-4647-94bd-18b192924866} - SafeExamBrowser.UserInterface.Classic + SafeExamBrowser.UserInterface.Desktop {73724659-4150-4792-A94E-42F5F3C1B696} diff --git a/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml similarity index 94% rename from SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml index b54b17bc..33f7db68 100644 --- a/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml @@ -1,9 +1,9 @@ - @@ -16,7 +16,7 @@ - + diff --git a/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs index 6d3fe46e..110a060d 100644 --- a/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/AboutWindow.xaml.cs @@ -13,7 +13,7 @@ using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.Contracts.UserInterface.Windows; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public partial class AboutWindow : Window, IWindow { diff --git a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml index eb03fc2b..3c3dc389 100644 --- a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml @@ -1,10 +1,10 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs index 5ebc5575..0e48cfd1 100644 --- a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs @@ -14,9 +14,9 @@ using SafeExamBrowser.Contracts.UserInterface.Browser; using SafeExamBrowser.Contracts.UserInterface.Browser.Events; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.Contracts.UserInterface.Windows; -using SafeExamBrowser.UserInterface.Classic.Utilities; +using SafeExamBrowser.UserInterface.Desktop.Utilities; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public partial class BrowserWindow : Window, IBrowserWindow { @@ -175,9 +175,9 @@ namespace SafeExamBrowser.UserInterface.Classic private void LoadIcons() { - var backUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/NavigateBack.xaml"); - var forwardUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/NavigateForward.xaml"); - var reloadUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/Reload.xaml"); + var backUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/NavigateBack.xaml"); + var forwardUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/NavigateForward.xaml"); + var reloadUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Reload.xaml"); var back = new XamlIconResource(backUri); var forward = new XamlIconResource(forwardUri); var reload = new XamlIconResource(reloadUri); diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml similarity index 94% rename from SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml index a207b192..b17ee308 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs index 7e7323c3..a0e7c698 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs @@ -15,9 +15,9 @@ using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; -using SafeExamBrowser.UserInterface.Classic.Utilities; +using SafeExamBrowser.UserInterface.Desktop.Utilities; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class ApplicationButton : UserControl, IApplicationButton { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml similarity index 93% rename from SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml index 86ca6c61..82cce308 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs similarity index 92% rename from SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs index 3818b609..125f5a5f 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs @@ -11,9 +11,9 @@ using System.Windows.Controls; using SafeExamBrowser.Contracts.Core; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; -using SafeExamBrowser.UserInterface.Classic.Utilities; +using SafeExamBrowser.UserInterface.Desktop.Utilities; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class ApplicationInstanceButton : UserControl { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/DateTimeControl.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/DateTimeControl.xaml index 1ba018ad..7e6aeeab 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/DateTimeControl.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/DateTimeControl.xaml.cs similarity index 84% rename from SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/DateTimeControl.xaml.cs index fc640342..e49b5b97 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/DateTimeControl.xaml.cs @@ -7,9 +7,9 @@ */ using System.Windows.Controls; -using SafeExamBrowser.UserInterface.Classic.ViewModels; +using SafeExamBrowser.UserInterface.Desktop.ViewModels; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class DateTimeControl : UserControl { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutButton.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutButton.xaml index bfde3547..4945bea5 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutButton.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutButton.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutButton.xaml.cs index d88c63a3..eea9c4cc 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutButton.xaml.cs @@ -9,7 +9,7 @@ using System.Windows; using System.Windows.Controls; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class KeyboardLayoutButton : UserControl { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutControl.xaml similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutControl.xaml index 7e0d3017..764aac0c 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutControl.xaml @@ -1,11 +1,11 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutControl.xaml.cs similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutControl.xaml.cs index 65646b1b..bff99ef9 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/KeyboardLayoutControl.xaml.cs @@ -14,7 +14,7 @@ using SafeExamBrowser.Contracts.SystemComponents; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class KeyboardLayoutControl : UserControl, ISystemKeyboardLayoutControl { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml index da1bfcea..fa95ab45 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs similarity index 90% rename from SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs index 61377ecf..34824537 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs @@ -11,9 +11,9 @@ using System.Windows.Controls; using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; -using SafeExamBrowser.UserInterface.Classic.Utilities; +using SafeExamBrowser.UserInterface.Desktop.Utilities; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class NotificationButton : UserControl, INotificationButton { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/PowerSupplyControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/PowerSupplyControl.xaml similarity index 98% rename from SafeExamBrowser.UserInterface.Classic/Controls/PowerSupplyControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/PowerSupplyControl.xaml index 5f2c29dd..0acbff24 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/PowerSupplyControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/PowerSupplyControl.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/PowerSupplyControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/PowerSupplyControl.xaml.cs similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/Controls/PowerSupplyControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/PowerSupplyControl.xaml.cs index 89003b9e..47741929 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/PowerSupplyControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/PowerSupplyControl.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Threading; using SafeExamBrowser.Contracts.SystemComponents; using SafeExamBrowser.Contracts.UserInterface.Taskbar; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class PowerSupplyControl : UserControl, ISystemPowerSupplyControl { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/QuitButton.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/QuitButton.xaml index a61bff00..b239642b 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/QuitButton.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/QuitButton.xaml.cs similarity index 85% rename from SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/QuitButton.xaml.cs index e25d6e64..2439ade3 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/QuitButton.xaml.cs @@ -11,9 +11,9 @@ using System.ComponentModel; using System.Windows; using System.Windows.Controls; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; -using SafeExamBrowser.UserInterface.Classic.Utilities; +using SafeExamBrowser.UserInterface.Desktop.Utilities; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class QuitButton : UserControl { @@ -32,7 +32,7 @@ namespace SafeExamBrowser.UserInterface.Classic.Controls private void LoadIcon() { - var uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/ShutDown.xaml"); + var uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/ShutDown.xaml"); var resource = new XamlIconResource(uri); Button.Content = IconResourceLoader.Load(resource); diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkButton.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkButton.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkButton.xaml index 6e2068bc..ad4508c6 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkButton.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkButton.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkButton.xaml.cs similarity index 93% rename from SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkButton.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkButton.xaml.cs index 894ae24a..38158202 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkButton.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkButton.xaml.cs @@ -9,7 +9,7 @@ using System.Windows; using System.Windows.Controls; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class WirelessNetworkButton : UserControl { diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml similarity index 96% rename from SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml rename to SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml index 207e7c00..36922385 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml @@ -1,11 +1,11 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml.cs index 2cda744c..22a17091 100644 --- a/SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml.cs @@ -15,9 +15,9 @@ using FontAwesome.WPF; using SafeExamBrowser.Contracts.SystemComponents; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; -using SafeExamBrowser.UserInterface.Classic.Utilities; +using SafeExamBrowser.UserInterface.Desktop.Utilities; -namespace SafeExamBrowser.UserInterface.Classic.Controls +namespace SafeExamBrowser.UserInterface.Desktop.Controls { public partial class WirelessNetworkControl : UserControl, ISystemWirelessNetworkControl { @@ -133,7 +133,7 @@ namespace SafeExamBrowser.UserInterface.Classic.Controls private UIElement GetIcon(int signalStrength) { var icon = signalStrength > 66 ? "100" : (signalStrength > 33 ? "66" : (signalStrength > 0 ? "33" : "0")); - var uri = new Uri($"pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/WiFi_{icon}.xaml"); + var uri = new Uri($"pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/WiFi_{icon}.xaml"); var resource = new XamlIconResource(uri); return IconResourceLoader.Load(resource); diff --git a/SafeExamBrowser.UserInterface.Classic/Images/AboutNotification.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/AboutNotification.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/AboutNotification.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/AboutNotification.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Battery.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/Battery.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/Battery.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/Battery.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Chromium.ico b/SafeExamBrowser.UserInterface.Desktop/Images/Chromium.ico similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/Chromium.ico rename to SafeExamBrowser.UserInterface.Desktop/Images/Chromium.ico diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Keyboard.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/Keyboard.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/Keyboard.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/Keyboard.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/LogNotification.ico b/SafeExamBrowser.UserInterface.Desktop/Images/LogNotification.ico similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/LogNotification.ico rename to SafeExamBrowser.UserInterface.Desktop/Images/LogNotification.ico diff --git a/SafeExamBrowser.UserInterface.Classic/Images/NavigateBack.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/NavigateBack.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/NavigateBack.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/NavigateBack.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/NavigateForward.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/NavigateForward.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/NavigateForward.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/NavigateForward.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Reload.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/Reload.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/Reload.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/Reload.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/SafeExamBrowser.ico b/SafeExamBrowser.UserInterface.Desktop/Images/SafeExamBrowser.ico similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/SafeExamBrowser.ico rename to SafeExamBrowser.UserInterface.Desktop/Images/SafeExamBrowser.ico diff --git a/SafeExamBrowser.UserInterface.Classic/Images/ShutDown.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/ShutDown.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/ShutDown.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/ShutDown.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/SkipBack.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/SkipBack.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/SkipBack.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/SkipBack.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/SplashScreen.png b/SafeExamBrowser.UserInterface.Desktop/Images/SplashScreen.png similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/SplashScreen.png rename to SafeExamBrowser.UserInterface.Desktop/Images/SplashScreen.png diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_0.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/WiFi_0.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/WiFi_0.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/WiFi_0.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_100.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/WiFi_100.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/WiFi_100.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/WiFi_100.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_33.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/WiFi_33.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/WiFi_33.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/WiFi_33.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_66.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/WiFi_66.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/WiFi_66.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/WiFi_66.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageIn.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/ZoomPageIn.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/ZoomPageIn.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/ZoomPageIn.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageOut.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/ZoomPageOut.xaml similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Images/ZoomPageOut.xaml rename to SafeExamBrowser.UserInterface.Desktop/Images/ZoomPageOut.xaml diff --git a/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml similarity index 91% rename from SafeExamBrowser.UserInterface.Classic/LogWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml index 98202e7c..641e9073 100644 --- a/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs index 5d2a16c0..1a297548 100644 --- a/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml.cs @@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.Contracts.UserInterface.Windows; -using SafeExamBrowser.UserInterface.Classic.ViewModels; +using SafeExamBrowser.UserInterface.Desktop.ViewModels; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public partial class LogWindow : Window, IWindow { diff --git a/SafeExamBrowser.UserInterface.Classic/MessageBox.cs b/SafeExamBrowser.UserInterface.Desktop/MessageBox.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Classic/MessageBox.cs rename to SafeExamBrowser.UserInterface.Desktop/MessageBox.cs index 0b829ee1..9a51e892 100644 --- a/SafeExamBrowser.UserInterface.Classic/MessageBox.cs +++ b/SafeExamBrowser.UserInterface.Desktop/MessageBox.cs @@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.UserInterface.MessageBox; using SafeExamBrowser.Contracts.UserInterface.Windows; using MessageBoxResult = SafeExamBrowser.Contracts.UserInterface.MessageBox.MessageBoxResult; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public class MessageBox : IMessageBox { diff --git a/SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml b/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml rename to SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml index a8a44544..c7b3d7fc 100644 --- a/SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml @@ -1,10 +1,10 @@ - diff --git a/SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs similarity index 98% rename from SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs index 97e1dfb4..51628563 100644 --- a/SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/PasswordDialog.xaml.cs @@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.Contracts.UserInterface.Windows; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public partial class PasswordDialog : Window, IPasswordDialog { diff --git a/SafeExamBrowser.UserInterface.Classic/Properties/AssemblyInfo.cs b/SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs similarity index 94% rename from SafeExamBrowser.UserInterface.Classic/Properties/AssemblyInfo.cs rename to SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs index 27d5fb75..ac7669d7 100644 --- a/SafeExamBrowser.UserInterface.Classic/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs @@ -5,10 +5,10 @@ using System.Windows; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SafeExamBrowser.UserInterface.Classic")] +[assembly: AssemblyTitle("SafeExamBrowser.UserInterface.Desktop")] [assembly: AssemblyDescription("Safe Exam Browser")] [assembly: AssemblyCompany("ETH Zürich")] -[assembly: AssemblyProduct("SafeExamBrowser.UserInterface.Classic")] +[assembly: AssemblyProduct("SafeExamBrowser.UserInterface.Desktop")] [assembly: AssemblyCopyright("Copyright © 2019 ETH Zürich, Educational Development and Technology (LET)")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/SafeExamBrowser.UserInterface.Classic/Properties/Resources.Designer.cs b/SafeExamBrowser.UserInterface.Desktop/Properties/Resources.Designer.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/Properties/Resources.Designer.cs rename to SafeExamBrowser.UserInterface.Desktop/Properties/Resources.Designer.cs index 39f07f9e..fd280764 100644 --- a/SafeExamBrowser.UserInterface.Classic/Properties/Resources.Designer.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SafeExamBrowser.UserInterface.Classic.Properties { +namespace SafeExamBrowser.UserInterface.Desktop.Properties { using System; @@ -39,7 +39,7 @@ namespace SafeExamBrowser.UserInterface.Classic.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.UserInterface.Classic.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.UserInterface.Desktop.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/SafeExamBrowser.UserInterface.Classic/Properties/Resources.resx b/SafeExamBrowser.UserInterface.Desktop/Properties/Resources.resx similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Properties/Resources.resx rename to SafeExamBrowser.UserInterface.Desktop/Properties/Resources.resx diff --git a/SafeExamBrowser.UserInterface.Classic/Properties/Settings.Designer.cs b/SafeExamBrowser.UserInterface.Desktop/Properties/Settings.Designer.cs similarity index 92% rename from SafeExamBrowser.UserInterface.Classic/Properties/Settings.Designer.cs rename to SafeExamBrowser.UserInterface.Desktop/Properties/Settings.Designer.cs index 20075d16..a6f031d0 100644 --- a/SafeExamBrowser.UserInterface.Classic/Properties/Settings.Designer.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Properties/Settings.Designer.cs @@ -8,11 +8,11 @@ // //------------------------------------------------------------------------------ -namespace SafeExamBrowser.UserInterface.Classic.Properties { +namespace SafeExamBrowser.UserInterface.Desktop.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SafeExamBrowser.UserInterface.Classic/Properties/Settings.settings b/SafeExamBrowser.UserInterface.Desktop/Properties/Settings.settings similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/Properties/Settings.settings rename to SafeExamBrowser.UserInterface.Desktop/Properties/Settings.settings diff --git a/SafeExamBrowser.UserInterface.Classic/RuntimeWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml similarity index 96% rename from SafeExamBrowser.UserInterface.Classic/RuntimeWindow.xaml rename to SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml index e757a836..f028280b 100644 --- a/SafeExamBrowser.UserInterface.Classic/RuntimeWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml @@ -1,9 +1,9 @@ - @@ -38,7 +38,7 @@ - + AnyCPU {A502DF54-7169-4647-94BD-18B192924866} library - SafeExamBrowser.UserInterface.Classic - SafeExamBrowser.UserInterface.Classic + SafeExamBrowser.UserInterface.Desktop + SafeExamBrowser.UserInterface.Desktop v4.5.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml b/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml similarity index 92% rename from SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml rename to SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml index edc78d38..4f87d301 100644 --- a/SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml @@ -1,9 +1,9 @@ - @@ -18,7 +18,7 @@ - + diff --git a/SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml.cs rename to SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs index 33b26907..cc3ce4b9 100644 --- a/SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/SplashScreen.xaml.cs @@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Configuration; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events; using SafeExamBrowser.Contracts.UserInterface.Windows; -using SafeExamBrowser.UserInterface.Classic.ViewModels; +using SafeExamBrowser.UserInterface.Desktop.ViewModels; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public partial class SplashScreen : Window, ISplashScreen { diff --git a/SafeExamBrowser.UserInterface.Classic/Taskbar.xaml b/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/Taskbar.xaml rename to SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml index 73329356..5927349b 100644 --- a/SafeExamBrowser.UserInterface.Classic/Taskbar.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml @@ -1,9 +1,9 @@ - + xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Templates"> #FFF0F0F0 \ No newline at end of file diff --git a/SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs rename to SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs index c57a94b5..43c4142d 100644 --- a/SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs +++ b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs @@ -18,9 +18,9 @@ using SafeExamBrowser.Contracts.UserInterface; using SafeExamBrowser.Contracts.UserInterface.Browser; using SafeExamBrowser.Contracts.UserInterface.Taskbar; using SafeExamBrowser.Contracts.UserInterface.Windows; -using SafeExamBrowser.UserInterface.Classic.Controls; +using SafeExamBrowser.UserInterface.Desktop.Controls; -namespace SafeExamBrowser.UserInterface.Classic +namespace SafeExamBrowser.UserInterface.Desktop { public class UserInterfaceFactory : IUserInterfaceFactory { diff --git a/SafeExamBrowser.UserInterface.Classic/Utilities/IconResourceLoader.cs b/SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs similarity index 96% rename from SafeExamBrowser.UserInterface.Classic/Utilities/IconResourceLoader.cs rename to SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs index 8407c2c6..2edc5602 100644 --- a/SafeExamBrowser.UserInterface.Classic/Utilities/IconResourceLoader.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs @@ -15,7 +15,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using SafeExamBrowser.Contracts.Configuration; -namespace SafeExamBrowser.UserInterface.Classic.Utilities +namespace SafeExamBrowser.UserInterface.Desktop.Utilities { internal static class IconResourceLoader { diff --git a/SafeExamBrowser.UserInterface.Classic/Utilities/VisualExtensions.cs b/SafeExamBrowser.UserInterface.Desktop/Utilities/VisualExtensions.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/Utilities/VisualExtensions.cs rename to SafeExamBrowser.UserInterface.Desktop/Utilities/VisualExtensions.cs index 7347e161..64490379 100644 --- a/SafeExamBrowser.UserInterface.Classic/Utilities/VisualExtensions.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Utilities/VisualExtensions.cs @@ -10,7 +10,7 @@ using System.Windows; using System.Windows.Interop; using System.Windows.Media; -namespace SafeExamBrowser.UserInterface.Classic.Utilities +namespace SafeExamBrowser.UserInterface.Desktop.Utilities { internal static class VisualExtensions { diff --git a/SafeExamBrowser.UserInterface.Classic/Utilities/XamlIconResource.cs b/SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs similarity index 91% rename from SafeExamBrowser.UserInterface.Classic/Utilities/XamlIconResource.cs rename to SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs index f17ad06a..458bc227 100644 --- a/SafeExamBrowser.UserInterface.Classic/Utilities/XamlIconResource.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs @@ -9,7 +9,7 @@ using System; using SafeExamBrowser.Contracts.Configuration; -namespace SafeExamBrowser.UserInterface.Classic.Utilities +namespace SafeExamBrowser.UserInterface.Desktop.Utilities { internal class XamlIconResource : IIconResource { diff --git a/SafeExamBrowser.UserInterface.Classic/ViewModels/DateTimeViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/DateTimeViewModel.cs similarity index 95% rename from SafeExamBrowser.UserInterface.Classic/ViewModels/DateTimeViewModel.cs rename to SafeExamBrowser.UserInterface.Desktop/ViewModels/DateTimeViewModel.cs index 3eefa6ad..5635db97 100644 --- a/SafeExamBrowser.UserInterface.Classic/ViewModels/DateTimeViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/DateTimeViewModel.cs @@ -10,7 +10,7 @@ using System; using System.ComponentModel; using System.Timers; -namespace SafeExamBrowser.UserInterface.Classic.ViewModels +namespace SafeExamBrowser.UserInterface.Desktop.ViewModels { class DateTimeViewModel : INotifyPropertyChanged { diff --git a/SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs rename to SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs index dc82afa8..0e14caae 100644 --- a/SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs @@ -14,7 +14,7 @@ using System.Windows.Media; using SafeExamBrowser.Contracts.I18n; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.UserInterface.Classic.ViewModels +namespace SafeExamBrowser.UserInterface.Desktop.ViewModels { internal class LogViewModel : ILogObserver { diff --git a/SafeExamBrowser.UserInterface.Classic/ViewModels/ProgressIndicatorViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/ProgressIndicatorViewModel.cs similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/ViewModels/ProgressIndicatorViewModel.cs rename to SafeExamBrowser.UserInterface.Desktop/ViewModels/ProgressIndicatorViewModel.cs index 6bc18feb..82caf1ea 100644 --- a/SafeExamBrowser.UserInterface.Classic/ViewModels/ProgressIndicatorViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/ProgressIndicatorViewModel.cs @@ -9,7 +9,7 @@ using System.ComponentModel; using System.Timers; -namespace SafeExamBrowser.UserInterface.Classic.ViewModels +namespace SafeExamBrowser.UserInterface.Desktop.ViewModels { internal class ProgressIndicatorViewModel : INotifyPropertyChanged { diff --git a/SafeExamBrowser.UserInterface.Classic/ViewModels/RuntimeWindowViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs similarity index 97% rename from SafeExamBrowser.UserInterface.Classic/ViewModels/RuntimeWindowViewModel.cs rename to SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs index 0dcc7349..48d8d068 100644 --- a/SafeExamBrowser.UserInterface.Classic/ViewModels/RuntimeWindowViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs @@ -13,7 +13,7 @@ using System.Windows.Documents; using System.Windows.Media; using SafeExamBrowser.Contracts.Logging; -namespace SafeExamBrowser.UserInterface.Classic.ViewModels +namespace SafeExamBrowser.UserInterface.Desktop.ViewModels { internal class RuntimeWindowViewModel : ProgressIndicatorViewModel { diff --git a/SafeExamBrowser.UserInterface.Classic/packages.config b/SafeExamBrowser.UserInterface.Desktop/packages.config similarity index 100% rename from SafeExamBrowser.UserInterface.Classic/packages.config rename to SafeExamBrowser.UserInterface.Desktop/packages.config diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln index ae6b80d7..f61f74d6 100644 --- a/SafeExamBrowser.sln +++ b/SafeExamBrowser.sln @@ -27,7 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.WindowsApi" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.SystemComponents", "SafeExamBrowser.SystemComponents\SafeExamBrowser.SystemComponents.csproj", "{ACEE2EF1-14D2-4B52-8994-5C053055BB51}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterface.Classic", "SafeExamBrowser.UserInterface.Classic\SafeExamBrowser.UserInterface.Classic.csproj", "{A502DF54-7169-4647-94BD-18B192924866}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterface.Desktop", "SafeExamBrowser.UserInterface.Desktop\SafeExamBrowser.UserInterface.Desktop.csproj", "{A502DF54-7169-4647-94BD-18B192924866}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E03B19EC-8E4D-481C-9C1B-5C6C060D3D6B}" ProjectSection(SolutionItems) = preProject