From 73569a43644309d0342817580bcfd86c1face5b8 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 20 Dec 2022 12:27:47 +0300 Subject: Namespace refactoring --- src/Interface/Dialog.cs | 40 ----------- src/Interface/ProgressBar.cs | 22 ------ src/Interface/ResultBar.cs | 45 ------------- src/Interface/RibbonController.cs | 137 -------------------------------------- src/Interface/StatusbarBase.cs | 25 ------- 5 files changed, 269 deletions(-) delete mode 100644 src/Interface/Dialog.cs delete mode 100644 src/Interface/ProgressBar.cs delete mode 100644 src/Interface/ResultBar.cs delete mode 100644 src/Interface/RibbonController.cs delete mode 100644 src/Interface/StatusbarBase.cs (limited to 'src/Interface') diff --git a/src/Interface/Dialog.cs b/src/Interface/Dialog.cs deleted file mode 100644 index 992368c..0000000 --- a/src/Interface/Dialog.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Microsoft.Office.Interop.Excel; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace RhSolutions.Interface -{ - static class Dialog - { - public static string GetFilePath() - { - using (OpenFileDialog dialog = new OpenFileDialog()) - { - dialog.Filter = "Файлы Excel (*.xls;*.xlsx;*.xlsm)|*.xls;*.xlsx;*.xlsm"; - - if (dialog.ShowDialog() == DialogResult.OK) - { - return dialog.FileName; - } - - else return string.Empty; - } - } - - public static string[] GetMultiplyFiles() - { - using (OpenFileDialog dialog = new OpenFileDialog()) - { - dialog.Filter = "Файлы Excel (*.xls;*.xlsx;*.xlsm)|*.xls;*.xlsx;*.xlsm"; - dialog.Multiselect = true; - - if (dialog.ShowDialog() == DialogResult.OK) - { - return dialog.FileNames; - } - - else return null; - } - } - } -} diff --git a/src/Interface/ProgressBar.cs b/src/Interface/ProgressBar.cs deleted file mode 100644 index 7217d4e..0000000 --- a/src/Interface/ProgressBar.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace RhSolutions.Interface -{ - internal class ProgressBar : StatusbarBase - { - private double CurrentProgress { get; set; } - private readonly double TaskWeight; - private readonly string Message; - - public ProgressBar(string message, int weight) - { - Message = message; - TaskWeight = weight; - CurrentProgress = 0; - } - - public override void Update() - { - double percent = (++CurrentProgress / TaskWeight) * 100; - Excel.StatusBar = $"{Message} Выполнено {percent:#.#} %"; - } - } -} diff --git a/src/Interface/ResultBar.cs b/src/Interface/ResultBar.cs deleted file mode 100644 index 3652738..0000000 --- a/src/Interface/ResultBar.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Text; - -namespace RhSolutions.Interface -{ - internal class ResultBar : StatusbarBase - { - private int Success { get; set; } - private int Replaced { get; set; } - private int NotFound { get; set; } - - public ResultBar() - { - Success = 0; - Replaced = 0; - NotFound = 0; - } - - public void IncrementSuccess() => Success++; - public void IncrementReplaced() => Replaced++; - public void IncrementNotFound() => NotFound++; - - public override void Update() - { - StringBuilder sb = new StringBuilder(); - - if (Success > 0) - { - sb.Append($"Успешно экспортировано {Success} артикулов. "); - } - - if (Replaced > 0) - { - sb.Append($"Заменено {Replaced} артикулов. "); - } - - if (NotFound > 0) - { - sb.Append($"Не найдено {NotFound} артикулов."); - } - - Excel.StatusBar = sb.ToString(); - } - } -} diff --git a/src/Interface/RibbonController.cs b/src/Interface/RibbonController.cs deleted file mode 100644 index 6bbba3e..0000000 --- a/src/Interface/RibbonController.cs +++ /dev/null @@ -1,137 +0,0 @@ -using ExcelDna.Integration.CustomUI; -using Microsoft.Office.Interop.Excel; -using RhSolutions.PriceListTools; -using System; -using System.IO; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows.Forms; - -namespace RhSolutions.Interface -{ - [ComVisible(true)] - public class RibbonController : ExcelRibbon - { - private static IRibbonUI ribbonUi; - - public override string GetCustomUI(string RibbonID) - { - return @" - - - - - -