Implemented power supply control for classic UI.
This commit is contained in:
dbuechel
parent
37293687d0
commit
b1c91c3639
6 changed files with 161 additions and 24 deletions
|
|
@ -59,13 +59,10 @@ namespace SafeExamBrowser.Core.Behaviour.Operations
|
||||||
CreateLogNotification();
|
CreateLogNotification();
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO:
|
if (systemInfo.HasBattery)
|
||||||
//CreateAboutNotification();
|
{
|
||||||
|
CreatePowerSupplyComponent();
|
||||||
//if (systemInfo.HasBattery)
|
}
|
||||||
//{
|
|
||||||
// CreatePowerSupplyComponent();
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Revert()
|
public void Revert()
|
||||||
|
|
@ -90,17 +87,6 @@ namespace SafeExamBrowser.Core.Behaviour.Operations
|
||||||
taskbar.AddNotification(logNotification);
|
taskbar.AddNotification(logNotification);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CreateAboutNotification()
|
|
||||||
{
|
|
||||||
var aboutInfo = new AboutNotificationInfo(text);
|
|
||||||
var aboutNotification = uiFactory.CreateNotification(aboutInfo);
|
|
||||||
|
|
||||||
aboutController = new AboutNotificationController(settings, text, uiFactory);
|
|
||||||
aboutController.RegisterNotification(aboutNotification);
|
|
||||||
|
|
||||||
taskbar.AddNotification(aboutNotification);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CreatePowerSupplyComponent()
|
private void CreatePowerSupplyComponent()
|
||||||
{
|
{
|
||||||
var control = uiFactory.CreatePowerSupplyControl();
|
var control = uiFactory.CreatePowerSupplyControl();
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
<UserControl x:Class="SafeExamBrowser.UserInterface.Classic.Controls.PowerSupplyControl"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
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="40">
|
||||||
|
<UserControl.Resources>
|
||||||
|
<ResourceDictionary>
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<ResourceDictionary Source="../Templates/Buttons.xaml" />
|
||||||
|
<ResourceDictionary Source="../Templates/Colors.xaml" />
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
|
</UserControl.Resources>
|
||||||
|
<Grid>
|
||||||
|
<Popup x:Name="Popup" IsOpen="False" Placement="Top" PlacementTarget="{Binding ElementName=Button}">
|
||||||
|
<Border Background="LightGray" BorderBrush="Gray" BorderThickness="0.5,0.5,0.5,0" MaxWidth="250" Padding="20,10,20,20">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Grid Grid.Row="0">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Button Grid.Column="1" Background="Transparent" BorderBrush="LightGray" Click="Button_Click" Cursor="Hand" FontWeight="Bold"
|
||||||
|
Foreground="Gray" HorizontalAlignment="Center" Margin="0,0,0,5" Width="20">X</Button>
|
||||||
|
</Grid>
|
||||||
|
<TextBlock Grid.Row="1" x:Name="PopupText" TextWrapping="Wrap" />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Popup>
|
||||||
|
<Button x:Name="Button" Background="Transparent" Template="{StaticResource TaskbarButton}">
|
||||||
|
<Viewbox Stretch="Uniform" Width="Auto">
|
||||||
|
<Canvas Height="40" Width="40">
|
||||||
|
<Viewbox Stretch="Uniform" Width="40" Panel.ZIndex="2">
|
||||||
|
<Canvas Width="1024.000" Height="1024.000">
|
||||||
|
<Canvas.LayoutTransform>
|
||||||
|
<RotateTransform Angle="180" />
|
||||||
|
</Canvas.LayoutTransform>
|
||||||
|
<Canvas>
|
||||||
|
<Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
|
||||||
|
<Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 112.000,300.000 L 951.000,300.000 C 970.330,300.000 986.000,315.670 986.000,335.000 L 986.000,689.000 C 986.000,708.330 970.330,724.000 951.000,724.000 L 112.000,724.000 C 92.670,724.000 77.000,708.330 77.000,689.000 L 77.000,335.000 C 77.000,315.670 92.670,300.000 112.000,300.000 Z"/>
|
||||||
|
<Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 25.000,462.500 L 50.000,462.500 C 52.760,462.500 55.000,464.740 55.000,467.500 L 55.000,557.500 C 55.000,560.260 52.760,562.500 50.000,562.500 L 25.000,562.500 C 22.240,562.500 20.000,560.260 20.000,557.500 L 20.000,467.500 C 20.000,464.740 22.240,462.500 25.000,462.500 Z"/>
|
||||||
|
</Canvas>
|
||||||
|
</Canvas>
|
||||||
|
</Viewbox>
|
||||||
|
<Rectangle x:Name="BatteryCharge" Canvas.Left="2" Canvas.Top="12" Fill="Green" Height="16" Width="35" Panel.ZIndex="1" />
|
||||||
|
<Canvas x:Name="PowerPlug" Panel.ZIndex="3" Canvas.Left="4" Canvas.Top="-3">
|
||||||
|
<Canvas.LayoutTransform>
|
||||||
|
<ScaleTransform ScaleX="2" ScaleY="2" />
|
||||||
|
</Canvas.LayoutTransform>
|
||||||
|
<Path Stroke="Black" StrokeStartLineCap="Round" Fill="Black" Data="M2.5,17.5 V10 Q5,10 5,6 H4 V4 H4 V6 H1 V4 H1 V6 H0 Q0,10 2.5,10" />
|
||||||
|
</Canvas>
|
||||||
|
<TextBlock x:Name="Warning" FontSize="36" FontWeight="ExtraBold" Foreground="Red" Canvas.Left="13" Canvas.Top="-7" Panel.ZIndex="3">!</TextBlock>
|
||||||
|
</Canvas>
|
||||||
|
</Viewbox>
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
|
|
@ -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;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Threading;
|
||||||
|
using SafeExamBrowser.Contracts.SystemComponents;
|
||||||
|
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
|
||||||
|
|
||||||
|
namespace SafeExamBrowser.UserInterface.Classic.Controls
|
||||||
|
{
|
||||||
|
public partial class PowerSupplyControl : UserControl, ISystemPowerSupplyControl
|
||||||
|
{
|
||||||
|
private double BATTERY_CHARGE_MAX_WIDTH;
|
||||||
|
|
||||||
|
public PowerSupplyControl()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
BATTERY_CHARGE_MAX_WIDTH = BatteryCharge.Width;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Close()
|
||||||
|
{
|
||||||
|
Popup.IsOpen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetBatteryCharge(double charge, BatteryChargeStatus status)
|
||||||
|
{
|
||||||
|
Dispatcher.BeginInvoke(new Action(() =>
|
||||||
|
{
|
||||||
|
var width = BATTERY_CHARGE_MAX_WIDTH * charge;
|
||||||
|
|
||||||
|
width = width > BATTERY_CHARGE_MAX_WIDTH ? BATTERY_CHARGE_MAX_WIDTH : width;
|
||||||
|
width = width < 0 ? 0 : width;
|
||||||
|
|
||||||
|
BatteryCharge.Width = width;
|
||||||
|
BatteryCharge.Fill = status == BatteryChargeStatus.Low ? Brushes.Orange : BatteryCharge.Fill;
|
||||||
|
BatteryCharge.Fill = status == BatteryChargeStatus.Critical ? Brushes.Red : BatteryCharge.Fill;
|
||||||
|
Warning.Visibility = status == BatteryChargeStatus.Critical ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetPowerGridConnection(bool connected)
|
||||||
|
{
|
||||||
|
Dispatcher.BeginInvoke(new Action(() => PowerPlug.Visibility = connected ? Visibility.Visible : Visibility.Collapsed));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTooltip(string text)
|
||||||
|
{
|
||||||
|
Dispatcher.BeginInvoke(new Action(() => Button.ToolTip = text));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowCriticalBatteryWarning(string warning)
|
||||||
|
{
|
||||||
|
Dispatcher.BeginInvoke(new Action(() => ShowPopup(warning)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowLowBatteryInfo(string info)
|
||||||
|
{
|
||||||
|
Dispatcher.BeginInvoke(new Action(() => ShowPopup(info)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ShowPopup(string text)
|
||||||
|
{
|
||||||
|
Popup.IsOpen = true;
|
||||||
|
PopupText.Text = text;
|
||||||
|
Background = Brushes.LightGray;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Button_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
Popup.IsOpen = false;
|
||||||
|
Background = Brushes.Transparent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -81,6 +81,9 @@
|
||||||
<Compile Include="Controls\NotificationButton.xaml.cs">
|
<Compile Include="Controls\NotificationButton.xaml.cs">
|
||||||
<DependentUpon>NotificationButton.xaml</DependentUpon>
|
<DependentUpon>NotificationButton.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Controls\PowerSupplyControl.xaml.cs">
|
||||||
|
<DependentUpon>PowerSupplyControl.xaml</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="Controls\QuitButton.xaml.cs">
|
<Compile Include="Controls\QuitButton.xaml.cs">
|
||||||
<DependentUpon>QuitButton.xaml</DependentUpon>
|
<DependentUpon>QuitButton.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
@ -121,6 +124,10 @@
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Include="Controls\PowerSupplyControl.xaml">
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</Page>
|
||||||
<Page Include="Controls\QuitButton.xaml">
|
<Page Include="Controls\QuitButton.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic.Templates">
|
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceDictionary Source="../Templates/Colors.xaml" />
|
<ResourceDictionary Source="../Templates/Colors.xaml" />
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
<ControlTemplate x:Key="TaskbarButton" TargetType="Button">
|
<ControlTemplate x:Key="TaskbarButton" TargetType="Button">
|
||||||
<Border x:Name="ButtonContent" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding Background}"
|
<Border x:Name="ButtonContent" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding Background}"
|
||||||
BorderThickness="1" Padding="{TemplateBinding Padding}">
|
BorderThickness="1" Cursor="Hand" Padding="{TemplateBinding Padding}">
|
||||||
<ContentPresenter ContentSource="Content" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
|
<ContentPresenter ContentSource="Content" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="{TemplateBinding VerticalAlignment}" />
|
RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="{TemplateBinding VerticalAlignment}" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|
@ -18,6 +17,7 @@
|
||||||
<Trigger Property="IsPressed" Value="True">
|
<Trigger Property="IsPressed" Value="True">
|
||||||
<Setter TargetName="ButtonContent" Property="BorderBrush" Value="SkyBlue" />
|
<Setter TargetName="ButtonContent" Property="BorderBrush" Value="SkyBlue" />
|
||||||
<Setter TargetName="ButtonContent" Property="BorderThickness" Value="2" />
|
<Setter TargetName="ButtonContent" Property="BorderThickness" Value="2" />
|
||||||
|
<Setter Property="Cursor" Value="Hand" />
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using SafeExamBrowser.Contracts.Configuration;
|
using SafeExamBrowser.Contracts.Configuration;
|
||||||
|
|
@ -68,8 +67,7 @@ namespace SafeExamBrowser.UserInterface.Classic
|
||||||
|
|
||||||
public ISystemPowerSupplyControl CreatePowerSupplyControl()
|
public ISystemPowerSupplyControl CreatePowerSupplyControl()
|
||||||
{
|
{
|
||||||
// TODO:
|
return new PowerSupplyControl();
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ISplashScreen CreateSplashScreen(ISettings settings, IText text)
|
public ISplashScreen CreateSplashScreen(ISettings settings, IText text)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue