diff --git a/HashingTool/ViewModel/UserControl/XMLFileSelector.cs b/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
index 30d3d6be33af60b0ad2dca905997508f73f2cea9..1bcf23c1ccd3699d81beec8b449958e05febc08a 100644
--- a/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
+++ b/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
@@ -177,6 +177,8 @@ namespace HashingTool.ViewModel.UserControl
}
try {
+ _source = fileName;
+ RaisePropertyChanged("Source");
using (var stream = File.OpenRead(fileName)) {
await LoadXMLFile(stream);
}
diff --git a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
index 9de941b9b64fedc0ea43a7ee73e7557cf94a23f7..a50c8504eab7d2d40ec45c665ed724a361d12d5e 100644
--- a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
+++ b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
@@ -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>
diff --git a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
index 1b163bbdb75e0c37be2f08bb8981cfda72362152..1bd88e28ce91c334b2b599fc5a57a938976e9785 100644
--- a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
+++ b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
@@ -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;
+ }
}
}
diff --git a/HashingTool/Views/VerifyComponentInputData.xaml b/HashingTool/Views/VerifyComponentInputData.xaml
index 6ab2c8aad7f85a370acd986df7930a59f5a0027f..0c82bf58d4ba2f56f10009b04fcedd43b0e08cbc 100644
--- a/HashingTool/Views/VerifyComponentInputData.xaml
+++ b/HashingTool/Views/VerifyComponentInputData.xaml
@@ -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>
diff --git a/HashingTool/Views/VerifyJobInputData.xaml b/HashingTool/Views/VerifyJobInputData.xaml
index 0b81c59947a5dfe009f8383fe0c8b258dca736fe..2307c49202577a3bea109881876516567aab2810 100644
--- a/HashingTool/Views/VerifyJobInputData.xaml
+++ b/HashingTool/Views/VerifyJobInputData.xaml
@@ -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">
diff --git a/HashingTool/Views/VerifyResults.xaml b/HashingTool/Views/VerifyResults.xaml
index 66b0852c3b7b287f131e69bd821bae7f90b6037e..63d94449a9295ccce9a1aa010a023dc172fe9b16 100644
--- a/HashingTool/Views/VerifyResults.xaml
+++ b/HashingTool/Views/VerifyResults.xaml
@@ -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>