updates

stevencohn · Dec 8, 2022 · 5921bd0 · 5921bd0
1 parent 2c2f7ea
commit 5921bd0
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 33 deletions.
diff --git a/OneMore/Commands/Snippets/InsertCodeBlockCommand.cs b/OneMore/Commands/Snippets/InsertCodeBlockCommand.cs
@@ -57,6 +57,8 @@ public override async Task Execute(params object[] args)
 
 			DetermineCellColors(page);
 
+			PageNamespace.Set(ns);
+
 			var table = new Table(ns)
 			{
 				BordersVisible = true
@@ -79,10 +81,8 @@ public override async Task Execute(params object[] args)
 				cell = row.Cells.First();
 
 				cell.SetContent(
-					new XElement(ns + "OE",
-						new XAttribute("style", $"font-family:'Segoe UI';font-size:11.0pt;color:{titleColor}"),
-						new XElement(ns + "T", new XCData("<span style='font-weight:bold'>Code</span>"))
-						));
+					new Paragraph($"<span style='font-weight:bold'>{Resx.word_Code}</span>")
+						.SetStyle($"font-family:'Segoe UI';font-size:11.0pt;color:{titleColor}"));
 
 				cell.ShadingColor = shading;
 			}
@@ -201,26 +201,19 @@ private XElement MakeDefaultContent(bool withTitle)
 		{
 			if (withTitle)
 			{
+				var css = $"font-family:Consolas;font-size:10.0pt;color:{textColor}";
+
 				return new XElement(ns + "OEChildren",
-					new XElement(ns + "OE",
-						new XAttribute("style", $"font-family:Consolas;font-size:10.0pt;color:{textColor}"),
-						new XElement(ns + "T", new XCData(string.Empty))
-						),
-					new XElement(ns + "OE",
-						new XAttribute("style", $"font-family:Consolas;font-size:10.0pt;color:{textColor}"),
-						new XElement(ns + "T", new XCData(Resx.InsertCodeBlockCommand_Code))
-						),
-					new XElement(ns + "OE",
-						new XAttribute("style", $"font-family:Consolas;font-size:10.0pt;color:{textColor}"),
-						new XElement(ns + "T", new XCData(string.Empty))
-						)
+					new Paragraph(string.Empty).SetStyle(css),
+					new Paragraph(Resx.InsertCodeBlockCommand_Code).SetStyle(css),
+					new Paragraph(string.Empty).SetStyle(css)
 					);
 			}
 
 			return new XElement(ns + "OEChildren",
-				new XElement(ns + "OE", new XElement(ns + "T", new XCData(string.Empty))),
-				new XElement(ns + "OE", new XElement(ns + "T", new XCData(Resx.InsertCodeBlockCommand_Text))),
-				new XElement(ns + "OE", new XElement(ns + "T", new XCData(string.Empty)))
+				new Paragraph(string.Empty),
+				new Paragraph(Resx.InsertCodeBlockCommand_Text),
+				new Paragraph(string.Empty)
 				);
 		}
 

diff --git a/OneMore/Models/Page.cs b/OneMore/Models/Page.cs
@@ -27,19 +27,6 @@ namespace River.OneMoreAddIn.Models
 	/// </summary>
 	internal partial class Page
 	{
-		//// Page meta to indicate data storage analysis report
-		//public static readonly string AnalysisMetaName = "omAnalysisReport";
-		//// Page meta to keep track of rotating highlighter index
-		//public static readonly string HighlightMetaName = "omHighlightIndex";
-		//// Page is reference linked to another page, so don't include it in subsequent links
-		//public static readonly string LinkReferenceMetaName = "omLinkReference";
-		//// Page is a reference map, so don't include it in subsequent maps
-		//public static readonly string PageMapMetaName = "omPageMap";
-		//// Outline meta to mark visible word bank
-		//public static readonly string TagBankMetaName = "omTaggingBank";
-		//// Page meta to specify page tag list
-		//public static readonly string TaggingMetaName = "omTaggingLabels";
-
 
 		/// <summary>
 		/// Initialize a new instance with the given page XML root
@@ -633,7 +620,7 @@ public void EnsurePageWidth(
 				.FirstOrDefault();
 
 			element ??= Root.Elements(Namespace + "Outline")
-				.LastOrDefault()
+				.Last()
 				.Elements(Namespace + "Size")
 				.FirstOrDefault();
 

diff --git a/OneMore/OneNote.cs b/OneMore/OneNote.cs
@@ -999,6 +999,13 @@ public async Task Update(XElement element)
 				}
 			}
 
+			// dateExpectedLastModified is merely a pessimistic-locking safeguard to prevent
+			// updating parts of a shared page that have since been updated
+			//
+			//var lastModTime = element.Attribute("lastModifiedTime") is XAttribute att
+			//	? DateTime.Parse(att.Value).ToUniversalTime()
+			//	: DateTime.MinValue;
+
 			var xml = element.ToString(SaveOptions.DisableFormatting);
 
 			await InvokeWithRetry(() =>

diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs
diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx
@@ -4247,4 +4247,7 @@ ISO-code then comma then language name</comment>
     <value>صفحة مكررة</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>شفرة</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx
@@ -4239,4 +4239,7 @@ In diesem Abschnitt</value>
     <value>Seite duplizieren</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx
@@ -4247,4 +4247,7 @@ En esta sección</value>
     <value>Página duplicada</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Código</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx
@@ -4241,4 +4241,7 @@ Dans cette section</value>
     <value>Page dupliquée</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx
@@ -4247,4 +4247,7 @@ In deze sectie</value>
     <value>Dubbele pagina</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx
@@ -4300,4 +4300,7 @@ W tej sekcji</value>
     <value>Duplikat strony</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Kod</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx
@@ -4247,4 +4247,7 @@ Nesta secção</value>
     <value>Página Duplicada</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Código</value>
+  </data>
 </root>
diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx
@@ -4190,6 +4190,9 @@ In this section</value>
   <data name="word_Close" xml:space="preserve">
     <value>Close</value>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
   <data name="word_Color" xml:space="preserve">
     <value>Color</value>
   </data>

diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx
@@ -4237,4 +4237,7 @@ ISO-code then comma then language name</comment>
     <value>重复页面</value>
     <comment>page context menu</comment>
   </data>
+  <data name="word_Code" xml:space="preserve">
+    <value>代码</value>
+  </data>
 </root>