styling
This commit is contained in:
Luc
parent
e948fab111
commit
861b9efa20
6 changed files with 92 additions and 64 deletions
|
|
@ -3,7 +3,7 @@
|
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
|
||||
<?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.3.1.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.4.2.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
|
||||
<Media Id="1" EmbedCab="yes" Cabinet="cab" />
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
|
|
|
|||
|
|
@ -14,43 +14,49 @@
|
|||
<StatusBar DockPanel.Dock="Bottom" >
|
||||
<StatusBarItem Name="statusEPD" Content="Epd" />
|
||||
</StatusBar>
|
||||
<TabControl>
|
||||
<TabItem Name="Wait" HorizontalAlignment="Center" VerticalAlignment="Center" >
|
||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
|
||||
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" />
|
||||
<telerik:RadButton Name="bCancel" Content="Cancel" Style="{DynamicResource OkCancelButton}" />
|
||||
<TabControl>
|
||||
<TabItem Name="Wait" HorizontalAlignment="Center" VerticalAlignment="Center" >
|
||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
|
||||
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" FontWeight="Bold" >
|
||||
<TextBlock.Foreground>
|
||||
<SolidColorBrush Color="{DynamicResource sckcP}"/>
|
||||
</TextBlock.Foreground>
|
||||
</TextBlock>
|
||||
<telerik:RadButton Name="bCancel" Content="Cancel" Style="{DynamicResource OkCancelButton}" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="ok" VerticalAlignment="Center" >
|
||||
<Grid TextBlock.FontSize="40" >
|
||||
<Grid.RowDefinitions >
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.ColumnSpan="4" Text="EPD returned" FontSize="50" Foreground="{DynamicResource sckbP}" FontWeight="Bold" TextAlignment="Center" Background="{DynamicResource sckbLB}" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="Pers ID:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Name="Wearer" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="50,5,20,5" Text="12345" Foreground="{DynamicResource sckbP}" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" Text="Visit:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="3" Name= "EpdVisit" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,5,20,5" Text="12345545" Foreground="{DynamicResource sckbP}" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="0" Text="Dose" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
|
||||
<StackPanel Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Vertical" VerticalAlignment="Center" Name="DosePanel" >
|
||||
<TextBlock Name="HpDose07" Text="1234" HorizontalAlignment="Left" Margin="50,0,0,0" Foreground="{DynamicResource sckbP}" />
|
||||
<TextBlock Name="HpDose10" Text="1223" HorizontalAlignment="Left" Margin="50,0,0,0" Foreground="{DynamicResource sckbP}" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="ok" VerticalAlignment="Center" >
|
||||
<Grid TextBlock.FontSize="40" >
|
||||
<Grid.RowDefinitions >
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Text="Pers ID:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Name="Wearer" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="2" Text="Visit:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="3" Name= "EpdVisit" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="Dose" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" />
|
||||
<StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Vertical" VerticalAlignment="Center" Name="DosePanel" >
|
||||
<TextBlock Name="HpDose07" />
|
||||
<TextBlock Name="HpDose10" />
|
||||
</StackPanel>
|
||||
<telerik:RadButton Grid.Row="2" Grid.Column="1" Name="bCloseExit" Click="BCloseExit_Click" Content="OK" Width="190" Style="{StaticResource OkCancelButton}" />
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Name="Alarm" Height="23" VerticalAlignment="Center">
|
||||
<StackPanel>
|
||||
<Border Background="LightYellow" TextBlock.FontSize="22" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
|
||||
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" >
|
||||
<telerik:RadButton Grid.Row="3" Grid.Column="1" Name="bCloseExit" Click="BCloseExit_Click" Content="OK" Width="190" Style="{StaticResource OkCancelButton}" Margin="0,50,0,0" Grid.ColumnSpan="2" />
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Name="Alarm" Height="23" VerticalAlignment="Center">
|
||||
<StackPanel>
|
||||
<Border Background="LightYellow" TextBlock.FontSize="22" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
|
||||
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" >
|
||||
<LineBreak/>
|
||||
<Run>Your dose and/or doserate has been above the alarmlevel</Run>
|
||||
<Run>during your visit !</Run>
|
||||
|
|
@ -60,15 +66,15 @@
|
|||
<LineBreak/><LineBreak/>
|
||||
<Run>He needs to validate and clear your alarm(s).</Run>
|
||||
<LineBreak/>
|
||||
</TextBlock>
|
||||
</Border>
|
||||
<telerik:RadButton Name="bConfirmAlarm" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="OtherAlarm" >
|
||||
<StackPanel>
|
||||
<Border Background="LightYellow" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
|
||||
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" >
|
||||
</TextBlock>
|
||||
</Border>
|
||||
<telerik:RadButton Name="bConfirmAlarm" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="OtherAlarm" >
|
||||
<StackPanel>
|
||||
<Border Background="LightYellow" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
|
||||
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" >
|
||||
<LineBreak/>
|
||||
<Run>Your EPD has encountered a problem.</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
|
|
@ -76,12 +82,12 @@
|
|||
<LineBreak/>
|
||||
<LineBreak/>
|
||||
<Run> He needs to investigate the alarm.</Run>
|
||||
</TextBlock>
|
||||
</Border>
|
||||
<telerik:RadButton Name="bConfirmAlarm2" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</TextBlock>
|
||||
</Border>
|
||||
<telerik:RadButton Name="bConfirmAlarm2" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</DockPanel>
|
||||
</Window>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
Title="eDose Station" Height="814.417" Width="1316.258"
|
||||
FontFamily="Segoe UI"
|
||||
FontSize="36"
|
||||
WindowStartupLocation="CenterScreen" WindowState="Maximized"
|
||||
WindowStartupLocation="CenterScreen" WindowState="Maximized" WindowStyle="None"
|
||||
Loaded="Window_Loaded" GotFocus="Window_GotFocus" LostFocus="Window_LostFocus"
|
||||
>
|
||||
<DockPanel>
|
||||
|
|
@ -18,10 +18,13 @@
|
|||
<MenuItem Header="Advanced Settings" >
|
||||
<MenuItem Header="Enc" Name="mEnc" Click="MEnc_Click" />
|
||||
</MenuItem>
|
||||
<Separator></Separator>
|
||||
<MenuItem Header="About" Name="mAbout" Click="mAbout_Click" HorizontalAlignment="Right" />
|
||||
<Separator/>
|
||||
<MenuItem Header="E_xit" Name="mExit" Click="mExit_Click" HorizontalAlignment="Right" />
|
||||
</Menu>
|
||||
<StatusBar DockPanel.Dock="Bottom" >
|
||||
<StatusBarItem Name="Status" Content="Offline" HorizontalContentAlignment="Center" HorizontalAlignment="Stretch"/>
|
||||
<StatusBarItem Name="Status" Content="Offline" HorizontalContentAlignment="Center" HorizontalAlignment="Stretch" />
|
||||
</StatusBar>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
|
|
@ -32,13 +35,13 @@
|
|||
<DockPanel Grid.Row="1">
|
||||
<Grid DockPanel.Dock="Top">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Source="/Images/logoh60.png" Height="60" HorizontalAlignment="Left" />
|
||||
<TextBlock Grid.Column="1" FontSize="30" Text="HPH eDos" TextAlignment="Center" Foreground="{StaticResource sckbP}" FontWeight="Bold" VerticalAlignment="Center" />
|
||||
<TextBlock Grid.Column="2" FontSize="30" Name="tbTime" Text="2021-04-02 08:00" TextAlignment="Right" VerticalAlignment="Center" Foreground="{StaticResource sckbP}" />
|
||||
<Image Source="/Images/logoh60.png" Height="60" HorizontalAlignment="Left" Margin="0,0,10,2" />
|
||||
<TextBlock Grid.Column="1" FontSize="30" Text="HPH eDos" TextAlignment="Center" Foreground="{StaticResource sckbP}" FontWeight="Bold" VerticalAlignment="Center" Background="{DynamicResource sckbLB}" />
|
||||
<TextBlock Grid.Column="2" FontSize="30" Name="tbTime" Text="2021-04-02 08:00" TextAlignment="Right" VerticalAlignment="Center" Foreground="{StaticResource sckbP}" HorizontalAlignment="Right" Padding="20,0" Background="{DynamicResource sckbLB}" />
|
||||
</Grid>
|
||||
<StackPanel DockPanel.Dock="Left" Width="100" />
|
||||
<StackPanel DockPanel.Dock="right" Width="100" />
|
||||
|
|
@ -55,7 +58,7 @@
|
|||
</Border>
|
||||
<telerik:RadButton Grid.Row="1" Grid.Column="0" Content="Entry" Name="bEntry" Click="BEntry_Click" Margin="20,20,20,20" Style="{StaticResource bigButton}" />
|
||||
<telerik:RadButton Grid.Row="2" Grid.Column="0" Content="Exit" Name="bExit" Click="BExit_Click" Margin="20,20,20,20" Style="{StaticResource bigButton}" />
|
||||
<telerik:RadButton Grid.Row="3" Grid.Column="0" Content="Show EPD Dosis" Click="Button_Click" Margin="20,20.4,19.6,0" Style="{StaticResource bigButton}" Height="183" VerticalAlignment="Top" />
|
||||
<telerik:RadButton Grid.Row="3" Grid.Column="0" Content="Show EPD Dosis" Click="Button_Click" Margin="20,20,20,20" Style="{StaticResource bigButton}" />
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -71,13 +71,13 @@ namespace eDosStation
|
|||
{
|
||||
if (!dataInterface.isOnline())
|
||||
{
|
||||
Status.Content = "*** Offline ***";
|
||||
Status.Content = "*** Offline ***";
|
||||
Status.Foreground = Brushes.Yellow;
|
||||
Status.Background = Brushes.Red;
|
||||
}
|
||||
else
|
||||
{
|
||||
Status.Content = ">>> Online >>>";
|
||||
Status.Content = "--- Online ---";
|
||||
Status.Foreground = Brushes.Green;
|
||||
Status.Background = Brushes.White;
|
||||
}
|
||||
|
|
@ -187,5 +187,10 @@ namespace eDosStation
|
|||
About x = new About(thisStation);
|
||||
x.ShowDialog();
|
||||
}
|
||||
|
||||
private void mExit_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Application.Current.Shutdown();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.4.1.0")]
|
||||
[assembly: AssemblyFileVersion("1.4.0.0")]
|
||||
[assembly: AssemblyVersion("1.4.2.0")]
|
||||
[assembly: AssemblyFileVersion("1.4.2.0")]
|
||||
|
|
|
|||
|
|
@ -226,4 +226,18 @@
|
|||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="xstatusOnLine" TargetType="StatusBarItem">
|
||||
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding Content}" Value="Offline">
|
||||
<Setter Property="Background" Value="Red"/>
|
||||
<Setter Property="Foreground" Value="Yellow"/>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding Content}" Value="Online">
|
||||
<Setter Property="Background" Value="White"/>
|
||||
<Setter Property="Foreground" Value="Green"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
Loading…
Add table
Reference in a new issue