diff --git a/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs b/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs
index 816da06b..58a9b233 100644
--- a/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs
+++ b/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs
@@ -13,7 +13,7 @@ namespace SafeExamBrowser.Core.Notifications
{
class LogNotificationIconResource : IIconResource
{
- public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Windows10;component/Images/LogNotification.ico");
+ public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/LogNotification.ico");
public bool IsBitmapResource => true;
public bool IsXamlResource => false;
}
diff --git a/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml b/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml
new file mode 100644
index 00000000..f3724da4
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This application is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
+ with this application, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+ CefSharp (.NET bindings for the Chromium Embedded Framework)
+
+ Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
+
+
+ CEF (Chromium Embedded Framework)
+
+ Copyright © 2008-2014 Marshall A. Greenblatt. Portions Copyright © 2006-2009 Google Inc. All rights reserved.
+
+
+
+
diff --git a/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs
new file mode 100644
index 00000000..ecb75591
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs
@@ -0,0 +1,52 @@
+/*
+ * 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 System.Windows.Documents;
+using SafeExamBrowser.Contracts.Configuration.Settings;
+using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.UserInterface;
+
+namespace SafeExamBrowser.UserInterface.Classic
+{
+ public partial class AboutWindow : Window, IWindow
+ {
+ private ISettings settings;
+ private IText text;
+ private WindowClosingEventHandler closing;
+
+ event WindowClosingEventHandler IWindow.Closing
+ {
+ add { closing += value; }
+ remove { closing -= value; }
+ }
+
+ public AboutWindow(ISettings settings, IText text)
+ {
+ this.settings = settings;
+ this.text = text;
+
+ InitializeComponent();
+ InitializeAboutWindow();
+ }
+
+ public void BringToForeground()
+ {
+ Activate();
+ }
+
+ private void InitializeAboutWindow()
+ {
+ Closing += (o, args) => closing?.Invoke();
+ VersionInfo.Inlines.Add(new Run($"{text.Get(TextKey.Version)} {settings.ProgramVersion}") { FontStyle = FontStyles.Italic });
+ VersionInfo.Inlines.Add(new LineBreak());
+ VersionInfo.Inlines.Add(new LineBreak());
+ VersionInfo.Inlines.Add(new Run(settings.ProgramCopyright) { FontSize = 10 });
+ }
+ }
+}
diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml b/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml
index 69048230..8d405715 100644
--- a/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml
+++ b/SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml
@@ -4,8 +4,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Controls"
- mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="28">
+ mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="40">
-
+
diff --git a/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml b/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml
new file mode 100644
index 00000000..0a0ef0df
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs b/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs
new file mode 100644
index 00000000..fa9224ed
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs
@@ -0,0 +1,83 @@
+/*
+ * 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.ComponentModel;
+using System.Windows;
+using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.Logging;
+using SafeExamBrowser.Contracts.UserInterface;
+using SafeExamBrowser.UserInterface.Classic.ViewModels;
+
+namespace SafeExamBrowser.UserInterface.Classic
+{
+ public partial class LogWindow : Window, IWindow
+ {
+ private ILogger logger;
+ private LogViewModel model;
+ private WindowClosingEventHandler closing;
+
+ event WindowClosingEventHandler IWindow.Closing
+ {
+ add { closing += value; }
+ remove { closing -= value; }
+ }
+
+ public LogWindow(ILogger logger, IText text)
+ {
+ InitializeComponent();
+
+ this.logger = logger;
+ this.model = new LogViewModel(text, ScrollViewer, LogContent);
+
+ InitializeLogWindow();
+ }
+
+ public void BringToForeground()
+ {
+ Dispatcher.Invoke(Activate);
+ }
+
+ public new void Close()
+ {
+ Dispatcher.Invoke(base.Close);
+ }
+
+ public new void Show()
+ {
+ Dispatcher.Invoke(base.Show);
+ }
+
+ private void InitializeLogWindow()
+ {
+ DataContext = model;
+ Closing += LogWindow_Closing;
+ Loaded += LogWindow_Loaded;
+ }
+
+ private void LogWindow_Loaded(object sender, RoutedEventArgs e)
+ {
+ var log = logger.GetLog();
+
+ foreach (var content in log)
+ {
+ model.Notify(content);
+ }
+
+ logger.Subscribe(model);
+ logger.Info("Opened log window.");
+ }
+
+ private void LogWindow_Closing(object sender, CancelEventArgs e)
+ {
+ logger.Unsubscribe(model);
+ logger.Info("Closed log window.");
+
+ closing?.Invoke();
+ }
+ }
+}
diff --git a/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj b/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj
index 0e2c10a6..8339fa5b 100644
--- a/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj
+++ b/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj
@@ -63,6 +63,9 @@
+
+ AboutWindow.xaml
+
BrowserWindow.xaml
@@ -81,6 +84,9 @@
QuitButton.xaml
+
+ LogWindow.xaml
+
SplashScreen.xaml
@@ -90,6 +96,10 @@
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -114,6 +124,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs
index 86e841b1..2a5f34fe 100644
--- a/SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs
+++ b/SafeExamBrowser.UserInterface.Classic/UserInterfaceFactory.cs
@@ -23,8 +23,7 @@ namespace SafeExamBrowser.UserInterface.Classic
{
public IWindow CreateAboutWindow(ISettings settings, IText text)
{
- // TODO:
- throw new NotImplementedException();
+ return new AboutWindow(settings, text);
}
public IApplicationButton CreateApplicationButton(IApplicationInfo info)
@@ -39,8 +38,27 @@ namespace SafeExamBrowser.UserInterface.Classic
public IWindow CreateLogWindow(ILogger logger, IText text)
{
- // TODO:
- throw new NotImplementedException();
+ LogWindow logWindow = null;
+ var logWindowReadyEvent = new AutoResetEvent(false);
+ var logWindowThread = new Thread(() =>
+ {
+ logWindow = new LogWindow(logger, text);
+ logWindow.Closed += (o, args) => logWindow.Dispatcher.InvokeShutdown();
+ logWindow.Show();
+
+ logWindowReadyEvent.Set();
+
+ System.Windows.Threading.Dispatcher.Run();
+ });
+
+ logWindowThread.SetApartmentState(ApartmentState.STA);
+ logWindowThread.Name = nameof(LogWindow);
+ logWindowThread.IsBackground = true;
+ logWindowThread.Start();
+
+ logWindowReadyEvent.WaitOne();
+
+ return logWindow;
}
public INotificationButton CreateNotification(INotificationInfo info)
diff --git a/SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs
index 0caa53d6..6a00ccd3 100644
--- a/SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs
+++ b/SafeExamBrowser.UserInterface.Classic/ViewModels/LogViewModel.cs
@@ -88,9 +88,9 @@ namespace SafeExamBrowser.UserInterface.Classic.ViewModels
case LogLevel.Error:
return Brushes.Red;
case LogLevel.Warning:
- return Brushes.Yellow;
+ return Brushes.Orange;
default:
- return Brushes.White;
+ return Brushes.Black;
}
}
}