SEBWIN-342: Moved settings into individiual namespaces according to their purpose.
This commit is contained in:
		
							parent
							
								
									b8fd96a10c
								
							
						
					
					
						commit
						5f5209622e
					
				
					 25 changed files with 43 additions and 31 deletions
				
			
		|  | @ -11,7 +11,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; | ||||||
| using Moq; | using Moq; | ||||||
| using SafeExamBrowser.Client.Contracts; | using SafeExamBrowser.Client.Contracts; | ||||||
| using SafeExamBrowser.Client.Operations; | using SafeExamBrowser.Client.Operations; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| using SafeExamBrowser.I18n.Contracts; | using SafeExamBrowser.I18n.Contracts; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| using SafeExamBrowser.SystemComponents.Contracts; | using SafeExamBrowser.SystemComponents.Contracts; | ||||||
|  |  | ||||||
|  | @ -23,7 +23,7 @@ using SafeExamBrowser.Communication.Contracts.Proxies; | ||||||
| using SafeExamBrowser.Communication.Hosts; | using SafeExamBrowser.Communication.Hosts; | ||||||
| using SafeExamBrowser.Communication.Proxies; | using SafeExamBrowser.Communication.Proxies; | ||||||
| using SafeExamBrowser.Configuration.Contracts; | using SafeExamBrowser.Configuration.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| using SafeExamBrowser.Configuration.Cryptography; | using SafeExamBrowser.Configuration.Cryptography; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel; | using SafeExamBrowser.Core.Contracts.OperationModel; | ||||||
| using SafeExamBrowser.Core.OperationModel; | using SafeExamBrowser.Core.OperationModel; | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ | ||||||
| 
 | 
 | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using SafeExamBrowser.Client.Contracts; | using SafeExamBrowser.Client.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel; | using SafeExamBrowser.Core.Contracts.OperationModel; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel.Events; | using SafeExamBrowser.Core.Contracts.OperationModel.Events; | ||||||
