From 9084cbf190e740d50efdf5c98806db5aa32e717e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvir=20Brki=C4=87?= <elvir@outlook.com>
Date: Fri, 13 Oct 2017 13:55:46 +0200
Subject: [PATCH 1/5] Fix typo

---
 NoteHighlightAddin/ribbon.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NoteHighlightAddin/ribbon.xml b/NoteHighlightAddin/ribbon.xml
index be620d3..730eae8 100644
--- a/NoteHighlightAddin/ribbon.xml
+++ b/NoteHighlightAddin/ribbon.xml
@@ -37,7 +37,7 @@
                   <button id="buttonR" label="R" size="large" screentip="Enter R Code" onAction="AddInButtonClicked" tag="r"  image="Other.png" visible="false"/>
                   <button id="buttonBash" label="Bash" size="large" screentip="Enter Bash Code" onAction="AddInButtonClicked" tag="sh"  image="Other.png" visible="false"/>
                   <button id="buttonSwift" label="Swift" size="large" screentip="Enter Swift Code" onAction="AddInButtonClicked" tag="swift"  image="Other.png" visible="false"/>
-                  <button id="buttonVisaulBasic" label="Visual Basic" size="large" screentip="Enter Visual Basic Code" onAction="AddInButtonClicked" tag="vb"  image="Other.png" visible="false"/>
+                  <button id="buttonVisualBasic" label="Visual Basic" size="large" screentip="Enter Visual Basic Code" onAction="AddInButtonClicked" tag="vb"  image="Other.png" visible="false"/>
 				</group>
             </tab>
         </tabs>

From 64390ebfc7582aa5029d8b9aeed62cdac96e686f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvir=20Brki=C4=87?= <elvir@outlook.com>
Date: Fri, 13 Oct 2017 14:47:18 +0200
Subject: [PATCH 2/5] Set language to Latin to ignore spelling

---
 NoteHighlightAddin/AddIn.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NoteHighlightAddin/AddIn.cs b/NoteHighlightAddin/AddIn.cs
