From 426c5d9012b4af23abdd3196be4b4cc38c06fc13 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 4 Dec 2018 09:54:41 +0100
Subject: [PATCH] remove tug logos from hashing tool
---
HashingTool/MainWindow.xaml | 6 +-
HashingTool/Views/AboutDialog.xaml | 8 +--
HashingTool/Views/VerifyResults.xaml | 100 +++++++++++++--------------
3 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/HashingTool/MainWindow.xaml b/HashingTool/MainWindow.xaml
index 2b6ad1f7dd..a5b89bda6e 100644
--- a/HashingTool/MainWindow.xaml
+++ b/HashingTool/MainWindow.xaml
@@ -46,12 +46,8 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
- <Image Grid.Column="0" HorizontalAlignment="Center" Height="44" VerticalAlignment="Center" Width="auto"
- Source="Resources/IVT_91x44.png" />
- <Image Grid.Column="1" HorizontalAlignment="Center" Height="34" VerticalAlignment="Center" Width="auto"
- Source="Resources/TUG_91x34.png" />
<Image Grid.Column="2" HorizontalAlignment="Center" Height="44" VerticalAlignment="Center" Width="auto"
- Source="Resources/JRC-About.png" />
+ Source="Resources/EuropeanCommission.jpg" />
</Grid>
</Border>
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,10,0">
diff --git a/HashingTool/Views/AboutDialog.xaml b/HashingTool/Views/AboutDialog.xaml
index f4e7131916..73c67adcc7 100644
--- a/HashingTool/Views/AboutDialog.xaml
+++ b/HashingTool/Views/AboutDialog.xaml
@@ -31,11 +31,11 @@
<TextBlock Text="Developed on behalf of the" Margin="0, 50, 0, 0"/>
<StackPanel Orientation="Horizontal" Margin="20,70,20,0" HorizontalAlignment="Center" Height="80" VerticalAlignment="Top">
<TextBlock VerticalAlignment="Center" Margin="0,0,60,0">
- Joint Research Centre<LineBreak/>
- Sustainable Transport Unit<LineBreak/>
- European Commission
+ European Commission<LineBreak/>
+ DG CLIMA<LineBreak/>
+
</TextBlock>
- <Image Source="../Resources/JRC-About.png" Stretch="Uniform" Width="240"/>
+ <Image Source="../Resources/EuropeanCommission.jpg" Stretch="Uniform" Width="240"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0, 155, 0,0">
<TextBlock Text="Support Contact:" Margin="0,0,30,0"/>
diff --git a/HashingTool/Views/VerifyResults.xaml b/HashingTool/Views/VerifyResults.xaml
index 6dbecb27c9..66b0852c3b 100644
--- a/HashingTool/Views/VerifyResults.xaml
+++ b/HashingTool/Views/VerifyResults.xaml
@@ -219,7 +219,7 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
- <RowDefinition/>
+ <RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="LabelsShareGroup"/>
@@ -291,63 +291,63 @@
</Grid>
</GroupBox>
- <GroupBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Header="Manufacturer Report Integrity" Style="{DynamicResource CustomGroupboxStyle}">
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" SharedSizeGroup="LabelsShareGroup" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
- <Grid.RowDefinitions>
- <RowDefinition />
- <RowDefinition />
- <RowDefinition />
- <RowDefinition />
-
- </Grid.RowDefinitions>
- <Label Grid.Row="0" Grid.Column="0" Content="CanonicalizationMethod:" />
- <TextBox Grid.Row="0" Grid.Column="1"
+ <GroupBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Header="Manufacturer Report Integrity" Style="{DynamicResource CustomGroupboxStyle}">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" SharedSizeGroup="LabelsShareGroup" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition />
+ <RowDefinition />
+ <RowDefinition />
+ <RowDefinition />
+
+ </Grid.RowDefinitions>
+ <Label Grid.Row="0" Grid.Column="0" Content="CanonicalizationMethod:" />
+ <TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding ManufacturerReportCanonicalizationMethodRead, Mode=OneWay, Converter={StaticResource CollectionConverter}}"
Margin="10,2" IsReadOnly="True" />
- <Label Grid.Row="1" Grid.Column="0" Content="Digest Method:" />
- <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ManufacturerReportDigestMethodRead, Mode=OneWay}"
+ <Label Grid.Row="1" Grid.Column="0" Content="Digest Method:" />
+ <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ManufacturerReportDigestMethodRead, Mode=OneWay}"
Margin="10,2" IsReadOnly="True" />
- <Label Grid.Row="2" Grid.Column="0" Content="Digest Value Read:"
+ <Label Grid.Row="2" Grid.Column="0" Content="Digest Value Read:"
Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding ManufacturerReportDigestValueRead, Mode=OneWay}"
+ <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding ManufacturerReportDigestValueRead, Mode=OneWay}"
Margin="10,2" IsReadOnly="True">
- <TextBox.Style>
- <Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
- <Setter Property="Foreground" Value="{StaticResource Color.ErrorRed}" />
- <Style.Triggers>
- <DataTrigger Binding="{Binding ManufacturerReportDigestValid}" Value="True">
- <Setter Property="Foreground" Value="{StaticResource Color.SuccessGreen}" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </TextBox.Style>
- </TextBox>
-
- <Label Grid.Row="3" Grid.Column="0" Content="Digest Value Computed:"
+ <TextBox.Style>
+ <Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
+ <Setter Property="Foreground" Value="{StaticResource Color.ErrorRed}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding ManufacturerReportDigestValid}" Value="True">
+ <Setter Property="Foreground" Value="{StaticResource Color.SuccessGreen}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBox.Style>
+ </TextBox>
+
+ <Label Grid.Row="3" Grid.Column="0" Content="Digest Value Computed:"
Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ManufacturerReportDigestValueComputed, Mode=OneWay}"
+ <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ManufacturerReportDigestValueComputed, Mode=OneWay}"
Margin="10,2" IsReadOnly="True">
- <TextBox.Style>
- <Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
- <Setter Property="Foreground" Value="{StaticResource Color.ErrorRed}" />
- <Style.Triggers>
- <DataTrigger Binding="{Binding ManufacturerReportDigestValid}" Value="True">
- <Setter Property="Foreground" Value="{StaticResource Color.SuccessGreen}" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </TextBox.Style>
- </TextBox>
- </Grid>
- </GroupBox>
-
- <GroupBox Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Header="Job Integrity" Style="{DynamicResource CustomGroupboxStyle}">
+ <TextBox.Style>
+ <Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
+ <Setter Property="Foreground" Value="{StaticResource Color.ErrorRed}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding ManufacturerReportDigestValid}" Value="True">
+ <Setter Property="Foreground" Value="{StaticResource Color.SuccessGreen}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBox.Style>
+ </TextBox>
+ </Grid>
+ </GroupBox>
+
+ <GroupBox Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Header="Job Integrity" Style="{DynamicResource CustomGroupboxStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="LabelsShareGroup" />
@@ -828,7 +828,7 @@
<Style TargetType="ContentControl">
<Setter Property="ContentTemplate" Value="{StaticResource Icon_NOK}" />
<Style.Triggers>
- <DataTrigger Binding="{Binding CustomerReport.ManufacturerReportMatchesReport}" Value="True">
+ <DataTrigger Binding="{Binding CustomerReport.ManufacturerReportMatchesReport}" Value="True">
<Setter Property="ContentTemplate" Value="{StaticResource Icon_OK}" />
</DataTrigger>
</Style.Triggers>
--
GitLab