From d7593181f5c719f94ec9dfdb9a36cc21c4bb1f40 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Tue, 4 Feb 2020 14:11:04 -0800
Subject: [PATCH] Allow multiple files to be added at once in file concatenator

Also, show the current number of elements.
---
 SourceGen/Tools/WpfGui/FileConcatenator.xaml    |  3 ++-
 SourceGen/Tools/WpfGui/FileConcatenator.xaml.cs | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/SourceGen/Tools/WpfGui/FileConcatenator.xaml b/SourceGen/Tools/WpfGui/FileConcatenator.xaml
index 215269f..57b88be 100644
--- a/SourceGen/Tools/WpfGui/FileConcatenator.xaml
+++ b/SourceGen/Tools/WpfGui/FileConcatenator.xaml
@@ -47,7 +47,8 @@ limitations under the License.
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <TextBlock Grid.Row="0" Text="Select files:" Margin="0,0,0,4"/>
+        <TextBlock Grid.Row="0" Margin="0,0,0,4"
+                   Text="{Binding ConcatItems.Count, StringFormat={}File list ({0} items):}"/>
 
         <DataGrid Name="concatGrid" Grid.Row="1" Height="300" Width="480"
                   IsReadOnly="True"
diff --git a/SourceGen/Tools/WpfGui/FileConcatenator.xaml.cs b/SourceGen/Tools/WpfGui/FileConcatenator.xaml.cs
index 4a8a024..997166e 100644
--- a/SourceGen/Tools/WpfGui/FileConcatenator.xaml.cs
+++ b/SourceGen/Tools/WpfGui/FileConcatenator.xaml.cs
@@ -113,6 +113,7 @@ namespace SourceGen.Tools.WpfGui {
             OpenFileDialog fileDlg = new OpenFileDialog() {
                 Filter = Res.Strings.FILE_FILTER_ALL,
                 FilterIndex = 0,
+                Multiselect = true,
                 Title = (string)FindResource("str_SelectFileTitle")
             };
             if (fileDlg.ShowDialog() != true) {
@@ -120,11 +121,13 @@ namespace SourceGen.Tools.WpfGui {
             }
 
             try {
-                string pathName = Path.GetFullPath(fileDlg.FileName);
-                long length = new FileInfo(pathName).Length;
-                uint crc32 = CRC32.OnWholeFile(pathName);
-                ConcatItems.Add(new ConcatItem(pathName, length, crc32));
-                concatGrid.SelectedIndex = ConcatItems.Count - 1;
+                foreach (string pathName in fileDlg.FileNames) {
+                    // The names in FileNames appear to be fully qualified.
+                    long length = new FileInfo(pathName).Length;
+                    uint crc32 = CRC32.OnWholeFile(pathName);
+                    ConcatItems.Add(new ConcatItem(pathName, length, crc32));
+                    concatGrid.SelectedIndex = ConcatItems.Count - 1;
+                }
             } catch (Exception ex) {
                 string caption = (string)FindResource("str_FileAccessFailedCaption");
                 string fmt = (string)FindResource("str_FileAccessFailedFmt");