zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switched version to "alpha" and made some minor UI enhancements.

Browse source
This commit is contained in:
dbuechel 2017-08-17 14:00:43 +02:00
parent 0184eb0fe1
commit d618556c6c
5 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SafeExamBrowser.Core/Behaviour/StartupController.cs
View file

@ -90,8 +90,11 @@ namespace SafeExamBrowser.Core.Behaviour
var githubLine = $"/* Please visit https://github.com/SafeExamBrowser for more information.";
logger.Log($"{titleLine}{copyrightLine}{emptyLine}{githubLine}");
logger.Log($"{Environment.NewLine}# Application started at {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")}");
logger.Log($"# Running on {systemInfo.OperatingSystemInfo}{Environment.NewLine}");
logger.Log(string.Empty);
logger.Log($"# Application started at {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")}");
logger.Log($"# Running on {systemInfo.OperatingSystemInfo}");
logger.Log(string.Empty);
logger.Info("--- Initiating startup procedure ---");
splashScreen = uiFactory.CreateSplashScreen(settings, text);

2
SafeExamBrowser.UserInterface/LogWindow.xaml
View file

@ -12,7 +12,7 @@
</Window.Background>
<Grid>
<ScrollViewer x:Name="ScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<TextBlock x:Name="LogContent" Background="Transparent" FontFamily="Consolas" Foreground="ForestGreen" />
<TextBlock x:Name="LogContent" Background="Transparent" FontFamily="Consolas" Foreground="White" />
</ScrollViewer>
</Grid>
</Window>

2
SafeExamBrowser.UserInterface/Taskbar.xaml
View file

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.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" Height="40" Width="750" WindowStyle="None" AllowsTransparency="True" Topmost="True" Visibility="Collapsed"
ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico">
<Window.Background>
<SolidColorBrush Color="Black" Opacity="0.8" />

14
SafeExamBrowser.UserInterface/ViewModels/LogViewModel.cs
View file

@ -7,6 +7,7 @@
*/
using System;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Media;
@ -50,7 +51,18 @@ namespace SafeExamBrowser.UserInterface.ViewModels
private void AppendLogText(ILogText logText)
{
textBlock.Dispatcher.Invoke(() => textBlock.Inlines.Add(new Run($"{logText.Text}{Environment.NewLine}")));
textBlock.Dispatcher.Invoke(() =>
{
var isHeader = logText.Text.StartsWith("/* ");
var isComment = logText.Text.StartsWith("# ");
var brush = isHeader || isComment ? Brushes.ForestGreen : textBlock.Foreground;
textBlock.Inlines.Add(new Run($"{logText.Text}{Environment.NewLine}")
{
FontWeight = isHeader ? FontWeights.Bold : FontWeights.Normal,
Foreground = brush
});
});
}
private void AppendLogMessage(ILogMessage message)

2
SafeExamBrowser/Properties/AssemblyInfo.cs
View file

@ -48,4 +48,4 @@ using System.Windows;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
[assembly: AssemblyInformationalVersion("3.0.0 (beta)")]
[assembly: AssemblyInformationalVersion("3.0.0 (alpha)")]