diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml index b342314f..07a15c7d 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml @@ -29,9 +29,14 @@ diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml.cs index 3fea30db..d3afa543 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml.cs @@ -6,16 +6,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +using System; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; +using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Proctoring.Contracts; using SafeExamBrowser.Settings.Proctoring; using SafeExamBrowser.UserInterface.Contracts.Shell; +using SafeExamBrowser.UserInterface.Shared.Utilities; namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter { @@ -25,6 +28,9 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter private readonly ProctoringSettings settings; private readonly IText text; + private IconResource LoweredIcon; + private IconResource RaisedIcon; + public RaiseHandControl(IProctoringController controller, ProctoringSettings settings, IText text) { this.controller = controller; @@ -45,6 +51,10 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter HandButton.Click += RaiseHandButton_Click; HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + LoweredIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Lowered.xaml") }; + RaisedIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Raised.xaml") }; + Icon.Content = IconResourceLoader.Load(LoweredIcon); + NotificationButton.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver)); NotificationButton.PreviewMouseLeftButtonUp += NotificationButton_PreviewMouseLeftButtonUp; NotificationButton.PreviewMouseRightButtonUp += NotificationButton_PreviewMouseRightButtonUp; @@ -54,6 +64,8 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = IsMouseOver)); Popup.Opened += (o, args) => Grid.Background = Brushes.Gray; Popup.Closed += (o, args) => Grid.Background = originalBrush; + + Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered); } private void NotificationButton_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e) @@ -102,17 +114,19 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter private void ShowLowered() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + Icon.Content = IconResourceLoader.Load(LoweredIcon); Message.IsEnabled = true; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); - TextBlock.Text = "L"; + Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered); } private void ShowRaised() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringLowerHand); + Icon.Content = IconResourceLoader.Load(RaisedIcon); Message.IsEnabled = false; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandRaised); - TextBlock.Text = "R"; + Text.Text = text.Get(TextKey.Notification_ProctoringHandRaised); } } } diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml index a6b55191..c5fb61b6 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml @@ -30,9 +30,7 @@ diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml.cs index 2e613f9b..8bd48d0e 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml.cs @@ -6,16 +6,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +using System; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; +using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Proctoring.Contracts; using SafeExamBrowser.Settings.Proctoring; using SafeExamBrowser.UserInterface.Contracts.Shell; +using SafeExamBrowser.UserInterface.Shared.Utilities; namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar { @@ -25,6 +28,9 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar private readonly ProctoringSettings settings; private readonly IText text; + private IconResource LoweredIcon; + private IconResource RaisedIcon; + public RaiseHandControl(IProctoringController controller, ProctoringSettings settings, IText text) { this.controller = controller; @@ -45,6 +51,10 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar HandButton.Click += RaiseHandButton_Click; HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + LoweredIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Lowered.xaml") }; + RaisedIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Raised.xaml") }; + Icon.Content = IconResourceLoader.Load(LoweredIcon); + NotificationButton.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver)); NotificationButton.PreviewMouseLeftButtonUp += NotificationButton_PreviewMouseLeftButtonUp; NotificationButton.PreviewMouseRightButtonUp += NotificationButton_PreviewMouseRightButtonUp; @@ -57,7 +67,6 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar Background = Brushes.LightGray; NotificationButton.Background = Brushes.LightGray; }; - Popup.Closed += (o, args) => { Background = originalBrush; @@ -111,17 +120,17 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar private void ShowLowered() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + Icon.Content = IconResourceLoader.Load(LoweredIcon); Message.IsEnabled = true; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); - TextBlock.Text = "L"; } private void ShowRaised() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringLowerHand); + Icon.Content = IconResourceLoader.Load(RaisedIcon); Message.IsEnabled = false; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandRaised); - TextBlock.Text = "R"; } } } diff --git a/SafeExamBrowser.UserInterface.Desktop/Images/Hand_Lowered.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/Hand_Lowered.xaml new file mode 100644 index 00000000..b0e08bcb --- /dev/null +++ b/SafeExamBrowser.UserInterface.Desktop/Images/Hand_Lowered.xaml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/Images/Hand_Raised.xaml b/SafeExamBrowser.UserInterface.Desktop/Images/Hand_Raised.xaml new file mode 100644 index 00000000..bb054560 --- /dev/null +++ b/SafeExamBrowser.UserInterface.Desktop/Images/Hand_Raised.xaml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj index 7e9ae454..9353cbc8 100644 --- a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj +++ b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj @@ -207,6 +207,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml index 242ee73a..777a8d1b 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml @@ -29,9 +29,14 @@ diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml.cs index 5720dcdd..9bbb7108 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml.cs @@ -6,16 +6,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +using System; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; +using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Proctoring.Contracts; using SafeExamBrowser.Settings.Proctoring; using SafeExamBrowser.UserInterface.Contracts.Shell; +using SafeExamBrowser.UserInterface.Shared.Utilities; namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter { @@ -25,6 +28,9 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter private readonly ProctoringSettings settings; private readonly IText text; + private IconResource LoweredIcon; + private IconResource RaisedIcon; + public RaiseHandControl(IProctoringController controller, ProctoringSettings settings, IText text) { this.controller = controller; @@ -45,6 +51,10 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter HandButton.Click += RaiseHandButton_Click; HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + LoweredIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Lowered.xaml") }; + RaisedIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Raised.xaml") }; + Icon.Content = IconResourceLoader.Load(LoweredIcon); + NotificationButton.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver)); NotificationButton.PreviewMouseLeftButtonUp += NotificationButton_PreviewMouseLeftButtonUp; NotificationButton.PreviewMouseRightButtonUp += NotificationButton_PreviewMouseRightButtonUp; @@ -54,6 +64,8 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = IsMouseOver)); Popup.Opened += (o, args) => Grid.Background = Brushes.Gray; Popup.Closed += (o, args) => Grid.Background = originalBrush; + + Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered); } private void NotificationButton_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e) @@ -102,17 +114,19 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter private void ShowLowered() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + Icon.Content = IconResourceLoader.Load(LoweredIcon); Message.IsEnabled = true; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); - TextBlock.Text = "L"; + Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered); } private void ShowRaised() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringLowerHand); + Icon.Content = IconResourceLoader.Load(RaisedIcon); Message.IsEnabled = false; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandRaised); - TextBlock.Text = "R"; + Text.Text = text.Get(TextKey.Notification_ProctoringHandRaised); } } } diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml index b7bbd45f..5ce55a05 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml @@ -29,9 +29,7 @@ diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml.cs index a3748dd0..a74f9e9c 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml.cs @@ -6,16 +6,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +using System; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; +using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Proctoring.Contracts; using SafeExamBrowser.Settings.Proctoring; using SafeExamBrowser.UserInterface.Contracts.Shell; +using SafeExamBrowser.UserInterface.Shared.Utilities; namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar { @@ -25,6 +28,9 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar private readonly ProctoringSettings settings; private readonly IText text; + private IconResource LoweredIcon; + private IconResource RaisedIcon; + public RaiseHandControl(IProctoringController controller, ProctoringSettings settings, IText text) { this.controller = controller; @@ -45,6 +51,10 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar HandButton.Click += RaiseHandButton_Click; HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + LoweredIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Lowered.xaml") }; + RaisedIcon = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/Hand_Raised.xaml") }; + Icon.Content = IconResourceLoader.Load(LoweredIcon); + NotificationButton.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => Popup.IsOpen = Popup.IsMouseOver)); NotificationButton.PreviewMouseLeftButtonUp += NotificationButton_PreviewMouseLeftButtonUp; NotificationButton.PreviewMouseRightButtonUp += NotificationButton_PreviewMouseRightButtonUp; @@ -111,17 +121,17 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar private void ShowLowered() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringRaiseHand); + Icon.Content = IconResourceLoader.Load(LoweredIcon); Message.IsEnabled = true; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered); - TextBlock.Text = "L"; } private void ShowRaised() { HandButtonText.Text = text.Get(TextKey.Notification_ProctoringLowerHand); + Icon.Content = IconResourceLoader.Load(RaisedIcon); Message.IsEnabled = false; NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandRaised); - TextBlock.Text = "R"; } } } diff --git a/SafeExamBrowser.UserInterface.Mobile/Images/Hand_Lowered.xaml b/SafeExamBrowser.UserInterface.Mobile/Images/Hand_Lowered.xaml new file mode 100644 index 00000000..b0e08bcb --- /dev/null +++ b/SafeExamBrowser.UserInterface.Mobile/Images/Hand_Lowered.xaml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/Images/Hand_Raised.xaml b/SafeExamBrowser.UserInterface.Mobile/Images/Hand_Raised.xaml new file mode 100644 index 00000000..bb054560 --- /dev/null +++ b/SafeExamBrowser.UserInterface.Mobile/Images/Hand_Raised.xaml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj index 3c0091b6..3c9e55f5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj +++ b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj @@ -265,6 +265,14 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + MSBuild:Compile Designer diff --git a/appveyor-release.yml b/appveyor-release.yml index 946a97d3..ce320963 100644 --- a/appveyor-release.yml +++ b/appveyor-release.yml @@ -12,7 +12,7 @@ assembly_info: file: AssemblyInfo.* assembly_version: '{version}' assembly_file_version: '{version}' - assembly_informational_version: '3.3.1 BETA ($(platform))' + assembly_informational_version: '3.3.1 ($(platform))' install: - appveyor DownloadFile "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" build_script: