Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 5713f326 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Pull request #221: Bugfix/VECTO-1597 hashing tool crashes when using .net version 6.0 

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1597-hashing-tool-crashes-when-using-.net-version-6.0 to develop

* commit '756ea17d':
  add file drag&drop functionality to xml file selector user controls
  use one-way binding for read-only properties where necessary
  correct binding for XML File Selector
parents 16287a35 756ea17d
No related branches found
Tags Build/V3.0.1.312
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 15 deletions
HashingTool/ViewModel/UserControl/XMLFileSelector.cs
+ 2
− 0
View file @ 5713f326
......@@ -177,6 +177,8 @@ namespace HashingTool.ViewModel.UserControl
}
try {
_source = fileName;
RaisePropertyChanged("Source");
using (var stream = File.OpenRead(fileName)) {
await LoadXMLFile(stream);
}
......
HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
+ 3
− 3
View file @ 5713f326
......@@ -7,12 +7,12 @@
xmlns:userControl="clr-namespace:HashingTool.ViewModel.UserControl"
x:Class="HashingTool.Views.VectoXMLFileSelector"
mc:Ignorable="d" d:DesignWidth="456" MinHeight="32"
d:DataContext="{d:DesignInstance views:VectoXMLFileSelector}">
d:DataContext="{d:DesignInstance views:VectoXMLFileSelector}" >
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
</UserControl.Resources>
<StackPanel Margin="0,5" HorizontalAlignment="Stretch">
<DockPanel HorizontalAlignment="Stretch" Height="Auto" Margin="0" VerticalAlignment="Top">
<DockPanel HorizontalAlignment="Stretch" Height="Auto" Margin="0" VerticalAlignment="Top" AllowDrop="True" Drop="XMLFileBrowser_Drop">
<!--<ContentControl DockPanel.Dock="Right"
Visibility="{Binding XMLFile.HasContentValidation, Converter={StaticResource BoolToVis}}" Width="40" Height="40"
......@@ -75,7 +75,7 @@
VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" />
<TextBox DockPanel.Dock="Left" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="23"
Margin="0,0,10,0" TextWrapping="NoWrap" Text="{Binding XMLFile.Source, UpdateSourceTrigger=PropertyChanged}">
Margin="0,0,10,0" TextWrapping="NoWrap" Text="{Binding XMLFile.Source, Mode=OneWay}" IsReadOnly="True" PreviewDragOver="XMLFileBrowser_DragOver">
<TextBox.InputBindings>
<KeyBinding Command="{Binding XMLFile.SetXMLFileCommnd}" Key="Return" />
</TextBox.InputBindings>
......
HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
+ 14
− 0
View file @ 5713f326
......@@ -63,5 +63,19 @@ namespace HashingTool.Views
dialog.ErrorCount = XMLFile.XMLValidationErrors.Count;
dialog.ShowDialog();
}
private void XMLFileBrowser_Drop(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
var files = (string[])e.Data.GetData(DataFormats.FileDrop);
XMLFile.SetXMLFileCommnd.Execute(files?[0]);
}
}
private void XMLFileBrowser_DragOver(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
e.Handled = true;
}
}
}
HashingTool/Views/VerifyComponentInputData.xaml
+ 3
− 3
View file @ 5713f326
......@@ -74,7 +74,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="0" Grid.Column="2" Content="Date:" />
<TextBox Grid.Row="0" Grid.Column="3" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g'}" Margin="10,2" IsReadOnly="True" />
<TextBox Grid.Row="0" Grid.Column="3" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g', Mode=OneWay}" Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="1" Grid.Column="0" Content="Component:" />
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding Component}" Margin="10,2" IsReadOnly="True" />
......@@ -90,7 +90,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="4" Grid.Column="0" Content="Digest Value read:" Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueRead}" Margin="10,2" IsReadOnly="True">
<TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueRead, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
......@@ -107,7 +107,7 @@
<Label Grid.Row="5" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueComputed}" Margin="10,2" IsReadOnly="True">
<TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
......
HashingTool/Views/VerifyJobInputData.xaml
+ 1
− 1
View file @ 5713f326
......@@ -79,7 +79,7 @@
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed}" Margin="10,2"
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2"
IsReadOnly="True" Style="{StaticResource DigestValueTextboxStyle}" />
<ContentControl Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="0,10,0,0"
VerticalAlignment="Top" Width="50" Height="50">
......
HashingTool/Views/VerifyResults.xaml
+ 8
− 8
View file @ 5713f326
......@@ -124,7 +124,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value computed:" Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed}"
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}"
Margin="10,2" IsReadOnly="True" Style="{StaticResource DigestValueTextboxStyle}" />
<!--<Expander Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="4" Header="Components">-->
......@@ -181,7 +181,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="1" Grid.Column="1" Content="Digest Value:" />
<TextBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="3" Text="{Binding DigestValueRead}"
<TextBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="3" Text="{Binding DigestValueRead, Mode=OneWay}"
Margin="10,2">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
......@@ -245,7 +245,7 @@
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Creation Date:" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g'}"
<TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, Mode=OneWay, StringFormat='g'}"
Margin="10,2" MinWidth="150" />
<Label Grid.Row="1" Grid.Column="0" Content="Canonicalization methods:" />
......@@ -257,7 +257,7 @@
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding DigestMethod, Mode=OneWay}" Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value read:" Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead}" Margin="10,2" IsReadOnly="True">
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
......@@ -274,7 +274,7 @@
<Label Grid.Row="4" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed}" Margin="10,2" IsReadOnly="True">
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
......@@ -429,7 +429,7 @@
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Creation Date:" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g'}"
<TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, Mode=OneWay, StringFormat='g'}"
Margin="10,2" MinWidth="150" />
<Label Grid.Row="1" Grid.Column="0" Content="Canonicalization methods:" />
......@@ -441,7 +441,7 @@
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding DigestMethod, Mode=OneWay}" Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value read:" Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead}" Margin="10,2" IsReadOnly="True">
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
......@@ -458,7 +458,7 @@
<Label Grid.Row="4" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed}" Margin="10,2" IsReadOnly="True">
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about