diff --git a/SafeExamBrowser.Core.UnitTests/I18n/StringsTests.cs b/SafeExamBrowser.Core.UnitTests/I18n/StringsTests.cs
new file mode 100644
index 00000000..1f92811e
--- /dev/null
+++ b/SafeExamBrowser.Core.UnitTests/I18n/StringsTests.cs
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017 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/.
+ */
+
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SafeExamBrowser.Core.I18n;
+
+namespace SafeExamBrowser.Core.UnitTests
+{
+ [TestClass]
+ public class StringsTests
+ {
+ [TestMethod]
+ public void MustNeverReturnNull()
+ {
+ var text = Strings.Get((Key) (-1));
+
+ Assert.IsNotNull(text);
+ }
+
+ [TestMethod]
+ [ExpectedException(typeof(ArgumentNullException))]
+ public void MustNotAllowNullResource()
+ {
+ Strings.Initialize(null);
+ }
+ }
+}
diff --git a/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..12422755
--- /dev/null
+++ b/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("SafeExamBrowser.Core.UnitTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SafeExamBrowser.Core.UnitTests")]
+[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("48b9f2a1-b87d-40f0-bec9-399e8909860f")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj b/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj
new file mode 100644
index 00000000..ee138656
--- /dev/null
+++ b/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj
@@ -0,0 +1,73 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {48B9F2A1-B87D-40F0-BEC9-399E8909860F}
+ Library
+ Properties
+ SafeExamBrowser.Core.UnitTests
+ SafeExamBrowser.Core.UnitTests
+ v4.5.2
+ 512
+ {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 15.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
+ False
+ UnitTest
+
+
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
+
+
+ ..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {3d6fdbb6-a4af-4626-bb2b-bf329d44f9cc}
+ SafeExamBrowser.Core
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SafeExamBrowser.Core.UnitTests/packages.config b/SafeExamBrowser.Core.UnitTests/packages.config
new file mode 100644
index 00000000..1ab72187
--- /dev/null
+++ b/SafeExamBrowser.Core.UnitTests/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/SafeExamBrowser.Core/Contracts/IStringResource.cs b/SafeExamBrowser.Core/Contracts/IStringResource.cs
new file mode 100644
index 00000000..e9884293
--- /dev/null
+++ b/SafeExamBrowser.Core/Contracts/IStringResource.cs
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2017 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/.
+ */
+
+using System.Collections.Generic;
+using SafeExamBrowser.Core.I18n;
+
+namespace SafeExamBrowser.Core.Contracts
+{
+ public interface IStringResource
+ {
+ IDictionary LoadStrings();
+ }
+}
diff --git a/SafeExamBrowser.Core/Contracts/ITaskbar.cs b/SafeExamBrowser.Core/Contracts/ITaskbar.cs
new file mode 100644
index 00000000..4b500da5
--- /dev/null
+++ b/SafeExamBrowser.Core/Contracts/ITaskbar.cs
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2017 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.Core.Contracts
+{
+ public interface ITaskbar
+ {
+ void SetPosition(int x, int y);
+ void SetSize(int widht, int height);
+ }
+}
diff --git a/SafeExamBrowser.Core/Class1.cs b/SafeExamBrowser.Core/I18n/Key.cs
similarity index 72%
rename from SafeExamBrowser.Core/Class1.cs
rename to SafeExamBrowser.Core/I18n/Key.cs
index 7eab7e4d..29624617 100644
--- a/SafeExamBrowser.Core/Class1.cs
+++ b/SafeExamBrowser.Core/I18n/Key.cs
@@ -6,9 +6,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-namespace SafeExamBrowser.Core
+namespace SafeExamBrowser.Core.I18n
{
- public class Class1
+ public enum Key
{
+ MessageBox_SingleInstance,
+ MessageBox_SingleInstanceTitle
}
}
diff --git a/SafeExamBrowser.Core/I18n/Strings.cs b/SafeExamBrowser.Core/I18n/Strings.cs
new file mode 100644
index 00000000..543b6801
--- /dev/null
+++ b/SafeExamBrowser.Core/I18n/Strings.cs
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017 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/.
+ */
+
+using System;
+using System.Collections.Generic;
+using SafeExamBrowser.Core.Contracts;
+
+namespace SafeExamBrowser.Core.I18n
+{
+ public static class Strings
+ {
+ private static IDictionary cache = new Dictionary();
+
+ public static void Initialize(IStringResource resource)
+ {
+ if (resource == null)
+ {
+ throw new ArgumentNullException(nameof(resource));
+ }
+
+ cache = resource.LoadStrings();
+ }
+
+ public static string Get(Key key)
+ {
+ return cache.ContainsKey(key) ? cache[key] : $"Could not find string for key '{key}'!";
+ }
+ }
+}
diff --git a/SafeExamBrowser.Core/I18n/Text.xml b/SafeExamBrowser.Core/I18n/Text.xml
new file mode 100644
index 00000000..5c279b7a
--- /dev/null
+++ b/SafeExamBrowser.Core/I18n/Text.xml
@@ -0,0 +1,5 @@
+
+
+ You can only run one instance of SEB at a time.
+ Startup Not Allowed
+
\ No newline at end of file
diff --git a/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj b/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
index 9ed17803..233dc534 100644
--- a/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
+++ b/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
@@ -1,10 +1,10 @@
-
+
Debug
AnyCPU
- 3d6fdbb6-a4af-4626-bb2b-bf329d44f9cc
+ {3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC}
Library
Properties
SafeExamBrowser.Core
@@ -30,24 +30,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface/Properties/AssemblyInfo.cs b/SafeExamBrowser.UserInterface/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..ba4ab122
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+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")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SafeExamBrowser.UserInterface")]
+[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//CultureYouAreCodingWith in your .csproj file
+//inside a . For example, if you are using US english
+//in your source files, set the to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly:ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs b/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..f9b07995
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace SafeExamBrowser.UserInterface.Properties {
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if ((resourceMan == null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.UserInterface.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/SafeExamBrowser.UserInterface/Properties/Resources.resx b/SafeExamBrowser.UserInterface/Properties/Resources.resx
new file mode 100644
index 00000000..af7dbebb
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs b/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..e023e304
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace SafeExamBrowser.UserInterface.Properties
+{
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+ {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default
+ {
+ get
+ {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/SafeExamBrowser.UserInterface/Properties/Settings.settings b/SafeExamBrowser.UserInterface/Properties/Settings.settings
new file mode 100644
index 00000000..033d7a5e
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj b/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj
new file mode 100644
index 00000000..8c0b6a1c
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj
@@ -0,0 +1,88 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {E1BE031A-4354-41E7-83E8-843DED4489FF}
+ library
+ SafeExamBrowser.UserInterface
+ SafeExamBrowser.UserInterface
+ v4.5.2
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ Taskbar.xaml
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+ {3d6fdbb6-a4af-4626-bb2b-bf329d44f9cc}
+ SafeExamBrowser.Core
+
+
+
+
\ No newline at end of file
diff --git a/SafeExamBrowser/MainWindow.xaml b/SafeExamBrowser.UserInterface/Taskbar.xaml
similarity index 50%
rename from SafeExamBrowser/MainWindow.xaml
rename to SafeExamBrowser.UserInterface/Taskbar.xaml
index d593e6cc..6da0624a 100644
--- a/SafeExamBrowser/MainWindow.xaml
+++ b/SafeExamBrowser.UserInterface/Taskbar.xaml
@@ -1,11 +1,14 @@
-
+ Title="Taskbar" Height="40" Width="300" WindowStyle="None" AllowsTransparency="True" Topmost="True">
+
+
+
diff --git a/SafeExamBrowser.UserInterface/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
new file mode 100644
index 00000000..9cf036d9
--- /dev/null
+++ b/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017 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/.
+ */
+
+using System.Windows;
+using SafeExamBrowser.Core.Contracts;
+
+namespace SafeExamBrowser.UserInterface
+{
+ public partial class Taskbar : Window, ITaskbar
+ {
+ public Taskbar()
+ {
+ InitializeComponent();
+ }
+
+ public void SetPosition(int x, int y)
+ {
+ Left = x;
+ Top = y;
+ }
+
+ public void SetSize(int widht, int height)
+ {
+ Width = widht;
+ Height = height;
+ }
+ }
+}
diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln
index ab3afe05..71711402 100644
--- a/SafeExamBrowser.sln
+++ b/SafeExamBrowser.sln
@@ -10,8 +10,13 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0A9E6674-2FB4-42EA-85DE-B2445B9AE2D9}"
ProjectSection(SolutionItems) = preProject
LICENSE.txt = LICENSE.txt
+ README.md = README.md
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterface", "SafeExamBrowser.UserInterface\SafeExamBrowser.UserInterface.csproj", "{E1BE031A-4354-41E7-83E8-843DED4489FF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Core.UnitTests", "SafeExamBrowser.Core.UnitTests\SafeExamBrowser.Core.UnitTests.csproj", "{48B9F2A1-B87D-40F0-BEC9-399E8909860F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -26,6 +31,14 @@ Global
{3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E1BE031A-4354-41E7-83E8-843DED4489FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E1BE031A-4354-41E7-83E8-843DED4489FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E1BE031A-4354-41E7-83E8-843DED4489FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E1BE031A-4354-41E7-83E8-843DED4489FF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {48B9F2A1-B87D-40F0-BEC9-399E8909860F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {48B9F2A1-B87D-40F0-BEC9-399E8909860F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {48B9F2A1-B87D-40F0-BEC9-399E8909860F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {48B9F2A1-B87D-40F0-BEC9-399E8909860F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/SafeExamBrowser/App.cs b/SafeExamBrowser/App.cs
new file mode 100644
index 00000000..63b85973
--- /dev/null
+++ b/SafeExamBrowser/App.cs
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017 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/.
+ */
+
+using System;
+using System.Threading;
+using System.Windows;
+using SafeExamBrowser.Core.I18n;
+using SafeExamBrowser.UserInterface;
+
+namespace SafeExamBrowser
+{
+ public class App : Application
+ {
+ private static Mutex mutex = new Mutex(true, "safe_exam_browser_single_instance_mutex");
+
+ [STAThread]
+ public static void Main()
+ {
+ if (mutex.WaitOne(TimeSpan.Zero, true))
+ {
+ StartApplication();
+ }
+ else
+ {
+ MessageBox.Show(Strings.Get(Key.MessageBox_SingleInstance), Strings.Get(Key.MessageBox_SingleInstanceTitle));
+ }
+ }
+
+ private static void StartApplication()
+ {
+ var app = new App();
+ var taskbar = new Taskbar();
+
+ app.Run(taskbar);
+ }
+ }
+}
diff --git a/SafeExamBrowser/App.xaml b/SafeExamBrowser/App.xaml
deleted file mode 100644
index e396c98d..00000000
--- a/SafeExamBrowser/App.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
diff --git a/SafeExamBrowser/App.xaml.cs b/SafeExamBrowser/App.xaml.cs
deleted file mode 100644
index f7df0d05..00000000
--- a/SafeExamBrowser/App.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace SafeExamBrowser
-{
- ///
- /// Interaction logic for App.xaml
- ///
- public partial class App : Application
- {
- }
-}
diff --git a/SafeExamBrowser/MainWindow.xaml.cs b/SafeExamBrowser/MainWindow.xaml.cs
deleted file mode 100644
index 4c2247a4..00000000
--- a/SafeExamBrowser/MainWindow.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace SafeExamBrowser
-{
- ///
- /// Interaction logic for MainWindow.xaml
- ///
- public partial class MainWindow : Window
- {
- public MainWindow()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/SafeExamBrowser/SafeExamBrowser.csproj b/SafeExamBrowser/SafeExamBrowser.csproj
index 23db28ce..6fb37193 100644
--- a/SafeExamBrowser/SafeExamBrowser.csproj
+++ b/SafeExamBrowser/SafeExamBrowser.csproj
@@ -50,24 +50,7 @@
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
- MainWindow.xaml
- Code
-
-
-
+
Code
@@ -93,5 +76,15 @@
+
+
+ {3d6fdbb6-a4af-4626-bb2b-bf329d44f9cc}
+ SafeExamBrowser.Core
+
+
+ {e1be031a-4354-41e7-83e8-843ded4489ff}
+ SafeExamBrowser.UserInterface
+
+
\ No newline at end of file