Started implementing classic user interface.

SafeExamBrowser.Core/Behaviour/Operations/TaskbarOperation.cs

@@ -59,9 +59,9 @@ namespace SafeExamBrowser.Core.Behaviour.Operations
 				CreateLogNotification();
 			}
 
-			CreateAboutNotification();
-
 			// TODO:
+			//CreateAboutNotification();
+
 			//if (systemInfo.HasBattery)
 			//{
 			//	CreatePowerSupplyComponent();

SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic"
         mc:Ignorable="d"
-        Title="About Safe Exam Browser" Height="350" Width="450" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico"
+        Title="About Safe Exam Browser" Background="White" Height="350" Width="450" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico"
         ShowInTaskbar="False" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
@@ -17,7 +17,7 @@
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <Image Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/SplashScreen.png" Margin="0,5,0,0" />
-        <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" Foreground="DarkGray" Margin="25,70,50,10" TextWrapping="Wrap" />
+        <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" Foreground="Gray" Margin="25,70,50,10" TextWrapping="Wrap" />
         <ScrollViewer Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Auto">
             <TextBlock x:Name="MainText" Margin="10" FontSize="10" TextWrapping="Wrap">
                 This application is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic"
         mc:Ignorable="d"
-        Title="BrowserWindow" Height="500" Width="500" WindowState="Maximized" Icon=".\Images\Chromium.ico">
+        Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="500" WindowState="Maximized" Icon=".\Images\Chromium.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />

SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml

@@ -6,18 +6,23 @@
              xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Controls"
              xmlns:s="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="50">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
         <Popup x:Name="InstancePopup" IsOpen="False" Placement="Top" PlacementTarget="{Binding ElementName=Button}">
-            <ScrollViewer x:Name="InstanceScrollViewer" VerticalScrollBarVisibility="Auto">
+            <ScrollViewer x:Name="InstanceScrollViewer" Background="{StaticResource BackgroundBrush}" VerticalScrollBarVisibility="Auto">
                 <ScrollViewer.Resources>
                     <s:Double x:Key="{x:Static SystemParameters.VerticalScrollBarWidthKey}">5</s:Double>
                 </ScrollViewer.Resources>
                 <StackPanel x:Name="InstanceStackPanel" />
             </ScrollViewer>
         </Popup>
-        <Button x:Name="Button" Click="Button_Click" Padding="5" Width="50" />
+        <Button x:Name="Button" Background="{StaticResource BackgroundBrush}" Click="Button_Click" Padding="4" Template="{StaticResource TaskbarButton}" Width="50" />
-        <Grid Panel.ZIndex="10">
-            <Rectangle x:Name="ActiveBar" Height="2" Width="40" VerticalAlignment="Bottom" Fill="LightSteelBlue" Visibility="Collapsed" />
-        </Grid>
     </Grid>
 </UserControl>

SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs

@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
@@ -41,21 +42,31 @@ namespace SafeExamBrowser.UserInterface.Classic.Controls
 
 			instances.Add(instance);
 			InstanceStackPanel.Children.Add(instanceButton);
