From 75f6653fc7096c0c459f33eb16a324f073c3e3c8 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Wed, 8 Dec 2021 14:01:19 +0300
Subject: Create Ribbon dir

---
 Source/Ribbon/RibbonController.cs | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Source/Ribbon/RibbonController.cs

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
new file mode 100644
index 0000000..c4ca6d7
--- /dev/null
+++ b/Source/Ribbon/RibbonController.cs
@@ -0,0 +1,45 @@
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using ExcelDna.Integration.CustomUI;
+using RehauSku.Assist;
+
+namespace Ribbon
+{
+    [ComVisible(true)]
+    public class RibbonController : ExcelRibbon
+    {
+        public override string GetCustomUI(string RibbonID)
+        {
+            return @"
+      <customUI xmlns='http://schemas.microsoft.com/office/2006/01/customui'>
+      <ribbon>
+        <tabs>
+          <tab id='tab1' label='REHAU'>
+            <group id='group1' label='Прайс-лист'>
+              <button id='button1' label='Экспорт' onAction='OnButtonPressed'/>
+            </group >
+          </tab>
+        </tabs>
+      </ribbon>
+    </customUI>";
+        }
+
+        public void OnButtonPressed(IRibbonControl control)
+        {
+            using (DataWriter dw = new DataWriter())
+            {
+                if (!dw.IsRangeValid())
+                {
+                    MessageBox.Show("Выделен неверный диапазон!", "Неверный диапазон", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    return;
+                }
+
+                else
+                {
+                    dw.FillSkuAmountDict();
+                    //dw.FillPriceList();
+                }
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From dc1fc8b221e9324fe0f82c4ea4a32d87d282bd25 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Wed, 8 Dec 2021 14:45:14 +0300
Subject: refactoring namespaces

---
 Source/Ribbon/RibbonController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index c4ca6d7..7402a09 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -1,9 +1,9 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using ExcelDna.Integration.CustomUI;
-using RehauSku.Assist;
+using RehauSku.DataExport;
 
-namespace Ribbon
+namespace RehauSku.Ribbon
 {
     [ComVisible(true)]
     public class RibbonController : ExcelRibbon
@@ -26,7 +26,7 @@ namespace Ribbon
 
         public void OnButtonPressed(IRibbonControl control)
         {
-            using (DataWriter dw = new DataWriter())
+            using (Exporter dw = new Exporter())
             {
                 if (!dw.IsRangeValid())
                 {
-- 
cgit v1.2.3


From f8ec152378d5021386a8f145d5c7ff5026ba100e Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Thu, 9 Dec 2021 09:14:19 +0300
Subject: Copy pricelist file

---
 Source/Ribbon/RibbonController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 7402a09..7fa2ac8 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -37,7 +37,7 @@ namespace RehauSku.Ribbon
                 else
                 {
                     dw.FillSkuAmountDict();
-                    //dw.FillPriceList();
+                    dw.FillPriceList();
                 }
             }
         }
-- 
cgit v1.2.3


From 5a641d83d8e8ee9c977d3867f195447cd1164bef Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Thu, 9 Dec 2021 14:08:26 +0300
Subject: Add settings button and icons to ribbon

---
 Source/Ribbon/RibbonController.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 7fa2ac8..94d3b0d 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -10,14 +10,18 @@ namespace RehauSku.Ribbon
     {
         public override string GetCustomUI(string RibbonID)
         {
+
             return @"
       <customUI xmlns='http://schemas.microsoft.com/office/2006/01/customui'>
       <ribbon>
         <tabs>
-          <tab id='tab1' label='REHAU'>
-            <group id='group1' label='Прайс-лист'>
-              <button id='button1' label='Экспорт' onAction='OnButtonPressed'/>
-            </group >
+          <tab id='rau' label='REHAU'>
+            <group id='priceList' label='Прайс-лист'>
+                <button id='exportToPrice' label='Экспорт' size='large' imageMso='PivotExportToExcel' onAction='OnButtonPressed'/>
+            </group>
+            <group id='rausettings' label='Настройки'>
+                <button id='set' label='Настройки' size='large' imageMso='CurrentViewSettings' onAction='OnButtonPressed'/>
+            </group>
           </tab>
         </tabs>
       </ribbon>
-- 
cgit v1.2.3


From b7c65d64e98092049fddc1b482bfc7aa97759d60 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Fri, 10 Dec 2021 13:56:28 +0300
Subject: Refactoring

---
 Source/Ribbon/RibbonController.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 94d3b0d..39cf71a 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -34,7 +34,10 @@ namespace RehauSku.Ribbon
             {
                 if (!dw.IsRangeValid())
                 {
-                    MessageBox.Show("Выделен неверный диапазон!", "Неверный диапазон", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("Выделен неверный диапазон!", 
+                        "Неверный диапазон", 
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Information);
                     return;
                 }
 
-- 
cgit v1.2.3


From aaaa6b45859e74c791f35e18c220118a54a345ad Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Fri, 17 Dec 2021 09:07:34 +0300
Subject: Create simple base form for settings window

---
 Source/Ribbon/RibbonController.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 39cf71a..7e15d09 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -10,17 +10,16 @@ namespace RehauSku.Ribbon
     {
         public override string GetCustomUI(string RibbonID)
         {
-
             return @"
       <customUI xmlns='http://schemas.microsoft.com/office/2006/01/customui'>
       <ribbon>
         <tabs>
           <tab id='rau' label='REHAU'>
             <group id='priceList' label='Прайс-лист'>
-                <button id='exportToPrice' label='Экспорт' size='large' imageMso='PivotExportToExcel' onAction='OnButtonPressed'/>
+                <button id='exportToPrice' label='Экспорт' size='large' imageMso='PivotExportToExcel' onAction='OnExportPressed'/>
             </group>
             <group id='rausettings' label='Настройки'>
-                <button id='set' label='Настройки' size='large' imageMso='CurrentViewSettings' onAction='OnButtonPressed'/>
+                <button id='set' label='Настройки' size='large' imageMso='CurrentViewSettings' onAction='OnSettingsPressed'/>
             </group>
           </tab>
         </tabs>
@@ -28,14 +27,14 @@ namespace RehauSku.Ribbon
     </customUI>";
         }
 
-        public void OnButtonPressed(IRibbonControl control)
+        public void OnExportPressed(IRibbonControl control)
         {
             using (Exporter dw = new Exporter())
             {
                 if (!dw.IsRangeValid())
                 {
-                    MessageBox.Show("Выделен неверный диапазон!", 
-                        "Неверный диапазон", 
+                    MessageBox.Show("Выделен неверный диапазон!",
+                        "Неверный диапазон",
                         MessageBoxButtons.OK,
                         MessageBoxIcon.Information);
                     return;
@@ -48,5 +47,11 @@ namespace RehauSku.Ribbon
                 }
             }
         }
+
+        
+        public void OnSettingsPressed(IRibbonControl control)
+        {
+            Application.Run(new Settings.SettingsForm());
+        }
     }
 }
-- 
cgit v1.2.3


From ce5597d042062c820288c63b4e571ee77ac23ab0 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Wed, 22 Dec 2021 17:07:37 +0300
Subject: RegistryUtil and some fixes

---
 Source/Ribbon/RibbonController.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 7e15d09..cfe4532 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -42,16 +42,15 @@ namespace RehauSku.Ribbon
 
                 else
                 {
-                    dw.FillSkuAmountDict();
-                    dw.FillPriceList();
+                    dw.FillNewPriceList();
                 }
             }
         }
-
         
         public void OnSettingsPressed(IRibbonControl control)
         {
-            Application.Run(new Settings.SettingsForm());
+            Form settingsForm = new Settings.SettingsForm();
+            settingsForm.Show();
         }
     }
 }
-- 
cgit v1.2.3


From 0513ac5ad7c7de498b794c27728c2c8ff306f941 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Thu, 23 Dec 2021 15:31:23 +0300
Subject: Rename to ExportTool

---
 Source/Ribbon/RibbonController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index cfe4532..325b4c6 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -29,7 +29,7 @@ namespace RehauSku.Ribbon
 
         public void OnExportPressed(IRibbonControl control)
         {
-            using (Exporter dw = new Exporter())
+            using (ExportTool dw = new ExportTool())
             {
                 if (!dw.IsRangeValid())
                 {
-- 
cgit v1.2.3


From 24024b5729c1c44bb01cb29813868743d1753e31 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Fri, 24 Dec 2021 16:22:03 +0300
Subject: MergeTool, MemoryUtil anf stuff

---
 Source/Ribbon/RibbonController.cs | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 325b4c6..0090761 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -1,7 +1,8 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using ExcelDna.Integration.CustomUI;
-using RehauSku.DataExport;
+using RehauSku.PriceListTools;
+using RehauSku.Forms;
 
 namespace RehauSku.Ribbon
 {
@@ -17,6 +18,7 @@ namespace RehauSku.Ribbon
           <tab id='rau' label='REHAU'>
             <group id='priceList' label='Прайс-лист'>
                 <button id='exportToPrice' label='Экспорт' size='large' imageMso='PivotExportToExcel' onAction='OnExportPressed'/>
+                <button id='mergeFiles' label='Объединить' size='large' imageMso='Copy' onAction='OnMergePressed'/>                
             </group>
             <group id='rausettings' label='Настройки'>
                 <button id='set' label='Настройки' size='large' imageMso='CurrentViewSettings' onAction='OnSettingsPressed'/>
@@ -27,11 +29,22 @@ namespace RehauSku.Ribbon
     </customUI>";
         }
 
+        public void OnMergePressed(IRibbonControl control)
+        {
+            using (MergeTool mergeTool = new MergeTool())
+            {
+                string[] files = Dialog.GetMultiplyFiles();
+                mergeTool.AddSkuAmountToDict(files);
+                string exportFile = PriceListUtil.CreateNewExportFile();
+                mergeTool.ExportToNewFile(exportFile);
+            }
+        }
+
         public void OnExportPressed(IRibbonControl control)
         {
-            using (ExportTool dw = new ExportTool())
+            using (ExportTool exportTool = new ExportTool())
             {
-                if (!dw.IsRangeValid())
+                if (!exportTool.IsRangeValid())
                 {
                     MessageBox.Show("Выделен неверный диапазон!",
                         "Неверный диапазон",
@@ -42,15 +55,17 @@ namespace RehauSku.Ribbon
 
                 else
                 {
-                    dw.FillNewPriceList();
+                    exportTool.ExportToNewFile();
                 }
             }
         }
-        
+
         public void OnSettingsPressed(IRibbonControl control)
         {
-            Form settingsForm = new Settings.SettingsForm();
+            Form settingsForm = new SettingsForm();
+
             settingsForm.Show();
+
         }
     }
 }
-- 
cgit v1.2.3


From 20cfbfcca3a779c04aecdca5e4b465651e2be42a Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Fri, 24 Dec 2021 17:42:20 +0300
Subject: New release

---
 Source/Ribbon/RibbonController.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'Source/Ribbon/RibbonController.cs')

diff --git a/Source/Ribbon/RibbonController.cs b/Source/Ribbon/RibbonController.cs
index 0090761..df6f327 100644
--- a/Source/Ribbon/RibbonController.cs
+++ b/Source/Ribbon/RibbonController.cs
@@ -17,11 +17,11 @@ namespace RehauSku.Ribbon
         <tabs>
           <tab id='rau' label='REHAU'>
             <group id='priceList' label='Прайс-лист'>
-                <button id='exportToPrice' label='Экспорт' size='large' imageMso='PivotExportToExcel' onAction='OnExportPressed'/>
-                <button id='mergeFiles' label='Объединить' size='large' imageMso='Copy' onAction='OnMergePressed'/>                
+                <button id='exportToPrice' label='Экспорт в новый файл' size='normal' imageMso='PivotExportToExcel' onAction='OnExportPressed'/>
+                <button id='mergeFiles' label='Объединить' size='normal' imageMso='Copy' onAction='OnMergePressed'/>                
             </group>
             <group id='rausettings' label='Настройки'>
-                <button id='set' label='Настройки' size='large' imageMso='CurrentViewSettings' onAction='OnSettingsPressed'/>
+                <button id='setPriceList' label='Файл прайс-листа' size='normal' imageMso='CurrentViewSettings' onAction='OnSetPricePressed'/>
             </group>
           </tab>
         </tabs>
@@ -60,12 +60,10 @@ namespace RehauSku.Ribbon
             }
         }
 
-        public void OnSettingsPressed(IRibbonControl control)
+        public void OnSetPricePressed(IRibbonControl control)
         {
-            Form settingsForm = new SettingsForm();
-
-            settingsForm.Show();
-
+            string path = Dialog.GetFilePath();
+            RegistryUtil.PriceListPath = path;
         }
     }
 }
-- 
cgit v1.2.3