index 847038d..463612a 100644
--- a/NoteHighlightAddin/AddIn.cs
+++ b/NoteHighlightAddin/AddIn.cs
@@ -402,6 +402,7 @@ public XDocument InsertHighLightCode(string htmlContent, string[] position, High
             XElement cell2 = new XElement(ns + "Cell");
             cell2.Add(new XAttribute("shadingColor", colorString));
 
+
             string defaultStyle = "";
 
             var arrayLine = htmlContent.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
@@ -412,6 +413,8 @@ public XDocument InsertHighLightCode(string htmlContent, string[] position, High
                 if(item.StartsWith("<pre"))
                 {
                     defaultStyle = item.Substring(0,item.IndexOf("<span"));
+                    //Sets language to Latin to disable spell check
+                    defaultStyle = defaultStyle.Insert(defaultStyle.Length - 1, " lang=la");
                     item = item.Substring(item.IndexOf("<span"));
                 }
 

From dd2459f1262a3355fdeb782729396d22dc576ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvir=20Brki=C4=87?= <elvir@outlook.com>
Date: Fri, 13 Oct 2017 15:25:21 +0200
Subject: [PATCH 3/5] Fixed wrong closing tag </body> instead of </pre>

---
 NoteHighlightAddin/AddIn.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NoteHighlightAddin/AddIn.cs b/NoteHighlightAddin/AddIn.cs
index 463612a..5997624 100644
--- a/NoteHighlightAddin/AddIn.cs
+++ b/NoteHighlightAddin/AddIn.cs
@@ -455,7 +455,7 @@ public XDocument InsertHighLightCode(string htmlContent, string[] position, High
                 //string s = item.Replace(@"style=""", string.Format(@"style=""font-family:{0}; ", GenerateHighlightContent.GenerateHighLight.Config.OutputArguments["Font"].Value));
                 //string s = string.Format(@"<body style=""font-family:{0}"">", GenerateHighlightContent.GenerateHighLight.Config.OutputArguments["Font"].Value) + 
                 //            itemLine.Replace("&apos;", "'") + "</body>";
-                string s = defaultStyle + itemLine.Replace("&apos;", "'") + "</body>";
+                string s = defaultStyle + itemLine.Replace("&apos;", "'") + "</pre>";
 
                 cell2.Add(new XElement(ns + "OEChildren",
                             new XElement(ns + "OE",

From 49fd09bd384dbd37f22fba8f570397225fae00e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvir=20Brki=C4=87?= <elvir@outlook.com>
Date: Fri, 13 Oct 2017 15:54:50 +0200
Subject: [PATCH 4/5] Updated version to v3.1

---
 NoteHighlightAddin/Properties/AssemblyInfo.cs | 4 ++--
 Setup/Setup.vdproj                            | 6 +++---
 SetupX86/SetupX86.vdproj                      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/NoteHighlightAddin/Properties/AssemblyInfo.cs b/NoteHighlightAddin/Properties/AssemblyInfo.cs
index 11cc0da..825eb77 100644
--- a/NoteHighlightAddin/Properties/AssemblyInfo.cs
+++ b/NoteHighlightAddin/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyFileVersion("3.0.*")]
+[assembly: AssemblyVersion("3.1.*")]
+[assembly: AssemblyFileVersion("3.1.*")]
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
index ad6f1a5..f9a2ec8 100644
--- a/Setup/Setup.vdproj
+++ b/Setup/Setup.vdproj
@@ -640,15 +640,15 @@
         {
         "Name" = "8:NoteHighlightAddin"
         "ProductName" = "8:NoteHighlight2016"
-        "ProductCode" = "8:{765DAFF3-F505-4A51-9064-DA725395E959}"
-        "PackageCode" = "8:{D8D12432-A651-4151-A0DF-5EDC3C77D310}"
+        "ProductCode" = "8:{FB571ECB-7A79-4417-BC88-04EADC1CAEE0}"
+        "PackageCode" = "8:{AFFAB118-BED9-4D10-967A-1D8018F1F910}"
         "UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:3.0"
+        "ProductVersion" = "8:3.1"
         "Manufacturer" = "8:CodingRoad"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
diff --git a/SetupX86/SetupX86.vdproj b/SetupX86/SetupX86.vdproj
index 8e52605..53579c1 100644
--- a/SetupX86/SetupX86.vdproj
+++ b/SetupX86/SetupX86.vdproj
@@ -640,15 +640,15 @@
         {
         "Name" = "8:NoteHighlightAddin"
         "ProductName" = "8:NoteHighlight2016"
-        "ProductCode" = "8:{455472A6-9763-40E5-B034-9760EA7F7CEB}"
-        "PackageCode" = "8:{D93582F6-076B-4D28-BFCC-972ACDBD422F}"
+        "ProductCode" = "8:{95B19903-BDE2-4560-A55D-5BDA0EF8D70C}"
+        "PackageCode" = "8:{8AA95C85-7AA6-44AA-8BFA-50A9071A33A5}"
         "UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:3.0"
+        "ProductVersion" = "8:3.1"
         "Manufacturer" = "8:CodingRoad"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

From abbf74c4cf835ceb6d377f51ba2201216eb759b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvir=20Brki=C4=87?= <elvir@outlook.com>
Date: Fri, 13 Oct 2017 16:07:10 +0200
Subject: [PATCH 5/5] Added error handling code

---
 NoteHighlightAddin/AddIn.cs | 117 +++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 48 deletions(-)

diff --git a/NoteHighlightAddin/AddIn.cs b/NoteHighlightAddin/AddIn.cs
index 5997624..f9c1dcf 100644
--- a/NoteHighlightAddin/AddIn.cs
+++ b/NoteHighlightAddin/AddIn.cs
@@ -138,11 +138,18 @@ public void OnStartupComplete(ref Array custom)
 		//public async Task AddInButtonClicked(IRibbonControl control)
         public void AddInButtonClicked(IRibbonControl control)
         {
-            tag = control.Tag;
+            try
+            {
+                tag = control.Tag;
 
-            Thread t = new Thread(new ThreadStart(ShowForm));
-            t.SetApartmentState(ApartmentState.STA);
-            t.Start();
+                Thread t = new Thread(new ThreadStart(ShowForm));
+                t.SetApartmentState(ApartmentState.STA);
+                t.Start();
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("Exception from AddInButtonClicked: "+ e.ToString());
+            }
 
             //t.Join(5000);
 
@@ -151,49 +158,56 @@ public void AddInButtonClicked(IRibbonControl control)
 
         private void ShowForm()
         {
-            string outFileName = Guid.NewGuid().ToString();
-
-            //try
-            //{
-            //ProcessHelper processHelper = new ProcessHelper("NoteHighLightForm.exe", new string[] { control.Tag, outFileName });
-            //processHelper.IsWaitForInputIdle = true;
-            //processHelper.ProcessStart();
+            try
+            {
+                string outFileName = Guid.NewGuid().ToString();
 
-            //CodeForm form = new CodeForm(tag, outFileName);
-            //form.ShowDialog();
+                //try
+                //{
+                //ProcessHelper processHelper = new ProcessHelper("NoteHighLightForm.exe", new string[] { control.Tag, outFileName });
+                //processHelper.IsWaitForInputIdle = true;
+                //processHelper.ProcessStart();
 
-            //TestForm t = new TestForm();
-            var pageNode = GetPageNode();
-            string selectedText = "";
-            XElement outline = null;
-            bool selectedTextFormated = false;
+                //CodeForm form = new CodeForm(tag, outFileName);
+                //form.ShowDialog();
 
-            if (pageNode != null)
-            {
-                var existingPageId = pageNode.Attribute("ID").Value;
-                selectedText = GetSelectedText(existingPageId, out selectedTextFormated);
+                //TestForm t = new TestForm();
+                var pageNode = GetPageNode();
+                string selectedText = "";
+                XElement outline = null;
+                bool selectedTextFormated = false;
 
-                if (selectedText.Trim() != "")
+                if (pageNode != null)
                 {
-                    outline = GetOutline(existingPageId);
+                    var existingPageId = pageNode.Attribute("ID").Value;
+                    selectedText = GetSelectedText(existingPageId, out selectedTextFormated);
+
+                    if (selectedText.Trim() != "")
+                    {
+                        outline = GetOutline(existingPageId);
+                    }
                 }
-            }
 
                 MainForm form = new MainForm(tag, outFileName, selectedText);
 
-            System.Windows.Forms.Application.Run(form);
-            //}
-            //catch (Exception ex)
-            //{
-            //    MessageBox.Show("Error executing NoteHighLightForm.exe：" + ex.Message);
-            //    return;
-            //}
+                System.Windows.Forms.Application.Run(form);
+                //}
+                //catch (Exception ex)
+                //{
+                //    MessageBox.Show("Error executing NoteHighLightForm.exe：" + ex.Message);
+                //    return;
+                //}
 
-            string fileName = Path.Combine(Path.GetTempPath(), outFileName + ".html");
+                string fileName = Path.Combine(Path.GetTempPath(), outFileName + ".html");
 
-            if (File.Exists(fileName))
+                if (File.Exists(fileName))
+                {
+                    InsertHighLightCodeToCurrentSide(fileName, form.Parameters, outline, selectedTextFormated);
+                }
+            }
+            catch (Exception e)
             {
-                InsertHighLightCodeToCurrentSide(fileName, form.Parameters, outline, selectedTextFormated);
+                MessageBox.Show("Exception from ShowForm: " + e.ToString());
             }
         }
 
@@ -231,24 +245,31 @@ public IStream GetImage(string imageName)
         /// </summary>
         private void InsertHighLightCodeToCurrentSide(string fileName, HighLightParameter parameters, XElement outline, bool selectedTextFormated)
         {
-            // Trace.TraceInformation(System.Reflection.MethodBase.GetCurrentMethod().Name);
-            string htmlContent = File.ReadAllText(fileName, Encoding.UTF8);
+            try
+            {
+                // Trace.TraceInformation(System.Reflection.MethodBase.GetCurrentMethod().Name);
+                string htmlContent = File.ReadAllText(fileName, Encoding.UTF8);
 
-            var pageNode = GetPageNode();
+                var pageNode = GetPageNode();
 
-            if (pageNode != null)
-            {
-                var existingPageId = pageNode.Attribute("ID").Value;
-                string[] position=null;
-                if (outline == null)
+                if (pageNode != null)
                 {
-                    position = GetMousePointPosition(existingPageId);
-                }
+                    var existingPageId = pageNode.Attribute("ID").Value;
+                    string[] position = null;
+                    if (outline == null)
+                    {
+                        position = GetMousePointPosition(existingPageId);
+                    }
 
-                var page = InsertHighLightCode(htmlContent, position, parameters, outline, selectedTextFormated);
-                page.Root.SetAttributeValue("ID", existingPageId);
+                    var page = InsertHighLightCode(htmlContent, position, parameters, outline, selectedTextFormated);
+                    page.Root.SetAttributeValue("ID", existingPageId);
 
-                OneNoteApplication.UpdatePageContent(page.ToString(), DateTime.MinValue);
+                    OneNoteApplication.UpdatePageContent(page.ToString(), DateTime.MinValue);
+                }
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("Exception from InsertHighLightCodeToCurrentSide: "+e.ToString());
             }
         }
 
