aboutsummaryrefslogtreecommitdiff
path: root/RhSolutions.AddIn/Controllers/MergeTool.cs
diff options
context:
space:
mode:
Diffstat (limited to 'RhSolutions.AddIn/Controllers/MergeTool.cs')
-rw-r--r--RhSolutions.AddIn/Controllers/MergeTool.cs20
1 files changed, 15 insertions, 5 deletions
diff --git a/RhSolutions.AddIn/Controllers/MergeTool.cs b/RhSolutions.AddIn/Controllers/MergeTool.cs
index dec8ff7..8566ee7 100644
--- a/RhSolutions.AddIn/Controllers/MergeTool.cs
+++ b/RhSolutions.AddIn/Controllers/MergeTool.cs
@@ -1,4 +1,5 @@
-using RhSolutions.Models;
+using RhSolutions.AddIn;
+using RhSolutions.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -11,12 +12,21 @@ namespace RhSolutions.Controllers
public MergeTool()
{
- string[] files = Dialog.GetMultiplyFiles();
+ var dialog = RhSolutionsAddIn.Excel.FileDialog[Microsoft.Office.Core.MsoFileDialogType.msoFileDialogFilePicker];
+ dialog.AllowMultiSelect = true;
+ dialog.Filters.Add("Файлы Excel", "*.xls; *.xlsx; *.xlsm");
- if (files != null)
+ if ( dialog.Show() < 0)
{
- SourceFiles = SourcePriceList.GetSourceLists(files);
- }
+ List<string> files = new();
+
+ foreach (string file in dialog.SelectedItems)
+ {
+ files.Add(file);
+ }
+
+ SourceFiles = SourcePriceList.GetSourceLists(files.ToArray());
+ }
else
{