1335 all the tocs (part 1) (stevencohn#1509)

* stevencohn#1335 all the tocs * Fix auto-height resize image * comm * dialog * options * qwe * PageTocGenerator * refactored, parity with 6.5.0 * refresh * (c) * increment section refresh * refresh section * notebook TOC refresh * np * para * refresh existing * delogger * fix meta name omTableOfContents * Proper logging, because I like to make Jason happy * comments * fix spelling * limit page TOC to single per page (step 1) * BodyOutlines * prevent replay of HashtagCommand from TaggedCommand * RemoveTagCommand should ignore tag bank * obsolete comment
d-faure · Jul 29, 2024 · 6b811fb · 6b811fb
1 parent 489b76b
commit 6b811fb
Show file tree

Hide file tree

Showing 41 changed files with 1,692 additions and 937 deletions.
diff --git a/OneMore/Commands/Clean/RemoveTagsCommand.cs b/OneMore/Commands/Clean/RemoveTagsCommand.cs
@@ -10,7 +10,8 @@ namespace River.OneMoreAddIn.Commands
 
 
 	/// <summary>
-	/// Removes all tags from the current page, except those that are associated with reminders.
+	/// Removes all tags from the current page, except from the tag bank and those
+	/// associated with reminders.
 	/// </summary>
 	internal class RemoveTagsCommand : Command
 	{
@@ -22,7 +23,7 @@ public RemoveTagsCommand()
 		public override async Task Execute(params object[] args)
 		{
 			await using var one = new OneNote(out var page, out var ns);
-			var tags = page.Root.Elements(ns + "Outline").Descendants(ns + "Tag").ToList();
+			var tags = page.BodyOutlines.Descendants(ns + "Tag").ToList();
 			if (!tags.Any())
 			{
 				return;

diff --git a/OneMore/Commands/CommandFactory.cs b/OneMore/Commands/CommandFactory.cs
@@ -54,8 +54,7 @@ public CommandFactory(
 			// otherwise closing the primary or last-used active window will leave owner
 			// set to an invalid window handle
 			await using var one = new OneNote();
-			// convert the ulong to a IWin32Window which will be used by ShowDialog calls
-			var owner = new Win32WindowHandle(new IntPtr((long)one.WindowHandle));
+			var owner = one.OwnerWindow;
 
 			command.SetFactory(this)
 				.SetLogger(logger)
@@ -105,8 +104,7 @@ private async Task Run(string note, Command command, params object[] args)
 			// otherwise closing the primary or last-used active window will leave owner
 			// set to an invalid window handle
 			await using var one = new OneNote();
-			// convert the ulong to a IWin32Window which will be used by ShowDialog calls
-			var owner = new Win32WindowHandle(new IntPtr((long)one.WindowHandle));
+			var owner = one.OwnerWindow;
 
 			command.SetFactory(this)
 				.SetLogger(logger)

diff --git a/OneMore/Commands/Edit/AlterSizeCommand.cs b/OneMore/Commands/Edit/AlterSizeCommand.cs
@@ -67,10 +67,7 @@ public override async Task Execute(params object[] args)
 
 			var count = AlterQuickStyles(page);
 
-			foreach (var outline in page.Root
-				.Elements(ns + "Outline")
-				.Where(e => !e.Elements(ns + "Meta")
-					.Any(m => m.Attribute("name").Value == MetaNames.TaggingBank)))
+			foreach (var outline in page.BodyOutlines)
 			{
 				count +=
 					AlterByName(outline) +

diff --git a/OneMore/Commands/Page/ArrangeContainersCommand.cs b/OneMore/Commands/Page/ArrangeContainersCommand.cs
@@ -195,11 +195,7 @@ private bool ArrangeFlow(int columns, int pageWidth)
 		// after Update for some reason.
 		private IEnumerable<XElement> CollectContainers(Page page, XNamespace ns)
 		{
-			var outlines = page.Root.Elements(ns + "Outline")
-				.Where(e => !e.Elements(ns + "Meta")
-					.Any(m => m.Attribute("name").Value == MetaNames.TaggingBank))
-				.ToList();
-
+			var outlines = page.BodyOutlines.ToList();
 			if (outlines.Count < 2)
 			{
 				// zero or one Outline; don't leave the page entirely empty

diff --git a/OneMore/Commands/References/CopyLinkCommand.cs b/OneMore/Commands/References/CopyLinkCommand.cs
@@ -57,9 +57,7 @@ public override async Task Execute(params object[] args)
 
 			if (specific)
 			{
-				var selected = page.Root.Elements(ns + "Outline")
-					.Where(e => !e.Elements(ns + "Meta")
-						.Any(m => m.Attribute("name").Value.Equals(MetaNames.TaggingBank)))
+				var selected = page.BodyOutlines
 					.Descendants(ns + "OE")
 					.LastOrDefault(e => e.Attributes().Any(a => a.Name == "selected"));
 
@@ -90,7 +88,7 @@ public override async Task Execute(params object[] args)
 			}
 			else
 			{
-				hyperlink = one.GetHyperlink(page.PageId, null);
+				hyperlink = one.GetHyperlink(page.PageId, page.TitleID);
 			}
 
 			if (string.IsNullOrEmpty(hyperlink))

diff --git a/OneMore/Commands/References/EmbedSubpageCommand.cs b/OneMore/Commands/References/EmbedSubpageCommand.cs
@@ -161,10 +161,7 @@ private async Task<SourceInfo> GetSource(string sourceId, string linkId)
 				}
 			}
 
-			var outRoot = source.Root.Elements(source.Namespace + "Outline")
-				.FirstOrDefault(e => !e.Elements(ns + "Meta")
-					.Any(m => m.Attribute("name").Value == MetaNames.TaggingBank));
-
+			var outRoot = source.BodyOutlines.FirstOrDefault();
 			if (outRoot is null)
 			{
 				// couldn't find an Outline but page may contain other valid content items

diff --git a/OneMore/Commands/References/LinkReferencesCommand.cs b/OneMore/Commands/References/LinkReferencesCommand.cs
@@ -284,11 +284,7 @@ private IEnumerable<XElement> FlattenPages(XElement results, string pageId)
 
 		private string GetSynopsis(Page page, string title)
 		{
-			var body = page.Root
-				.Elements(ns + "Outline")
-				.FirstOrDefault(e => !e.Parent.Elements(ns + "Meta")
-					.Any(m => m.Attribute("name").Value.Equals(MetaNames.TaggingBank)));
-
+			var body = page.BodyOutlines.FirstOrDefault();
 			if (body == null)
 			{
 				return null;

diff --git a/OneMore/Commands/Reminders/ReportRemindersCommand.cs b/OneMore/Commands/Reminders/ReportRemindersCommand.cs
@@ -319,10 +319,7 @@ private async Task<string> FindReport(OneNote.Scope scope)
 
 		private void ClearContent()
 		{
-			var chalkOutlines = page.Root.Elements(ns + "Outline")
-				.Where(e => !e.Elements(ns + "Meta")
-					.Any(m => m.Attribute("name").Value == MetaNames.TaggingBank));
-
+			var chalkOutlines = page.BodyOutlines;
 			if (chalkOutlines.Any())
 			{
 				// assume the first outline is the report, reuse it as our container