diff options
| -rw-r--r-- | src/Interface/Dialog.cs | 17 | ||||
| -rw-r--r-- | src/PriceListTools/CombineTool.cs | 5 | ||||
| -rw-r--r-- | src/PriceListTools/ConvertTool.cs | 6 | ||||
| -rw-r--r-- | src/PriceListTools/ExportTool.cs | 9 | ||||
| -rw-r--r-- | src/PriceListTools/MergeTool.cs | 5 | ||||
| -rw-r--r-- | src/Properties/AssemblyInfo.cs | 4 |
6 files changed, 17 insertions, 29 deletions
diff --git a/src/Interface/Dialog.cs b/src/Interface/Dialog.cs index e6c7955..95d676f 100644 --- a/src/Interface/Dialog.cs +++ b/src/Interface/Dialog.cs @@ -36,22 +36,5 @@ namespace RehauSku.Interface else return null; } } - - public static void SaveWorkbookAs() - { - Workbook workbook = AddIn.Excel.ActiveWorkbook; - - using (SaveFileDialog dialog = new SaveFileDialog()) - { - dialog.FileName = workbook.Name; - dialog.Filter = "Файлы Excel (*.xls;*.xlsx;*.xlsm)|*.xls;*.xlsx;*.xlsm"; - - if (dialog.ShowDialog() == DialogResult.OK) - { - string fileName = dialog.FileName; - workbook.SaveAs(fileName); - } - } - } } } diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index eddf9e7..26a2832 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -3,6 +3,7 @@ using RehauSku.Interface; using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using Dialog = RehauSku.Interface.Dialog; namespace RehauSku.PriceListTools @@ -26,7 +27,7 @@ namespace RehauSku.PriceListTools } } - public override void FillTarget() + public override async void FillTarget() { ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count)); ResultBar = new ResultBar(); @@ -51,7 +52,7 @@ namespace RehauSku.PriceListTools FilterByAmount(); ResultBar.Update(); - Interface.Dialog.SaveWorkbookAs(); + await Task.Delay(new TimeSpan(0, 0, 5)); ExcelApp.StatusBar = false; } } diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs index 1bb02f4..dde969c 100644 --- a/src/PriceListTools/ConvertTool.cs +++ b/src/PriceListTools/ConvertTool.cs @@ -1,4 +1,6 @@ using RehauSku.Interface; +using System; +using System.Threading.Tasks; namespace RehauSku.PriceListTools { @@ -11,7 +13,7 @@ namespace RehauSku.PriceListTools Current = new SourcePriceList(ExcelApp.ActiveWorkbook); } - public override void FillTarget() + public override async void FillTarget() { ProgressBar = new ProgressBar("Заполняю строки...", Current.PositionAmount.Count); ResultBar = new ResultBar(); @@ -25,7 +27,7 @@ namespace RehauSku.PriceListTools FilterByAmount(); ResultBar.Update(); - Dialog.SaveWorkbookAs(); + await Task.Delay(new TimeSpan(0, 0, 5)); ExcelApp.StatusBar = false; } } diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 603de8b..6f910b7 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using RehauSku.Interface; +using System.Threading.Tasks; namespace RehauSku.PriceListTools { @@ -21,11 +22,11 @@ namespace RehauSku.PriceListTools } } - public override void FillTarget() + public override async void FillTarget() { ProgressBar = new ProgressBar("Заполняю строки...", PositionAmount.Count); ResultBar = new ResultBar(); - + foreach (var kvp in PositionAmount) { FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column); @@ -35,13 +36,13 @@ namespace RehauSku.PriceListTools FilterByAmount(); ResultBar.Update(); - Interface.Dialog.SaveWorkbookAs(); + await Task.Delay(new TimeSpan(0, 0, 5)); ExcelApp.StatusBar = false; } private void GetSelected() { - object[,] cells = Selection.Value2; + object[,] cells = Selection.Value2; PositionAmount = new Dictionary<Position, double>(); int rowsCount = Selection.Rows.Count; diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs index 179fb81..1eb1d54 100644 --- a/src/PriceListTools/MergeTool.cs +++ b/src/PriceListTools/MergeTool.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; namespace RehauSku.PriceListTools { @@ -24,7 +25,7 @@ namespace RehauSku.PriceListTools } } - public override void FillTarget() + public override async void FillTarget() { ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(x => x.PositionAmount.Count)); ResultBar = new ResultBar(); @@ -41,7 +42,7 @@ namespace RehauSku.PriceListTools FilterByAmount(); ResultBar.Update(); - Dialog.SaveWorkbookAs(); + await Task.Delay(new TimeSpan(0, 0, 5)); ExcelApp.StatusBar = false; } } diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 5f1731a..1493351 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] |