| using SafeExamBrowser.I18n.Contracts; | using SafeExamBrowser.I18n.Contracts; | ||||||
|  |  | ||||||
|  | @ -76,22 +76,22 @@ | ||||||
|     <Compile Include="SaveStatus.cs" /> |     <Compile Include="SaveStatus.cs" /> | ||||||
|     <Compile Include="ServiceConfiguration.cs" /> |     <Compile Include="ServiceConfiguration.cs" /> | ||||||
|     <Compile Include="SessionConfiguration.cs" /> |     <Compile Include="SessionConfiguration.cs" /> | ||||||
|     <Compile Include="Settings\ActionCenterSettings.cs" /> |     <Compile Include="Settings\UserInterface\ActionCenterSettings.cs" /> | ||||||
|     <Compile Include="Settings\AudioSettings.cs" /> |     <Compile Include="Settings\SystemComponents\AudioSettings.cs" /> | ||||||
|     <Compile Include="Settings\Browser\BrowserSettings.cs" /> |     <Compile Include="Settings\Browser\BrowserSettings.cs" /> | ||||||
|     <Compile Include="Settings\Browser\BrowserWindowSettings.cs" /> |     <Compile Include="Settings\Browser\BrowserWindowSettings.cs" /> | ||||||
|     <Compile Include="Settings\Browser\FilterResult.cs" /> |     <Compile Include="Settings\Browser\FilterResult.cs" /> | ||||||
|     <Compile Include="Settings\Browser\FilterRule.cs" /> |     <Compile Include="Settings\Browser\FilterRule.cs" /> | ||||||
|     <Compile Include="Settings\Browser\FilterType.cs" /> |     <Compile Include="Settings\Browser\FilterType.cs" /> | ||||||
|     <Compile Include="Settings\ConfigurationMode.cs" /> |     <Compile Include="Settings\ConfigurationMode.cs" /> | ||||||
|     <Compile Include="Settings\KeyboardSettings.cs" /> |     <Compile Include="Settings\Monitoring\KeyboardSettings.cs" /> | ||||||
|     <Compile Include="Settings\KioskMode.cs" /> |     <Compile Include="Settings\KioskMode.cs" /> | ||||||
|     <Compile Include="Settings\MouseSettings.cs" /> |     <Compile Include="Settings\Monitoring\MouseSettings.cs" /> | ||||||
|     <Compile Include="Settings\ServicePolicy.cs" /> |     <Compile Include="Settings\Service\ServicePolicy.cs" /> | ||||||
|     <Compile Include="Settings\ServiceSettings.cs" /> |     <Compile Include="Settings\Service\ServiceSettings.cs" /> | ||||||
|     <Compile Include="Settings\Settings.cs" /> |     <Compile Include="Settings\Settings.cs" /> | ||||||
|     <Compile Include="Settings\TaskbarSettings.cs" /> |     <Compile Include="Settings\UserInterface\TaskbarSettings.cs" /> | ||||||
|     <Compile Include="Settings\UserInterfaceMode.cs" /> |     <Compile Include="Settings\UserInterface\UserInterfaceMode.cs" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="..\SafeExamBrowser.Logging.Contracts\SafeExamBrowser.Logging.Contracts.csproj"> |     <ProjectReference Include="..\SafeExamBrowser.Logging.Contracts\SafeExamBrowser.Logging.Contracts.csproj"> | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all possible kiosk modes which the application supports. | 	/// Defines all kiosk modes which the application supports. | ||||||
| 	/// </summary> | 	/// </summary> | ||||||
| 	public enum KioskMode | 	public enum KioskMode | ||||||
| 	{ | 	{ | ||||||
|  |  | ||||||
|  | @ -8,10 +8,10 @@ | ||||||
| 
 | 
 | ||||||
| using System; | using System; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.Monitoring | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all configuration options for the <see cref="Monitoring.IKeyboardInterceptor"/>. | 	/// Defines all configuration options for monitoring keyboard input. | ||||||
| 	/// </summary> | 	/// </summary> | ||||||
| 	[Serializable] | 	[Serializable] | ||||||
| 	public class KeyboardSettings | 	public class KeyboardSettings | ||||||
|  | @ -8,10 +8,10 @@ | ||||||
| 
 | 
 | ||||||
| using System; | using System; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.Monitoring | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all configuration options for the <see cref="Monitoring.IMouseInterceptor"/>. | 	/// Defines all configuration options for monitoring mouse input. | ||||||
| 	/// </summary> | 	/// </summary> | ||||||
| 	[Serializable] | 	[Serializable] | ||||||
| 	public class MouseSettings | 	public class MouseSettings | ||||||
|  | @ -6,7 +6,7 @@ | ||||||
|  * file, You can obtain one at http://mozilla.org/MPL/2.0/. |  * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.Service | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all possible service policies which the application supports. | 	/// Defines all possible service policies which the application supports. | ||||||
|  | @ -6,7 +6,7 @@ | ||||||
|  * file, You can obtain one at http://mozilla.org/MPL/2.0/. |  * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.Service | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all configuration options for the service application component. | 	/// Defines all configuration options for the service application component. | ||||||
|  | @ -8,6 +8,10 @@ | ||||||
| 
 | 
 | ||||||
| using System; | using System; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings.Browser; | using SafeExamBrowser.Configuration.Contracts.Settings.Browser; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ | ||||||
| 
 | 
 | ||||||
| using System; | using System; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all configuration options for the audio device of the computer. | 	/// Defines all configuration options for the audio device of the computer. | ||||||
|  | @ -8,10 +8,10 @@ | ||||||
| 
 | 
 | ||||||
| using System; | using System; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all configuration options for the <see cref="UserInterface.Shell.IActionCenter"/>. | 	/// Defines all configuration options for the action center. | ||||||
| 	/// </summary> | 	/// </summary> | ||||||
| 	[Serializable] | 	[Serializable] | ||||||
| 	public class ActionCenterSettings | 	public class ActionCenterSettings | ||||||
|  | @ -8,10 +8,10 @@ | ||||||
| 
 | 
 | ||||||
| using System; | using System; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all configuration options for the <see cref="UserInterface.Shell.ITaskbar"/>. | 	/// Defines all configuration options for the taskbar. | ||||||
| 	/// </summary> | 	/// </summary> | ||||||
| 	[Serializable] | 	[Serializable] | ||||||
| 	public class TaskbarSettings | 	public class TaskbarSettings | ||||||
|  | @ -6,7 +6,7 @@ | ||||||
|  * file, You can obtain one at http://mozilla.org/MPL/2.0/. |  * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.Contracts.Settings | namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface | ||||||
| { | { | ||||||
| 	/// <summary> | 	/// <summary> | ||||||
| 	/// Defines all possible look & feel options for the application. | 	/// Defines all possible look & feel options for the application. | ||||||
|  | @ -9,6 +9,7 @@ | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings.Browser; | using SafeExamBrowser.Configuration.Contracts.Settings.Browser; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.ConfigurationData | namespace SafeExamBrowser.Configuration.ConfigurationData | ||||||
| { | { | ||||||
|  |  | ||||||
|  | @ -8,6 +8,7 @@ | ||||||
| 
 | 
 | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.ConfigurationData | namespace SafeExamBrowser.Configuration.ConfigurationData | ||||||
| { | { | ||||||
|  |  | ||||||
|  | @ -7,6 +7,7 @@ | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.ConfigurationData | namespace SafeExamBrowser.Configuration.ConfigurationData | ||||||
| { | { | ||||||
|  |  | ||||||
|  | @ -10,6 +10,8 @@ using System; | ||||||
| using System.IO; | using System.IO; | ||||||
| using SafeExamBrowser.Configuration.Contracts; | using SafeExamBrowser.Configuration.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Configuration.ConfigurationData | namespace SafeExamBrowser.Configuration.ConfigurationData | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ | ||||||
| using System; | using System; | ||||||
| using System.Linq; | using System.Linq; | ||||||
| using System.Windows.Input; | using System.Windows.Input; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| using SafeExamBrowser.Monitoring.Contracts.Keyboard; | using SafeExamBrowser.Monitoring.Contracts.Keyboard; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -6,7 +6,7 @@ | ||||||
|  * file, You can obtain one at http://mozilla.org/MPL/2.0/. |  * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| using SafeExamBrowser.Monitoring.Contracts.Mouse; | using SafeExamBrowser.Monitoring.Contracts.Mouse; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -14,12 +14,13 @@ using SafeExamBrowser.Communication.Contracts.Hosts; | ||||||
| using SafeExamBrowser.Communication.Contracts.Proxies; | using SafeExamBrowser.Communication.Contracts.Proxies; | ||||||
| using SafeExamBrowser.Configuration.Contracts; | using SafeExamBrowser.Configuration.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel; | using SafeExamBrowser.Core.Contracts.OperationModel; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| using SafeExamBrowser.SystemComponents.Contracts; |  | ||||||
| using SafeExamBrowser.UserInterface.Contracts.MessageBox; |  | ||||||
| using SafeExamBrowser.Runtime.Operations; | using SafeExamBrowser.Runtime.Operations; | ||||||
| using SafeExamBrowser.Runtime.Operations.Events; | using SafeExamBrowser.Runtime.Operations.Events; | ||||||
|  | using SafeExamBrowser.SystemComponents.Contracts; | ||||||
|  | using SafeExamBrowser.UserInterface.Contracts.MessageBox; | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Runtime.UnitTests.Operations | namespace SafeExamBrowser.Runtime.UnitTests.Operations | ||||||
| { | { | ||||||
|  |  | ||||||
|  | @ -15,6 +15,7 @@ using SafeExamBrowser.Communication.Contracts.Hosts; | ||||||
| using SafeExamBrowser.Communication.Contracts.Proxies; | using SafeExamBrowser.Communication.Contracts.Proxies; | ||||||
| using SafeExamBrowser.Configuration.Contracts; | using SafeExamBrowser.Configuration.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel; | using SafeExamBrowser.Core.Contracts.OperationModel; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel.Events; | using SafeExamBrowser.Core.Contracts.OperationModel.Events; | ||||||
| using SafeExamBrowser.I18n.Contracts; | using SafeExamBrowser.I18n.Contracts; | ||||||
|  |  | ||||||
|  | @ -12,14 +12,14 @@ using System.Threading; | ||||||
| using SafeExamBrowser.Communication.Contracts.Hosts; | using SafeExamBrowser.Communication.Contracts.Hosts; | ||||||
| using SafeExamBrowser.Communication.Contracts.Proxies; | using SafeExamBrowser.Communication.Contracts.Proxies; | ||||||
| using SafeExamBrowser.Configuration.Contracts; | using SafeExamBrowser.Configuration.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel; | using SafeExamBrowser.Core.Contracts.OperationModel; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel.Events; | using SafeExamBrowser.Core.Contracts.OperationModel.Events; | ||||||
| using SafeExamBrowser.I18n.Contracts; | using SafeExamBrowser.I18n.Contracts; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
|  | using SafeExamBrowser.Runtime.Operations.Events; | ||||||
| using SafeExamBrowser.SystemComponents.Contracts; | using SafeExamBrowser.SystemComponents.Contracts; | ||||||
| using SafeExamBrowser.UserInterface.Contracts.MessageBox; | using SafeExamBrowser.UserInterface.Contracts.MessageBox; | ||||||
| using SafeExamBrowser.Runtime.Operations.Events; |  | ||||||
| 
 | 
 | ||||||
| namespace SafeExamBrowser.Runtime.Operations | namespace SafeExamBrowser.Runtime.Operations | ||||||
| { | { | ||||||
|  |  | ||||||
|  | @ -14,6 +14,7 @@ using SafeExamBrowser.Communication.Contracts.Hosts; | ||||||
| using SafeExamBrowser.Communication.Contracts.Proxies; | using SafeExamBrowser.Communication.Contracts.Proxies; | ||||||
| using SafeExamBrowser.Configuration.Contracts; | using SafeExamBrowser.Configuration.Contracts; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings; | ||||||
|  | using SafeExamBrowser.Configuration.Contracts.Settings.Service; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel; | using SafeExamBrowser.Core.Contracts.OperationModel; | ||||||
| using SafeExamBrowser.Core.Contracts.OperationModel.Events; | using SafeExamBrowser.Core.Contracts.OperationModel.Events; | ||||||
| using SafeExamBrowser.I18n.Contracts; | using SafeExamBrowser.I18n.Contracts; | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ | ||||||
| using System; | using System; | ||||||
| using System.Linq; | using System.Linq; | ||||||
| using NAudio.CoreAudioApi; | using NAudio.CoreAudioApi; | ||||||
| using SafeExamBrowser.Configuration.Contracts.Settings; | using SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents; | ||||||
| using SafeExamBrowser.Logging.Contracts; | using SafeExamBrowser.Logging.Contracts; | ||||||
| using SafeExamBrowser.SystemComponents.Contracts.Audio; | using SafeExamBrowser.SystemComponents.Contracts.Audio; | ||||||
| using SafeExamBrowser.SystemComponents.Contracts.Audio.Events; | using SafeExamBrowser.SystemComponents.Contracts.Audio.Events; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 dbuechel
						dbuechel