Merge pull request #1093 from stevencohn/1091-keep-highlight

Keep rotating highlight color
stevencohn · Aug 21, 2023 · 4294fe1 · 4294fe1
2 parents a75bb8e + f79ac7a
commit 4294fe1
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 3 deletions.
diff --git a/OneMore/AddInCommands.cs b/OneMore/AddInCommands.cs
@@ -356,7 +356,12 @@ public async Task GotoFavoriteCmd(IRibbonControl control)
 
 		[Command("ribHighlightButton_Label", Keys.Control | Keys.Shift | Keys.H, "ribEditMenu")]
 		public async Task HighlightCmd(IRibbonControl control)
-			=> await factory.Run<HighlightCommand>();
+			=> await factory.Run<HighlightCommand>(1);
+
+
+		[Command("ribHighlightLastButton_Label", Keys.Control | Keys.Shift | Keys.J, "ribEditMenu")]
+		public async Task HighlightLastCmd(IRibbonControl control)
+			=> await factory.Run<HighlightCommand>(0);
 
 
 		[Command("ribHighlightFormulaButton_Label", Keys.None, "ribTableMenu")]

diff --git a/OneMore/Commands/Edit/HighlightCommand.cs b/OneMore/Commands/Edit/HighlightCommand.cs
@@ -24,14 +24,16 @@ public HighlightCommand()
 
 		public override async Task Execute(params object[] args)
 		{
+			var increment = (int)args[0];
+
 			using var one = new OneNote(out var page, out var ns);
 			var updated = false;
 			var index = 0;
 
 			var meta = page.GetMetaContent(MetaNames.HighlightIndex);
 			if (meta != null)
 			{
-				if (int.TryParse(meta, out index))
+				if (int.TryParse(meta, out index) && increment > 0)
 				{
 					index = index < 4 ? index + 1 : 0;
 				}
@@ -60,7 +62,11 @@ public override async Task Execute(params object[] args)
 
 			if (updated)
 			{
-				page.SetMeta(MetaNames.HighlightIndex, index.ToString(CultureInfo.InvariantCulture));
+				if (increment > 0)
+				{
+					page.SetMeta(MetaNames.HighlightIndex, index.ToString(CultureInfo.InvariantCulture));
+				}
+
 				await one.Update(page);
 			}
 		}

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
@@ -2832,6 +2832,10 @@ ISO-code then comma then language name</comment>
     <value>خلايا عالية مع صيغة في الجدول الحالي</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>قم بتمييز النص بأحدث قلم تمييز</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>الصور</value>
     <comment>Ribbon OneMore menu item, Images...</comment>

diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx
@@ -2828,6 +2828,10 @@ Polaroid</value>
     <value>Hohe Zellen mit Formel in der aktuellen Tabelle</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Markieren Sie Text mit dem neuesten Textmarker</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Bilder</value>
     <comment>Ribbon OneMore menu item, Images...</comment>

diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx
@@ -2832,6 +2832,10 @@ polaroid</value>
     <value>Celdas altas con fórmula en la tabla actual</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Resaltar texto con el resaltador más reciente</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Imagenes</value>
     <comment>Ribbon OneMore menu item, Images...</comment>

diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx
@@ -2828,6 +2828,10 @@ Polaroïd</value>
     <value>Cellules hautes avec formule dans le tableau actuel</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Surligner le texte avec le surligneur le plus récent</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Images</value>
     <comment>Ribbon OneMore menu item, Images...</comment>

diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx
@@ -2853,6 +2853,10 @@ ISO-code then comma then language name</comment>
     <value>תאים גבוהים עם נוסחה בטבלה הנוכחית</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>הדגש טקסט עם ההדגשה העדכנית ביותר</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>תמונות</value>
     <comment>Ribbon OneMore menu item, Images... NODUP</comment>

diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx
@@ -2833,6 +2833,10 @@ Polaroid</value>
     <value>Hoge cellen met formule in huidige tabel</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Markeer tekst met de meest recente markeerstift</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Afbeeldingen</value>
     <comment>Ribbon OneMore menu item, Images...</comment>

diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx
@@ -2845,6 +2845,10 @@ Polaroid</value>
     <value>Wysokie komórki o wzorze w bieżącej tabeli</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Podświetl tekst najnowszym zakreślaczem</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Obrazy</value>
     <comment>Ribbon OneMore menu item, Images... NODUP</comment>

diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx
@@ -2833,6 +2833,10 @@ Polaroid.</value>
     <value>Células altas com fórmula na tabela atual</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Destaque o texto com o marcador mais recente</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Imagens</value>
     <comment>Ribbon OneMore menu item, Images...</comment>

diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx
@@ -2869,6 +2869,10 @@ Polaroid</value>
     <value>High cells with formula in current table</value>
     <comment>ribbon table</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>Highlight text with most recent highlighter</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>Images</value>
     <comment>menu NODUP</comment>

diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx
@@ -2836,6 +2836,10 @@ ISO-code then comma then language name</comment>
     <value>当前表中具有公式的高级单元格</value>
     <comment>Ribbon OneMore menu item, Formula...</comment>
   </data>
+  <data name="ribHighlightLastButton_Label" xml:space="preserve">
+    <value>使用最新的荧光笔突出显示文本</value>
+    <comment>ribbon edit</comment>
+  </data>
   <data name="ribImagesMenu_Label" xml:space="preserve">
     <value>图片</value>
     <comment>Ribbon OneMore menu item, Images...</comment>