From f79ac7aee89665048e71744bae1ce7cd23115e91 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Mon, 21 Aug 2023 19:29:43 -0400 Subject: [PATCH] #1091 Bind Ctrl+Shift+J to highlight with most recently used rotating highlight color --- OneMore/AddInCommands.cs | 7 ++++++- OneMore/Commands/Edit/HighlightCommand.cs | 10 ++++++++-- OneMore/Properties/Resources.Designer.cs | 9 +++++++++ OneMore/Properties/Resources.ar-SA.resx | 4 ++++ OneMore/Properties/Resources.de-DE.resx | 4 ++++ OneMore/Properties/Resources.es-ES.resx | 4 ++++ OneMore/Properties/Resources.fr-FR.resx | 4 ++++ OneMore/Properties/Resources.he-IL.resx | 4 ++++ OneMore/Properties/Resources.nl-NL.resx | 4 ++++ OneMore/Properties/Resources.pl-PL.resx | 4 ++++ OneMore/Properties/Resources.pt-BR.resx | 4 ++++ OneMore/Properties/Resources.resx | 4 ++++ OneMore/Properties/Resources.zh-CN.resx | 4 ++++ 13 files changed, 63 insertions(+), 3 deletions(-) diff --git a/OneMore/AddInCommands.cs b/OneMore/AddInCommands.cs index c19994c4bd..097b9f7b89 100644 --- 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(); + => await factory.Run(1); + + + [Command("ribHighlightLastButton_Label", Keys.Control | Keys.Shift | Keys.J, "ribEditMenu")] + public async Task HighlightLastCmd(IRibbonControl control) + => await factory.Run(0); [Command("ribHighlightFormulaButton_Label", Keys.None, "ribTableMenu")] diff --git a/OneMore/Commands/Edit/HighlightCommand.cs b/OneMore/Commands/Edit/HighlightCommand.cs index a326494a98..6bf8ae3eda 100644 --- a/OneMore/Commands/Edit/HighlightCommand.cs +++ b/OneMore/Commands/Edit/HighlightCommand.cs @@ -24,6 +24,8 @@ 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; @@ -31,7 +33,7 @@ public override async Task Execute(params object[] args) 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 index 0c2cc1c74a..5088324f98 100644 --- a/OneMore/Properties/Resources.Designer.cs +++ b/OneMore/Properties/Resources.Designer.cs @@ -6852,6 +6852,15 @@ internal static string ribHighlightFormulaButton_Screentip { } } + /// + /// Looks up a localized string similar to Highlight text with most recent highlighter. + /// + internal static string ribHighlightLastButton_Label { + get { + return ResourceManager.GetString("ribHighlightLastButton_Label", resourceCulture); + } + } + /// /// Looks up a localized string similar to Images. /// diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx index 13aec37e21..555a18bf18 100644 --- 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 خلايا عالية مع صيغة في الجدول الحالي Ribbon OneMore menu item, Formula... + + قم بتمييز النص بأحدث قلم تمييز + ribbon edit + الصور Ribbon OneMore menu item, Images... diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx index db6304f267..f61b25e171 100644 --- a/OneMore/Properties/Resources.de-DE.resx +++ b/OneMore/Properties/Resources.de-DE.resx @@ -2828,6 +2828,10 @@ Polaroid Hohe Zellen mit Formel in der aktuellen Tabelle Ribbon OneMore menu item, Formula... + + Markieren Sie Text mit dem neuesten Textmarker + ribbon edit + Bilder Ribbon OneMore menu item, Images... diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx index 1e2ad20c50..6772b4c36f 100644 --- a/OneMore/Properties/Resources.es-ES.resx +++ b/OneMore/Properties/Resources.es-ES.resx @@ -2832,6 +2832,10 @@ polaroid Celdas altas con fórmula en la tabla actual Ribbon OneMore menu item, Formula... + + Resaltar texto con el resaltador más reciente + ribbon edit + Imagenes Ribbon OneMore menu item, Images... diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx index afdc19b7a8..45bb4d1dc6 100644 --- a/OneMore/Properties/Resources.fr-FR.resx +++ b/OneMore/Properties/Resources.fr-FR.resx @@ -2828,6 +2828,10 @@ Polaroïd Cellules hautes avec formule dans le tableau actuel Ribbon OneMore menu item, Formula... + + Surligner le texte avec le surligneur le plus récent + ribbon edit + Images Ribbon OneMore menu item, Images... diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx index b28467733a..ff355cb8e6 100644 --- 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 תאים גבוהים עם נוסחה בטבלה הנוכחית Ribbon OneMore menu item, Formula... + + הדגש טקסט עם ההדגשה העדכנית ביותר + ribbon edit + תמונות Ribbon OneMore menu item, Images... NODUP diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx index c4e3167f3a..f9185995ed 100644 --- a/OneMore/Properties/Resources.nl-NL.resx +++ b/OneMore/Properties/Resources.nl-NL.resx @@ -2833,6 +2833,10 @@ Polaroid Hoge cellen met formule in huidige tabel Ribbon OneMore menu item, Formula... + + Markeer tekst met de meest recente markeerstift + ribbon edit + Afbeeldingen Ribbon OneMore menu item, Images... diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx index 7322d424de..897fee2542 100644 --- a/OneMore/Properties/Resources.pl-PL.resx +++ b/OneMore/Properties/Resources.pl-PL.resx @@ -2845,6 +2845,10 @@ Polaroid Wysokie komórki o wzorze w bieżącej tabeli Ribbon OneMore menu item, Formula... + + Podświetl tekst najnowszym zakreślaczem + ribbon edit + Obrazy Ribbon OneMore menu item, Images... NODUP diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx index 262017480b..9ec2cb9a58 100644 --- a/OneMore/Properties/Resources.pt-BR.resx +++ b/OneMore/Properties/Resources.pt-BR.resx @@ -2833,6 +2833,10 @@ Polaroid. Células altas com fórmula na tabela atual Ribbon OneMore menu item, Formula... + + Destaque o texto com o marcador mais recente + ribbon edit + Imagens Ribbon OneMore menu item, Images... diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx index fe0c7c754d..6a9f6a4d9a 100644 --- a/OneMore/Properties/Resources.resx +++ b/OneMore/Properties/Resources.resx @@ -2869,6 +2869,10 @@ Polaroid High cells with formula in current table ribbon table + + Highlight text with most recent highlighter + ribbon edit + Images menu NODUP diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx index 367b46b694..8dcf768dcc 100644 --- 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 当前表中具有公式的高级单元格 Ribbon OneMore menu item, Formula... + + 使用最新的荧光笔突出显示文本 + ribbon edit + 图片 Ribbon OneMore menu item, Images...