From 1e91c34e465dd8a7f4f44307c874883b3569053d Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 30 Mar 2022 12:26:18 +0300 Subject: Revert "Turn off save as file dialog at the end of tool process. Version update." This reverts commit eaf3ebaa9489462e3d663c93df7a9bc34011464c. --- src/Interface/Dialog.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/Interface') diff --git a/src/Interface/Dialog.cs b/src/Interface/Dialog.cs index 95d676f..e6c7955 100644 --- a/src/Interface/Dialog.cs +++ b/src/Interface/Dialog.cs @@ -36,5 +36,22 @@ 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); + } + } + } } } -- cgit v1.2.3 From 84eab9425c9fbf27ff50a3bc314966babd1e960c Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 1 Apr 2022 17:39:01 +0300 Subject: Keep ResultBar update 5 seconds long. Turn off save as dialog after tools complete. --- src/Interface/AbstractBar.cs | 11 +++++++++-- src/Interface/ResultBar.cs | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'src/Interface') diff --git a/src/Interface/AbstractBar.cs b/src/Interface/AbstractBar.cs index c5918a8..84ece24 100644 --- a/src/Interface/AbstractBar.cs +++ b/src/Interface/AbstractBar.cs @@ -1,11 +1,18 @@ -using Microsoft.Office.Interop.Excel; +using ExcelDna.Integration; +using Microsoft.Office.Interop.Excel; namespace RehauSku.Interface { - internal abstract class AbstractBar + internal abstract class AbstractBar { protected Application Excel = AddIn.Excel; public abstract void Update(); + + [ExcelFunction] + public static void ResetStatusBar() + { + AddIn.Excel.StatusBar = false; + } } } diff --git a/src/Interface/ResultBar.cs b/src/Interface/ResultBar.cs index 1b4d7f4..55bc235 100644 --- a/src/Interface/ResultBar.cs +++ b/src/Interface/ResultBar.cs @@ -1,4 +1,5 @@ -using System.Text; +using System; +using System.Text; namespace RehauSku.Interface { @@ -39,6 +40,7 @@ namespace RehauSku.Interface } Excel.StatusBar = sb.ToString(); + AddIn.Excel.OnTime(DateTime.Now + new TimeSpan(0, 0, 5), "ResetStatusBar"); } } } -- cgit v1.2.3 From 64240ee46c350b49ff06294ab3c908c99527a23d Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 1 Apr 2022 17:40:50 +0300 Subject: Delete SaveAsDialog method depricated --- src/Interface/Dialog.cs | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/Interface') 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); - } - } - } } } -- cgit v1.2.3 From 28ba91e2d6cedc220e8c853362ebe9507adfbb6d Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 1 Apr 2022 17:55:36 +0300 Subject: StatusBar update using directive --- src/Interface/AbstractBar.cs | 8 +++++++- src/Interface/ProgressBar.cs | 5 ----- src/Interface/ResultBar.cs | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Interface') diff --git a/src/Interface/AbstractBar.cs b/src/Interface/AbstractBar.cs index 84ece24..dda7ea1 100644 --- a/src/Interface/AbstractBar.cs +++ b/src/Interface/AbstractBar.cs @@ -1,9 +1,10 @@ using ExcelDna.Integration; using Microsoft.Office.Interop.Excel; +using System; namespace RehauSku.Interface { - internal abstract class AbstractBar + internal abstract class AbstractBar : IDisposable { protected Application Excel = AddIn.Excel; @@ -14,5 +15,10 @@ namespace RehauSku.Interface { AddIn.Excel.StatusBar = false; } + + public void Dispose() + { + AddIn.Excel.OnTime(DateTime.Now + new TimeSpan(0, 0, 5), "ResetStatusBar"); + } } } diff --git a/src/Interface/ProgressBar.cs b/src/Interface/ProgressBar.cs index 416c7d6..37f8559 100644 --- a/src/Interface/ProgressBar.cs +++ b/src/Interface/ProgressBar.cs @@ -21,11 +21,6 @@ { Excel.StatusBar = $"{Message} Выполнено {percent:#.#} %"; } - - else - { - Excel.StatusBar = false; - } } } } diff --git a/src/Interface/ResultBar.cs b/src/Interface/ResultBar.cs index 55bc235..f59eb0a 100644 --- a/src/Interface/ResultBar.cs +++ b/src/Interface/ResultBar.cs @@ -40,7 +40,6 @@ namespace RehauSku.Interface } Excel.StatusBar = sb.ToString(); - AddIn.Excel.OnTime(DateTime.Now + new TimeSpan(0, 0, 5), "ResetStatusBar"); } } } -- cgit v1.2.3 From 9282bebb41f1ca0270bab7aedabd9f2a80f4e999 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 1 Apr 2022 17:56:53 +0300 Subject: Reset Excel Statusbar on fault --- src/Interface/RibbonController.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Interface') diff --git a/src/Interface/RibbonController.cs b/src/Interface/RibbonController.cs index 7bf9ee1..2d3290c 100644 --- a/src/Interface/RibbonController.cs +++ b/src/Interface/RibbonController.cs @@ -93,6 +93,7 @@ namespace RehauSku.Interface "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Information); + AddIn.Excel.StatusBar = false; return; } } -- cgit v1.2.3 From f0dc286f9020146a95471506385a4d99d7200595 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Sun, 3 Apr 2022 12:24:22 +0300 Subject: 100% message in progress bar status --- src/Interface/ProgressBar.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/Interface') diff --git a/src/Interface/ProgressBar.cs b/src/Interface/ProgressBar.cs index 37f8559..f0f2985 100644 --- a/src/Interface/ProgressBar.cs +++ b/src/Interface/ProgressBar.cs @@ -16,11 +16,7 @@ public override void Update() { double percent = (++CurrentProgress / TaskWeight) * 100; - - if (percent < 100) - { - Excel.StatusBar = $"{Message} Выполнено {percent:#.#} %"; - } + Excel.StatusBar = $"{Message} Выполнено {percent:#.#} %"; } } } -- cgit v1.2.3