chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Turn off save as file dialog at the end of tool process. Version update.

Browse Source
This commit is contained in:
Sergey Chebotar 2022-03-24 06:59:31 +03:00
parent 68d2b4e2fb
commit eaf3ebaa94
6 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Interface/Dialog.cs
View File

@ -36,22 +36,5 @@ namespace RehauSku.Interface
else return null; 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);
}
}
}
} }
} }

5
src/PriceListTools/CombineTool.cs
View File

@ -3,6 +3,7 @@ using RehauSku.Interface;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using Dialog = RehauSku.Interface.Dialog; using Dialog = RehauSku.Interface.Dialog;
namespace RehauSku.PriceListTools 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)); ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count));
ResultBar = new ResultBar(); ResultBar = new ResultBar();
@ -51,7 +52,7 @@ namespace RehauSku.PriceListTools
FilterByAmount(); FilterByAmount();
ResultBar.Update(); ResultBar.Update();
Interface.Dialog.SaveWorkbookAs(); await Task.Delay(new TimeSpan(0, 0, 5));
ExcelApp.StatusBar = false; ExcelApp.StatusBar = false;
} }
} }

6
src/PriceListTools/ConvertTool.cs
View File

@ -1,4 +1,6 @@
using RehauSku.Interface; using RehauSku.Interface;
using System;
using System.Threading.Tasks;
namespace RehauSku.PriceListTools namespace RehauSku.PriceListTools
{ {
@ -11,7 +13,7 @@ namespace RehauSku.PriceListTools
Current = new SourcePriceList(ExcelApp.ActiveWorkbook); Current = new SourcePriceList(ExcelApp.ActiveWorkbook);
} }
public override void FillTarget() public override async void FillTarget()
{ {
ProgressBar = new ProgressBar("Заполняю строки...", Current.PositionAmount.Count); ProgressBar = new ProgressBar("Заполняю строки...", Current.PositionAmount.Count);
ResultBar = new ResultBar(); ResultBar = new ResultBar();
@ -25,7 +27,7 @@ namespace RehauSku.PriceListTools
FilterByAmount(); FilterByAmount();
ResultBar.Update(); ResultBar.Update();
Dialog.SaveWorkbookAs(); await Task.Delay(new TimeSpan(0, 0, 5));
ExcelApp.StatusBar = false; ExcelApp.StatusBar = false;
} }
} }

9
src/PriceListTools/ExportTool.cs
View File

@ -2,6 +2,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using RehauSku.Interface; using RehauSku.Interface;
using System.Threading.Tasks;
namespace RehauSku.PriceListTools namespace RehauSku.PriceListTools
{ {
@ -21,11 +22,11 @@ namespace RehauSku.PriceListTools
} }
} }
public override void FillTarget() public override async void FillTarget()
{ {
ProgressBar = new ProgressBar("Заполняю строки...", PositionAmount.Count); ProgressBar = new ProgressBar("Заполняю строки...", PositionAmount.Count);
ResultBar = new ResultBar(); ResultBar = new ResultBar();
foreach (var kvp in PositionAmount) foreach (var kvp in PositionAmount)
{ {
FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column); FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
@ -35,13 +36,13 @@ namespace RehauSku.PriceListTools
FilterByAmount(); FilterByAmount();
ResultBar.Update(); ResultBar.Update();
Interface.Dialog.SaveWorkbookAs(); await Task.Delay(new TimeSpan(0, 0, 5));
ExcelApp.StatusBar = false; ExcelApp.StatusBar = false;
} }
private void GetSelected() private void GetSelected()
{ {
object[,] cells = Selection.Value2; object[,] cells = Selection.Value2;
PositionAmount = new Dictionary<Position, double>(); PositionAmount = new Dictionary<Position, double>();
int rowsCount = Selection.Rows.Count; int rowsCount = Selection.Rows.Count;

5
src/PriceListTools/MergeTool.cs
View File

@ -2,6 +2,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace RehauSku.PriceListTools 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)); ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(x => x.PositionAmount.Count));
ResultBar = new ResultBar(); ResultBar = new ResultBar();
@ -41,7 +42,7 @@ namespace RehauSku.PriceListTools
FilterByAmount(); FilterByAmount();
ResultBar.Update(); ResultBar.Update();
Dialog.SaveWorkbookAs(); await Task.Delay(new TimeSpan(0, 0, 5));
ExcelApp.StatusBar = false; ExcelApp.StatusBar = false;
} }
} }

4
src/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.4.1")] [assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.1")] [assembly: AssemblyFileVersion("1.0.4.2")]