From cd96e10aa4eff487d8ff1bef3be392ee6568076f Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Sun, 5 Dec 2021 21:14:33 +0300 Subject: Readonly httpClient --- Source/ExcelDNA/AddIn.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index 0505e5b..b62412d 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -6,12 +6,11 @@ namespace Rehau.Sku.Assist { public class AddIn : IExcelAddIn { - public static HttpClient httpClient; + public static readonly HttpClient httpClient = new HttpClient(); public void AutoOpen() { RegisterFunctions(); - httpClient = new HttpClient(); } public void AutoClose() -- cgit v1.2.3 From 589246aaef847847b65d00e87fb5826603724e81 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Sun, 5 Dec 2021 21:19:28 +0300 Subject: Move responseOrder field to AddIn class --- Source/ExcelDNA/AddIn.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index b62412d..25e5bfd 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -4,13 +4,24 @@ using System.Net.Http; namespace Rehau.Sku.Assist { + public enum ResponseOrder + { + NoSettings, + Relevance, + Name, + Price, + Series + } + public class AddIn : IExcelAddIn { public static readonly HttpClient httpClient = new HttpClient(); + public static ResponseOrder responseOrder; public void AutoOpen() { RegisterFunctions(); + responseOrder = ResponseOrder.NoSettings; } public void AutoClose() -- cgit v1.2.3 From d47e5d5282e89d1fcc69bf3907aa459277fcc104 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Mon, 6 Dec 2021 17:44:33 +0300 Subject: Add settings registry keys --- Source/ExcelDNA/AddIn.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index 25e5bfd..8a25799 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -1,6 +1,8 @@ using ExcelDna.Integration; using ExcelDna.Registration; +using Microsoft.Win32; using System.Net.Http; +using System.IO; namespace Rehau.Sku.Assist { @@ -17,15 +19,17 @@ namespace Rehau.Sku.Assist { public static readonly HttpClient httpClient = new HttpClient(); public static ResponseOrder responseOrder; + public string priceListPath; public void AutoOpen() { RegisterFunctions(); - responseOrder = ResponseOrder.NoSettings; + GetRegistryKeys(); } public void AutoClose() { + } void RegisterFunctions() @@ -34,5 +38,18 @@ namespace Rehau.Sku.Assist .ProcessAsyncRegistrations(nativeAsyncIfAvailable: false) .RegisterFunctions(); } + + void GetRegistryKeys() + { + RegistryKey addInKeys = Registry + .CurrentUser + .OpenSubKey("SOFTWARE") + .OpenSubKey("REHAU") + .OpenSubKey("SkuAssist"); + + responseOrder = (ResponseOrder)addInKeys.GetValue("ResponseOrder"); + priceListPath = (string)addInKeys.GetValue("PriceListPath"); + } + } } -- cgit v1.2.3 From abfd03be7a62271ca7c83c8e3c53620040e2d08a Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Mon, 6 Dec 2021 19:50:37 +0300 Subject: Fix static pricelist path field --- Source/ExcelDNA/AddIn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index 8a25799..72846a1 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -19,7 +19,7 @@ namespace Rehau.Sku.Assist { public static readonly HttpClient httpClient = new HttpClient(); public static ResponseOrder responseOrder; - public string priceListPath; + public static string priceListPath; public void AutoOpen() { -- cgit v1.2.3 From 4743aa706e8342cdb3202c59e82bddef277cabfa Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Mon, 6 Dec 2021 19:52:34 +0300 Subject: Refactoring --- Source/ExcelDNA/AddIn.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index 72846a1..b3fb9c1 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -2,7 +2,6 @@ using ExcelDna.Registration; using Microsoft.Win32; using System.Net.Http; -using System.IO; namespace Rehau.Sku.Assist { -- cgit v1.2.3 From 1136d5e94ae33c3c3c6a4df88b1b326386feca7d Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 7 Dec 2021 08:34:48 +0300 Subject: Rename ResponseOrder default value. Move switch NoSettings to default. --- Source/ExcelDNA/AddIn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index b3fb9c1..77a2b34 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -7,7 +7,7 @@ namespace Rehau.Sku.Assist { public enum ResponseOrder { - NoSettings, + Default, Relevance, Name, Price, -- cgit v1.2.3 From e897cae23efa6c2e1ef0ad9bae6782504be7d87a Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 7 Dec 2021 08:35:36 +0300 Subject: AddIn refactoring --- Source/ExcelDNA/AddIn.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index 77a2b34..b18f525 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -49,6 +49,5 @@ namespace Rehau.Sku.Assist responseOrder = (ResponseOrder)addInKeys.GetValue("ResponseOrder"); priceListPath = (string)addInKeys.GetValue("PriceListPath"); } - } } -- cgit v1.2.3 From 74877f874e401d29f0576c5027abba83587103f3 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 8 Dec 2021 13:58:37 +0300 Subject: Rename to RehauSku --- Source/ExcelDNA/AddIn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs index b18f525..3c82406 100644 --- a/Source/ExcelDNA/AddIn.cs +++ b/Source/ExcelDNA/AddIn.cs @@ -3,7 +3,7 @@ using ExcelDna.Registration; using Microsoft.Win32; using System.Net.Http; -namespace Rehau.Sku.Assist +namespace RehauSku.Assist { public enum ResponseOrder { -- cgit v1.2.3 From 8a869e73fb1873b1f85203b7a4a18dc8a2325a11 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 8 Dec 2021 14:38:23 +0300 Subject: Rename dir ExcelDNA -> AddIn --- Source/ExcelDNA/AddIn.cs | 53 ------------------------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 Source/ExcelDNA/AddIn.cs (limited to 'Source/ExcelDNA/AddIn.cs') diff --git a/Source/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs deleted file mode 100644 index 3c82406..0000000 --- a/Source/ExcelDNA/AddIn.cs +++ /dev/null @@ -1,53 +0,0 @@ -using ExcelDna.Integration; -using ExcelDna.Registration; -using Microsoft.Win32; -using System.Net.Http; - -namespace RehauSku.Assist -{ - public enum ResponseOrder - { - Default, - Relevance, - Name, - Price, - Series - } - - public class AddIn : IExcelAddIn - { - public static readonly HttpClient httpClient = new HttpClient(); - public static ResponseOrder responseOrder; - public static string priceListPath; - - public void AutoOpen() - { - RegisterFunctions(); - GetRegistryKeys(); - } - - public void AutoClose() - { - - } - - void RegisterFunctions() - { - ExcelRegistration.GetExcelFunctions() - .ProcessAsyncRegistrations(nativeAsyncIfAvailable: false) - .RegisterFunctions(); - } - - void GetRegistryKeys() - { - RegistryKey addInKeys = Registry - .CurrentUser - .OpenSubKey("SOFTWARE") - .OpenSubKey("REHAU") - .OpenSubKey("SkuAssist"); - - responseOrder = (ResponseOrder)addInKeys.GetValue("ResponseOrder"); - priceListPath = (string)addInKeys.GetValue("PriceListPath"); - } - } -} -- cgit v1.2.3