diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs index 74f4da6a..fbf939e5 100644 --- a/SafeExamBrowser.I18n.Contracts/TextKey.cs +++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs @@ -27,6 +27,7 @@ namespace SafeExamBrowser.I18n.Contracts LockScreen_TerminateOption, LockScreen_Title, LockScreen_UnlockButton, + LogWindow_AlwaysOnTop, LogWindow_AutoScroll, LogWindow_Title, MessageBox_ApplicationAutoTerminationDataLossWarning, diff --git a/SafeExamBrowser.I18n/Text.xml b/SafeExamBrowser.I18n/Text.xml index 6e05b38d..592feac9 100644 --- a/SafeExamBrowser.I18n/Text.xml +++ b/SafeExamBrowser.I18n/Text.xml @@ -39,8 +39,11 @@ Unlock + + Always on top + - Auto-Scroll + Auto-scroll content Application Log diff --git a/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml index 9f8a9b74..c2767b9e 100644 --- a/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/LogWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop" mc:Ignorable="d" Title="{Binding Path=WindowTitle}" Background="Black" Foreground="White" Height="750" Width="1000" MinHeight="350" - MinWidth="350" WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico"> + MinWidth="350" Topmost="True" WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico"> @@ -20,6 +20,7 @@ + diff --git a/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs index 788027b3..ae9685f0 100644 --- a/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs @@ -25,6 +25,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.ViewModels public bool AutoScroll { get; set; } = true; public string AutoScrollTitle => text.Get(TextKey.LogWindow_AutoScroll); + public string TopmostTitle => text.Get(TextKey.LogWindow_AlwaysOnTop); public string WindowTitle => text.Get(TextKey.LogWindow_Title); public LogViewModel(IText text, ScrollViewer scrollViewer, TextBlock textBlock) diff --git a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml index 85d7dc3d..8382f27f 100644 --- a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile" mc:Ignorable="d" Title="{Binding Path=WindowTitle}" Background="Black" Foreground="White" Height="750" Width="1000" MinHeight="350" - MinWidth="350" WindowState="Maximized" WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico"> + MinWidth="350" Topmost="True" WindowState="Maximized" WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico"> @@ -20,6 +20,7 @@ + diff --git a/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs index e9517227..352b6d8c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs +++ b/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs @@ -25,6 +25,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.ViewModels public bool AutoScroll { get; set; } = true; public string AutoScrollTitle => text.Get(TextKey.LogWindow_AutoScroll); + public string TopmostTitle => text.Get(TextKey.LogWindow_AlwaysOnTop); public string WindowTitle => text.Get(TextKey.LogWindow_Title); public LogViewModel(IText text, ScrollViewer scrollViewer, TextBlock textBlock)