Merge pull request #1274 from stevencohn/1273-scope-images-to-edit

Logically collect images to adjust
stevencohn · Jan 20, 2024 · aca4db3 · aca4db3
2 parents d5a45f5 + 729a064
commit aca4db3
Show file tree

Hide file tree

Showing 13 changed files with 131 additions and 33 deletions.
diff --git a/OneMore/Commands/Images/AdjustImagesCommand.cs b/OneMore/Commands/Images/AdjustImagesCommand.cs
@@ -19,6 +19,9 @@ namespace River.OneMoreAddIn.Commands
 	/// </summary>
 	internal class AdjustImagesCommand : Command
 	{
+		private bool scopeFore;
+
+
 		public AdjustImagesCommand()
 		{
 		}
@@ -28,27 +31,57 @@ public override async Task Execute(params object[] args)
 		{
 			using var one = new OneNote(out var page, out var ns, OneNote.PageDetail.All);
 
-			// starting at Outline should exclude all background images
+			// find selected foreground images
 			var elements = page.Root
 				.Elements(ns + "Outline")
 				.Descendants(ns + "Image")?
 				.Where(e => e.Attribute("selected")?.Value == "all")
 				.ToList();
 
-			if ((elements == null) || !elements.Any())
+			if (elements.Any())
+			{
+				scopeFore = true;
+			}
+			else
 			{
+				// else find selected background images
 				elements = page.Root
-					.Elements(ns + "Outline").Descendants(ns + "Image")
+					.Elements(ns + "Image")
+					.Where(e => e.Attribute("selected")?.Value == "all")
 					.ToList();
+
+				if (elements.Any())
+				{
+					scopeFore = false;
+				}
+				else
+				{
+					// else find all foreground images
+					elements = page.Root
+						.Elements(ns + "Outline")
+						.Descendants(ns + "Image")
+						.ToList();
+
+					if (elements.Any())
+					{
+						scopeFore = true;
+					}
+					else
+					{
+						// else find all background images
+						elements = page.Root.Elements(ns + "Image").ToList();
+						scopeFore = false;
+					}
+				}
 			}
 
-			if (elements.Any())
+			if (elements != null && elements.Any())
 			{
 				var updated = elements.Count == 1
 					// single selected image
 					? ResizeOne(elements[0])
 					// multiple selections or all if none selected
-					: ResizeMany(elements, page, page.Root.Elements(ns + "Image").Any());
+					: ResizeMany(elements, page);
 
 				if (updated)
 				{
@@ -83,9 +116,13 @@ private bool ResizeOne(XElement element)
 		}
 
 
-		private bool ResizeMany(IEnumerable<XElement> elements, Page page, bool hasBgImages)
+		private bool ResizeMany(List<XElement> elements, Page page)
 		{
-			using var dialog = new AdjustImagesDialog(hasBgImages);
+			using var dialog = new AdjustImagesDialog()
+			{
+				ForegroundImages = scopeFore,
+				ImageCount = elements.Count
+			};
 
 			var result = dialog.ShowDialog(owner);
 			if (result != DialogResult.OK)

diff --git a/OneMore/Commands/Images/AdjustImagesDialog.cs b/OneMore/Commands/Images/AdjustImagesDialog.cs
@@ -31,7 +31,7 @@ internal partial class AdjustImagesDialog : UI.LocalizableForm
 		/// Initializes a new dialog to resize all images on the page to a standard width
 		/// and height with respective ratio
 		/// </summary>
-		public AdjustImagesDialog(bool hasBackgroundImages)
+		public AdjustImagesDialog()
 		{
 			Initialize();
 
@@ -45,6 +45,7 @@ public AdjustImagesDialog(bool hasBackgroundImages)
 			// hide controls that do not apply...
 
 			viewSizeLabel.Text = Resx.AdjustImagesDialog_appliesTo;
+
 			allLabel.Location = viewSizeLink.Location;
 			allLabel.Visible = true;
 
@@ -69,7 +70,7 @@ public AdjustImagesDialog(bool hasBackgroundImages)
 			presetRadio.Checked = true;
 			RadioClick(presetRadio, null);
 
-			repositionBox.Visible = hasBackgroundImages;
+			repositionBox.Visible = !ForegroundImages;
 
 			scaling = null;
 
@@ -127,7 +128,6 @@ private void Initialize()
 					"viewSizeLabel",
 					"imageSizeLabel",
 					"storageLabel=word_Storage",
-					"allLabel",
 					"limitsBox",
 					"autoSizeRadio",
 					"pctRadio",
@@ -216,13 +216,25 @@ private void LoadSettings(bool oneImage)
 		protected override void OnLoad(EventArgs e)
 		{
 			base.OnLoad(e);
+
+			if (allLabel.Visible)
+			{
+				allLabel.Text = string.Format(ForegroundImages
+					? Resx.AdjustImagesDialog_allLabelForeground
+					: Resx.AdjustImagesDialog_allLabelBackground, ImageCount);
+			}
+
 			suspended = false;
 		}
 		#endregion Lifecycle
 
 
 		// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
 
+		public bool ForegroundImages { private get; set; }
+
+		public int ImageCount { private get; set; }
+
 		public bool RepositionImages => repositionBox.Checked;
 
 

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
@@ -192,8 +192,12 @@
     <value>مطلق</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>جميع الصور في هذه الصفحة</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} صور خلفية</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} الصور الأمامية</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx
@@ -189,8 +189,12 @@
     <value>Absolut</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>alle Bilder auf dieser Seite</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} Hintergrundbilder</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} Vordergrundbilder</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx
@@ -192,8 +192,12 @@ OneNote se cerrará automáticamente</value>
     <value>Absoluto</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>todas las imágenes en esta página</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} imágenes de fondo</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} imágenes de primer plano</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx
@@ -189,8 +189,12 @@
     <value>Absolu</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>toutes les images sur cette page</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} images d'arrière-plan</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} images de premier plan</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx
@@ -195,8 +195,12 @@ OneNote ייסגר אוטומטית</value>
     <value>מוּחלָט</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>כל התמונות בדף זה</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} תמונות רקע</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} תמונות קדמיות</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx
@@ -193,8 +193,12 @@ OneNote wordt automatisch gesloten</value>
     <value>Absoluut</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>alle afbeeldingen op deze pagina</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} achtergrondafbeeldingen</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} voorgrondafbeeldingen</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx
@@ -193,8 +193,12 @@ OneNote zamknie się automatycznie</value>
     <value>Absolutny</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>Wszystkie obrazy na tej stronie</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} obrazy tła</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} obrazów na pierwszym planie</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx
@@ -193,8 +193,12 @@ OneNote fechará automaticamente</value>
     <value>Absoluto</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>todas as imagens desta página</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} imagens de fundo</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} imagens em primeiro plano</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx
@@ -195,8 +195,12 @@ OneNote will close automatically</value>
     <value>Absolute</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>all images on this page</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} background images</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} foreground images</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx
@@ -193,8 +193,12 @@ OneNote 将自动关闭</value>
     <value>绝对</value>
     <comment>radio button</comment>
   </data>
-  <data name="AdjustImagesDialog_allLabel.Text" xml:space="preserve">
-    <value>此页面上的所有图像</value>
+  <data name="AdjustImagesDialog_allLabelBackground" xml:space="preserve">
+    <value>{0} 背景图片</value>
+    <comment>info label</comment>
+  </data>
+  <data name="AdjustImagesDialog_allLabelForeground" xml:space="preserve">
+    <value>{0} 前景图像</value>
     <comment>info label</comment>
   </data>
   <data name="AdjustImagesDialog_appliesTo" xml:space="preserve">