From cc37618da2167adda0841ec306a97dd5f217819a Mon Sep 17 00:00:00 2001 From: Jonas Sourlier Date: Mon, 2 May 2022 16:33:35 +0200 Subject: [PATCH] move LoseFocusRequestedEventHandler to Browser.Contracts --- .../Events/LoseFocusRequestedEventHandler.cs | 4 ++-- SafeExamBrowser.Browser.Contracts/IBrowserApplication.cs | 1 - .../SafeExamBrowser.Browser.Contracts.csproj | 5 +---- SafeExamBrowser.Browser/BrowserApplication.cs | 1 - SafeExamBrowser.Browser/BrowserWindow.cs | 1 - .../Browser/IBrowserWindow.cs | 2 +- .../SafeExamBrowser.UserInterface.Contracts.csproj | 5 ++++- SafeExamBrowser.UserInterface.Contracts/Shell/ITaskbar.cs | 2 +- .../SafeExamBrowser.UserInterface.Desktop.csproj | 8 ++++++++ .../Windows/BrowserWindow.xaml.cs | 2 +- .../Windows/Taskbar.xaml.cs | 2 +- .../SafeExamBrowser.UserInterface.Mobile.csproj | 4 ++++ .../Windows/BrowserWindow.xaml.cs | 2 +- .../Windows/Taskbar.xaml.cs | 2 +- 14 files changed, 25 insertions(+), 16 deletions(-) rename {SafeExamBrowser.UserInterface.Contracts => SafeExamBrowser.Browser.Contracts}/Events/LoseFocusRequestedEventHandler.cs (78%) diff --git a/SafeExamBrowser.UserInterface.Contracts/Events/LoseFocusRequestedEventHandler.cs b/SafeExamBrowser.Browser.Contracts/Events/LoseFocusRequestedEventHandler.cs similarity index 78% rename from SafeExamBrowser.UserInterface.Contracts/Events/LoseFocusRequestedEventHandler.cs rename to SafeExamBrowser.Browser.Contracts/Events/LoseFocusRequestedEventHandler.cs index 72c7fbc7..56af93ac 100644 --- a/SafeExamBrowser.UserInterface.Contracts/Events/LoseFocusRequestedEventHandler.cs +++ b/SafeExamBrowser.Browser.Contracts/Events/LoseFocusRequestedEventHandler.cs @@ -1,12 +1,12 @@ /* - * Copyright (c) 2021 ETH Zürich, Educational Development and Technology (LET) + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.UserInterface.Contracts.Events +namespace SafeExamBrowser.Browser.Contracts.Events { /// /// Event handler used to indicate that the user wants to move the focus away from the item. diff --git a/SafeExamBrowser.Browser.Contracts/IBrowserApplication.cs b/SafeExamBrowser.Browser.Contracts/IBrowserApplication.cs index 4cad3bea..97cd7202 100644 --- a/SafeExamBrowser.Browser.Contracts/IBrowserApplication.cs +++ b/SafeExamBrowser.Browser.Contracts/IBrowserApplication.cs @@ -9,7 +9,6 @@ using System; using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Browser.Contracts.Events; -using SafeExamBrowser.UserInterface.Contracts.Events; namespace SafeExamBrowser.Browser.Contracts { diff --git a/SafeExamBrowser.Browser.Contracts/SafeExamBrowser.Browser.Contracts.csproj b/SafeExamBrowser.Browser.Contracts/SafeExamBrowser.Browser.Contracts.csproj index c0b750b2..7404735e 100644 --- a/SafeExamBrowser.Browser.Contracts/SafeExamBrowser.Browser.Contracts.csproj +++ b/SafeExamBrowser.Browser.Contracts/SafeExamBrowser.Browser.Contracts.csproj @@ -57,6 +57,7 @@ + @@ -75,10 +76,6 @@ {30b2d907-5861-4f39-abad-c4abf1b3470e} SafeExamBrowser.Settings - - {c7889e97-6ff6-4a58-b7cb-521ed276b316} - SafeExamBrowser.UserInterface.Contracts - \ No newline at end of file diff --git a/SafeExamBrowser.Browser/BrowserApplication.cs b/SafeExamBrowser.Browser/BrowserApplication.cs index 5380034d..9f2504dc 100644 --- a/SafeExamBrowser.Browser/BrowserApplication.cs +++ b/SafeExamBrowser.Browser/BrowserApplication.cs @@ -27,7 +27,6 @@ using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Settings.Browser.Proxy; using SafeExamBrowser.Settings.Logging; using SafeExamBrowser.UserInterface.Contracts; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.MessageBox; using SafeExamBrowser.WindowsApi.Contracts; diff --git a/SafeExamBrowser.Browser/BrowserWindow.cs b/SafeExamBrowser.Browser/BrowserWindow.cs index 691018bd..53ce3aba 100644 --- a/SafeExamBrowser.Browser/BrowserWindow.cs +++ b/SafeExamBrowser.Browser/BrowserWindow.cs @@ -31,7 +31,6 @@ using SafeExamBrowser.Settings.Browser.Filter; using SafeExamBrowser.UserInterface.Contracts; using SafeExamBrowser.UserInterface.Contracts.Browser; using SafeExamBrowser.UserInterface.Contracts.Browser.Data; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.MessageBox; using Syroot.Windows.IO; diff --git a/SafeExamBrowser.UserInterface.Contracts/Browser/IBrowserWindow.cs b/SafeExamBrowser.UserInterface.Contracts/Browser/IBrowserWindow.cs index 72224a74..b41cc25d 100644 --- a/SafeExamBrowser.UserInterface.Contracts/Browser/IBrowserWindow.cs +++ b/SafeExamBrowser.UserInterface.Contracts/Browser/IBrowserWindow.cs @@ -7,10 +7,10 @@ */ using System; +using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.UserInterface.Contracts.Browser.Data; using SafeExamBrowser.UserInterface.Contracts.Browser.Events; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.Windows; namespace SafeExamBrowser.UserInterface.Contracts.Browser diff --git a/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj b/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj index 914b6a57..68674df9 100644 --- a/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj +++ b/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj @@ -63,7 +63,6 @@ - @@ -111,6 +110,10 @@ {ac77745d-3b41-43e2-8e84-d40e5a4ee77f} SafeExamBrowser.Applications.Contracts + + {5fb5273d-277c-41dd-8593-a25ce1aff2e9} + SafeExamBrowser.Browser.Contracts + {7d74555e-63e1-4c46-bd0a-8580552368c8} SafeExamBrowser.Configuration.Contracts diff --git a/SafeExamBrowser.UserInterface.Contracts/Shell/ITaskbar.cs b/SafeExamBrowser.UserInterface.Contracts/Shell/ITaskbar.cs index bd47eec0..0dd67e8a 100644 --- a/SafeExamBrowser.UserInterface.Contracts/Shell/ITaskbar.cs +++ b/SafeExamBrowser.UserInterface.Contracts/Shell/ITaskbar.cs @@ -6,8 +6,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.I18n.Contracts; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; namespace SafeExamBrowser.UserInterface.Contracts.Shell diff --git a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj index 47aa672f..e9d9e5ce 100644 --- a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj +++ b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj @@ -509,6 +509,14 @@ {ac77745d-3b41-43e2-8e84-d40e5a4ee77f} SafeExamBrowser.Applications.Contracts + + {5fb5273d-277c-41dd-8593-a25ce1aff2e9} + SafeExamBrowser.Browser.Contracts + + + {04e653f1-98e6-4e34-9dd7-7f2bc1a8b767} + SafeExamBrowser.Browser + {7d74555e-63e1-4c46-bd0a-8580552368c8} SafeExamBrowser.Configuration.Contracts diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs index c46a15e8..a8d98f97 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs @@ -15,6 +15,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Interop; using System.Windows.Media.Imaging; +using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; @@ -23,7 +24,6 @@ using SafeExamBrowser.UserInterface.Contracts; using SafeExamBrowser.UserInterface.Contracts.Browser; using SafeExamBrowser.UserInterface.Contracts.Browser.Data; using SafeExamBrowser.UserInterface.Contracts.Browser.Events; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Desktop.Controls.Browser; diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs index 20898424..f4a184d2 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs @@ -9,9 +9,9 @@ using System; using System.ComponentModel; using System.Windows; +using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Shared.Utilities; diff --git a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj index 2a43e1aa..104239ef 100644 --- a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj +++ b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj @@ -207,6 +207,10 @@ {ac77745d-3b41-43e2-8e84-d40e5a4ee77f} SafeExamBrowser.Applications.Contracts + + {5fb5273d-277c-41dd-8593-a25ce1aff2e9} + SafeExamBrowser.Browser.Contracts + {7d74555e-63e1-4c46-bd0a-8580552368c8} SafeExamBrowser.Configuration.Contracts diff --git a/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs index e89d1152..5f7544c2 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs @@ -14,6 +14,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Interop; using System.Windows.Media.Imaging; +using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Settings.Browser; @@ -21,7 +22,6 @@ using SafeExamBrowser.UserInterface.Contracts; using SafeExamBrowser.UserInterface.Contracts.Browser; using SafeExamBrowser.UserInterface.Contracts.Browser.Data; using SafeExamBrowser.UserInterface.Contracts.Browser.Events; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows.Events; using SafeExamBrowser.UserInterface.Mobile.Controls.Browser; diff --git a/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs index 1e850fc4..9ddfee07 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs @@ -8,9 +8,9 @@ using System.ComponentModel; using System.Windows; +using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; -using SafeExamBrowser.UserInterface.Contracts.Events; using SafeExamBrowser.UserInterface.Contracts.Shell; using SafeExamBrowser.UserInterface.Contracts.Shell.Events; using SafeExamBrowser.UserInterface.Shared.Utilities;