Merge pull request #670 in VECTO/vecto-sim from...

Merge pull request #670 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-780-remove-all-logos-except-com to develop * commit 'd4ad2574': remove TUG/IVT logo from release notes PPTs adding missing images remove tug logos from hashing tool update logo in about dialog update CSS for MRF and CIF XML reports update user manual header logo update user manual

Merge pull request #670 in VECTO/vecto-sim from...
b66711c7 · Markus Quaritsch · 1b0b014c · d4ad2574 · b66711c7 · b66711c7
Commit b66711c7 authored 6 years ago by Markus Quaritsch
--- a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
+++ b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
--- a/Documentation/User Manual/includes/header.html
+++ b/Documentation/User Manual/includes/header.html
@@ -4,10 +4,10 @@
 	<a href="help.html">User Manual</a>
 	</div>
 	<div style="text-align: right">
-	<a href="https://ec.europa.eu/jrc/" target="_blank"><img style="border: 0px solid; width: 173px; height: 36px;" alt="JRC-Logo" src="pics/JRC.png" hspace="5"></a>
-	<a href="http://www.ivt.tugraz.at/" target="_blank"><img src="pics/IVT.png" alt="IVT-Logo" style="border: 0px solid; width: 74px; height: 36px;" hspace="5"></a>
+	<a href="https://ec.europa.eu/clima/" target="_blank"><img style="border: 0px solid; height: 40px;" alt="European Commission" src="pics/EuropeanCommission.jpg" hspace="5"></a>
+<!-- 	<a href="http://www.ivt.tugraz.at/" target="_blank"><img src="pics/IVT.png" alt="IVT-Logo" style="border: 0px solid; width: 74px; height: 36px;" hspace="5"></a>
 	<a href="http://portal.tugraz.at/pls/portal/url/page/TU_Graz" target="_blank"><img src="pics/TUG.png" alt="TUG-Logo" style="border: 0px solid; width: 96px; height: 36px;" hspace="5"></a>
-	</div>
+ -->	</div>
 </div>
 <div id="CONTENT">
 </div>
\ No newline at end of file
--- a/Documentation/User Manual/pics/EuropeanCommission.jpg
+++ b/Documentation/User Manual/pics/EuropeanCommission.jpg
--- a/Documentation/VectoHashingTool/images/EuropeanCommission.jpg
+++ b/Documentation/VectoHashingTool/images/EuropeanCommission.jpg
--- a/Documentation/VectoHashingTool/includes/header.html
+++ b/Documentation/VectoHashingTool/includes/header.html
@@ -4,9 +4,9 @@
 	<a href="HashingToolHelp.html">User Manual</a>
 	</div>
 	<div style="text-align: right">
-	<a href="https://ec.europa.eu/jrc/" target="_blank"><img style="border: 0px solid; width: 173px; height: 36px;" alt="JRC-Logo" src="images/JRC.png" hspace="5"></a>
-	<a href="http://www.ivt.tugraz.at/" target="_blank"><img src="images/IVT.png" alt="IVT-Logo" style="border: 0px solid; width: 74px; height: 36px;" hspace="5"></a>
-	<a href="http://portal.tugraz.at/pls/portal/url/page/TU_Graz" target="_blank"><img src="images/TUG.png" alt="TUG-Logo" style="border: 0px solid; width: 96px; height: 36px;" hspace="5"></a>
+	<a href="https://ec.europa.eu/jrc/" target="_blank"><img style="border: 0px solid; height: 40px;" alt="JRC-Logo" src="images/EuropeanCommission.jpg" hspace="5"></a>
+	<!-- <a href="http://www.ivt.tugraz.at/" target="_blank"><img src="images/IVT.png" alt="IVT-Logo" style="border: 0px solid; width: 74px; height: 36px;" hspace="5"></a>
+	<a href="http://portal.tugraz.at/pls/portal/url/page/TU_Graz" target="_blank"><img src="images/TUG.png" alt="TUG-Logo" style="border: 0px solid; width: 96px; height: 36px;" hspace="5"></a> -->
 	</div>
 </div>
 <div id="CONTENT">

--- a/Documentation/XML/CSS/VectoReports.css
+++ b/Documentation/XML/CSS/VectoReports.css
--- 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">

--- a/HashingTool/Resources/EuropeanCommission.jpg
+++ b/HashingTool/Resources/EuropeanCommission.jpg
--- 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"/>

--- 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>

--- a/VECTO/GUI/AboutBox.Designer.vb
+++ b/VECTO/GUI/AboutBox.Designer.vb
@@ -36,6 +36,7 @@ Partial Class AboutBox
 	'Das Bearbeiten mit dem Code-Editor ist nicht mÃ¶glich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(AboutBox))
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
@@ -62,11 +63,13 @@ Partial Class AboutBox
        '
        Me.Label8.AutoSize = true
        Me.Label8.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.Label8.Location = New System.Drawing.Point(27, 263)
+        Me.Label8.ImageAlign = System.Drawing.ContentAlignment.TopLeft
+        Me.Label8.Location = New System.Drawing.Point(32, 264)
+        Me.Label8.Margin = New System.Windows.Forms.Padding(0)
        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(157, 39)
+        Me.Label8.Size = New System.Drawing.Size(198, 13)
        Me.Label8.TabIndex = 3
-        Me.Label8.Text = "Joint Research Centre"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"Sustainable Transport Unit"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"European Commission"
+        Me.Label8.Text = "European Commission DG CLIMA"
        '
        'PictureBox1
        '
@@ -116,15 +119,16 @@ Partial Class AboutBox
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(237, 13)
        Me.Label3.TabIndex = 19
-        Me.Label3.Text = "Copyright © 2012-2016 European Union"
+        Me.Label3.Text = "Copyright © 2012-2019 European Union"
        '
        'PictureBoxJRC
        '
        Me.PictureBoxJRC.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBoxJRC.Image = Global.TUGraz.VECTO.My.Resources.Resources.JRC_About
-        Me.PictureBoxJRC.Location = New System.Drawing.Point(219, 248)
+        Me.PictureBoxJRC.Image = CType(resources.GetObject("PictureBoxJRC.Image"),System.Drawing.Image)
+        Me.PictureBoxJRC.Location = New System.Drawing.Point(240, 248)
        Me.PictureBoxJRC.Name = "PictureBoxJRC"
-        Me.PictureBoxJRC.Size = New System.Drawing.Size(260, 54)
+        Me.PictureBoxJRC.Size = New System.Drawing.Size(230, 54)
+        Me.PictureBoxJRC.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
        Me.PictureBoxJRC.TabIndex = 15
        Me.PictureBoxJRC.TabStop = false
        '

--- a/VECTO/GUI/AboutBox.resx
+++ b/VECTO/GUI/AboutBox.resx
@@ -117,4 +117,114 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="PictureBoxJRC.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
 </root>
\ No newline at end of file