-
-			ActiveBar.Visibility = Visibility.Visible;
 		}
 
 		private void InitializeApplicationButton()
 		{
+			var originalBrush = Button.Background;
+
 			Button.ToolTip = info.Tooltip;
 			Button.Content = IconResourceLoader.Load(info.IconResource);
 
 			Button.MouseEnter += (o, args) => InstancePopup.IsOpen = instances.Count > 1;
-			Button.MouseLeave += (o, args) => InstancePopup.IsOpen &= InstancePopup.IsMouseOver || ActiveBar.IsMouseOver;
+			Button.MouseLeave += (o, args) => InstancePopup.IsOpen = InstancePopup.IsMouseOver;
-			ActiveBar.MouseLeave += (o, args) => InstancePopup.IsOpen &= InstancePopup.IsMouseOver || Button.IsMouseOver;
+			InstancePopup.MouseLeave += (o, args) => InstancePopup.IsOpen = false || IsMouseOver;
-			InstancePopup.MouseLeave += (o, args) => InstancePopup.IsOpen = false;
+
-			InstancePopup.Opened += (o, args) => ActiveBar.Width = Double.NaN;
+			InstancePopup.Opened += (o, args) =>
-			InstancePopup.Closed += (o, args) => ActiveBar.Width = 40;
+			{
+				Background = Brushes.LightBlue;
+				Button.Background = Brushes.LightBlue;
+			};
+
+			InstancePopup.Closed += (o, args) =>
+			{
+				Background = originalBrush;
+				Button.Background = originalBrush;
+			};
+
 			InstanceStackPanel.SizeChanged += (o, args) =>
 			{
 				if (instances.Count > 9)
@@ -81,11 +92,6 @@ namespace SafeExamBrowser.UserInterface.Classic.Controls
 		{
 			instances.Remove(instances.FirstOrDefault(i => i.Id == id));
 			InstanceStackPanel.Children.Remove(instanceButton);
-
-			if (!instances.Any())
-			{
-				ActiveBar.Visibility = Visibility.Collapsed;
-			}
 		}
 	}
 }

SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml

@@ -5,11 +5,19 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Controls"
              mc:Ignorable="d" d:DesignWidth="250">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
-        <Button x:Name="Button" Click="Button_Click"  Height="25">
+        <Button x:Name="Button" Background="{StaticResource BackgroundBrush}"  Click="Button_Click" Height="25" Template="{StaticResource TaskbarButton}">
             <StackPanel Orientation="Horizontal">
-                <ContentControl x:Name="Icon" />
+                <ContentControl x:Name="Icon" HorizontalAlignment="Left" />
-                <TextBlock x:Name="Text" Padding="5,0,5,0" />
+                <TextBlock x:Name="Text" Padding="5,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
             </StackPanel>
         </Button>
     </Grid>

SafeExamBrowser.UserInterface.Classic/Controls/DateTimeControl.xaml

@@ -6,12 +6,12 @@
              xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
-    <Grid Margin="5,0">
+    <Grid Background="Transparent" Margin="5,0" ToolTip="{Binding Path=ToolTip}">
         <Grid.RowDefinitions>
             <RowDefinition Height="1*" />
             <RowDefinition Height="1*" />
         </Grid.RowDefinitions>
-        <TextBlock x:Name="TimeTextBlock" Grid.Row="0" Text="{Binding Path=Time}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        <TextBlock x:Name="TimeTextBlock" Grid.Row="0" Text="{Binding Path=Time}" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Bottom" />
-        <TextBlock x:Name="DateTextBlock" Grid.Row="1" Text="{Binding Path=Date}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        <TextBlock x:Name="DateTextBlock" Grid.Row="1" Text="{Binding Path=Date}" HorizontalAlignment="Center" VerticalAlignment="Top" />
     </Grid>
 </UserControl>

SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml

@@ -5,7 +5,15 @@
              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="40">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
-        <Button x:Name="IconButton" Click="Icon_Click" Padding="5,0" Width="40"/>
+        <Button x:Name="IconButton" Background="{StaticResource BackgroundBrush}"  Click="Icon_Click" Padding="5,0" Template="{StaticResource TaskbarButton}" Width="40"/>
     </Grid>
 </UserControl>

SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml

@@ -5,7 +5,15 @@
              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="40">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
-        <Button Click="Button_Click">Quit</Button>
+        <Button Click="Button_Click" Background="{StaticResource BackgroundBrush}" HorizontalAlignment="Stretch" Template="{StaticResource TaskbarButton}" VerticalAlignment="Stretch">Quit</Button>
     </Grid>
 </UserControl>

SafeExamBrowser.UserInterface.Classic/LogWindow.xaml

@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic"
         mc:Ignorable="d"
-        Title="{Binding Path=WindowTitle}" Height="500" Width="1100" MinHeight="350" MinWidth="350" WindowStartupLocation="CenterScreen"
+        Title="{Binding Path=WindowTitle}" Background="WhiteSmoke" Height="500" Width="1100" MinHeight="350" MinWidth="350"
-        Icon="./Images/LogNotification.ico">
+        WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico">
     <Grid>
         <ScrollViewer x:Name="ScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <TextBlock x:Name="LogContent" FontFamily="Consolas" />

SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj

@@ -140,6 +140,14 @@
       <DependentUpon>Taskbar.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Templates\Buttons.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Templates\Colors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">

SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic"
         mc:Ignorable="d"
-        Title="SplashScreen" Height="200" Width="350" WindowStyle="None" AllowsTransparency="True" WindowStartupLocation="CenterScreen"
+        Title="SplashScreen" Background="White" Height="200" Width="350" WindowStyle="None" WindowStartupLocation="CenterScreen"
         Cursor="Wait" Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True">
     <Border BorderBrush="DodgerBlue" BorderThickness="1">
         <Grid>

SafeExamBrowser.UserInterface.Classic/Taskbar.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Controls"
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
-        Title="Taskbar" Height="40" Width="750" WindowStyle="None" AllowsTransparency="True" Topmost="True" Visibility="Visible"
+        Title="Taskbar" Background="#FFF0F0F0" Height="40" Width="750" WindowStyle="None" Topmost="True" Visibility="Visible"
         ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico">
     <Grid>
         <Grid.ColumnDefinitions>
@@ -22,9 +22,9 @@
             </ScrollViewer.Resources>
             <StackPanel x:Name="ApplicationStackPanel" Orientation="Horizontal" />
         </ScrollViewer>
-        <StackPanel Grid.Column="1" x:Name="NotificationStackPanel" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Stretch" />
+        <local:DateTimeControl Grid.Column="1" Foreground="DimGray" />
-        <StackPanel Grid.Column="2" x:Name="SystemControlStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" />
+        <StackPanel Grid.Column="2" x:Name="NotificationStackPanel" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Stretch" />
-        <local:DateTimeControl Grid.Column="3" />
+        <StackPanel Grid.Column="3" x:Name="SystemControlStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" />
         <local:QuitButton Grid.Column="4" />
     </Grid>
 </Window>

SafeExamBrowser.UserInterface.Classic/Templates/Buttons.xaml

@@ -0,0 +1,23 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Templates">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Templates/Colors.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <ControlTemplate x:Key="TaskbarButton" TargetType="Button">
+        <Border x:Name="ButtonContent" Background="{TemplateBinding Background}" BorderThickness="1" Padding="{TemplateBinding Padding}">
+            <ContentPresenter ContentSource="Content" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                              RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="{TemplateBinding VerticalAlignment}" />
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ButtonContent" Property="Background" Value="LightBlue" />
+                <Setter TargetName="ButtonContent" Property="BorderBrush" Value="DodgerBlue" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ButtonContent" Property="BorderBrush" Value="SkyBlue" />
+                <Setter TargetName="ButtonContent" Property="BorderThickness" Value="2" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+</ResourceDictionary>

SafeExamBrowser.UserInterface.Classic/Templates/Colors.xaml

@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Templates">
+    <SolidColorBrush x:Key="BackgroundBrush">#FFF0F0F0</SolidColorBrush>
+</ResourceDictionary>

SafeExamBrowser.UserInterface.Classic/Utilities/IconResourceLoader.cs

@@ -34,7 +34,7 @@ namespace SafeExamBrowser.UserInterface.Classic.Utilities
 			}
 			catch (Exception)
 			{
-				return new TextBlock(new Run("X") { Foreground = Brushes.Red, FontWeight = FontWeights.Bold });
+				return NotFoundSymbol();
 			}
 
 			throw new NotSupportedException($"Application icon resource of type '{resource.GetType()}' is not supported!");
@@ -55,5 +55,14 @@ namespace SafeExamBrowser.UserInterface.Classic.Utilities
 				return XamlReader.Load(stream) as UIElement;
 			}
 		}
+
+		private static UIElement NotFoundSymbol()
+		{
+			return new TextBlock(new Run("X") { Foreground = Brushes.Red, FontWeight = FontWeights.Bold })
+			{
+				HorizontalAlignment = HorizontalAlignment.Center,
+				VerticalAlignment = VerticalAlignment.Center
+			};
+		}
 	}
 }