From 07ee49a30c9e41dc9f293356d6d4258588810a5e Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Sat, 10 Feb 2024 15:19:43 -0500 Subject: [PATCH] tweak --- OneMore/Commands/Settings/SettingsDialog.cs | 2 ++ OneMore/Commands/Snippets/InsertTocDialog.cs | 2 +- OneMore/Commands/Tables/AddFormulaCommand.cs | 8 ++++---- .../Commands/Tables/DeleteFormulaCommand.cs | 2 +- OneMore/Commands/Tables/FillCellsCommand.cs | 2 +- .../Commands/Tables/HighlightFormulaCommand.cs | 2 +- OneMore/Commands/Tables/InsertCellsCommand.cs | 2 +- OneMore/Commands/Tables/PasteCellsCommand.cs | 10 +++++----- .../Tables/RecalculateFormulaCommand.cs | 2 +- OneMore/Commands/Tables/SplitTableCommand.cs | 4 ++-- OneMore/Commands/Tables/TextToTableCommand.cs | 2 +- .../Commands/Tagging/HashtagDialog.Designer.cs | 3 +-- OneMore/Properties/Resources.Designer.cs | 18 ------------------ OneMore/Properties/Resources.ar-SA.resx | 8 -------- OneMore/Properties/Resources.de-DE.resx | 8 -------- OneMore/Properties/Resources.es-ES.resx | 8 -------- OneMore/Properties/Resources.fr-FR.resx | 8 -------- OneMore/Properties/Resources.he-IL.resx | 8 -------- OneMore/Properties/Resources.nl-NL.resx | 8 -------- OneMore/Properties/Resources.pl-PL.resx | 8 -------- OneMore/Properties/Resources.pt-BR.resx | 8 -------- OneMore/Properties/Resources.resx | 8 -------- OneMore/Properties/Resources.zh-CN.resx | 8 -------- 23 files changed, 21 insertions(+), 118 deletions(-) diff --git a/OneMore/Commands/Settings/SettingsDialog.cs b/OneMore/Commands/Settings/SettingsDialog.cs index 502311e12d..7b6668a50e 100644 --- a/OneMore/Commands/Settings/SettingsDialog.cs +++ b/OneMore/Commands/Settings/SettingsDialog.cs @@ -144,8 +144,10 @@ private async void Navigate(object sender, TreeViewEventArgs e) headerLabel.Text = sheet.Title; + contentPanel.SuspendLayout(); contentPanel.Controls.Clear(); contentPanel.Controls.Add(sheet); + contentPanel.ResumeLayout(); } diff --git a/OneMore/Commands/Snippets/InsertTocDialog.cs b/OneMore/Commands/Snippets/InsertTocDialog.cs index 7d61aa194c..300cae4e35 100644 --- a/OneMore/Commands/Snippets/InsertTocDialog.cs +++ b/OneMore/Commands/Snippets/InsertTocDialog.cs @@ -111,7 +111,7 @@ private void ChangedRadio(object sender, EventArgs e) if (sender == pageRadio) { topBox.Enabled = true; - rightAlignBox.Enabled = true; + rightAlignBox.Enabled = topBox.Checked; locationBox.Enabled = true; styleBox.Enabled = true; previewBox.Enabled = false; diff --git a/OneMore/Commands/Tables/AddFormulaCommand.cs b/OneMore/Commands/Tables/AddFormulaCommand.cs index 2af2d17622..3e3a60e220 100644 --- a/OneMore/Commands/Tables/AddFormulaCommand.cs +++ b/OneMore/Commands/Tables/AddFormulaCommand.cs @@ -1,5 +1,5 @@ //************************************************************************************************ -// Copyright © 2020 Steven M Cohn. All rights reserved. +// Copyright © 2020 Steven M Cohn. All rights reserved. //************************************************************************************************ namespace River.OneMoreAddIn.Commands @@ -48,7 +48,7 @@ public override async Task Execute(params object[] args) if (!page.ConfirmBodyContext()) { - UIHelper.ShowInfo(one.Window, Resx.FormulaCommand_SelectOne); + UI.MoreMessageBox.Show(owner, Resx.FormulaCommand_SelectOne); return; } @@ -67,7 +67,7 @@ public override async Task Execute(params object[] args) if (anchor == null) { - UIHelper.ShowInfo(one.Window, Resx.FormulaCommand_SelectOne); + UI.MoreMessageBox.Show(owner, Resx.FormulaCommand_SelectOne); return; } @@ -76,7 +76,7 @@ public override async Task Execute(params object[] args) if (range == TableSelectionRange.Rectangular) { - UIHelper.ShowInfo(one.Window, Resx.FormulaCommand_Linear); + UI.MoreMessageBox.Show(owner, Resx.FormulaCommand_Linear); return; } diff --git a/OneMore/Commands/Tables/DeleteFormulaCommand.cs b/OneMore/Commands/Tables/DeleteFormulaCommand.cs index 02fbe4097d..4d6bd65486 100644 --- a/OneMore/Commands/Tables/DeleteFormulaCommand.cs +++ b/OneMore/Commands/Tables/DeleteFormulaCommand.cs @@ -65,7 +65,7 @@ public override async Task Execute(params object[] args) } else { - UIHelper.ShowInfo(Resx.DeleteFormulaCommand_NoFormulas); + UI.MoreMessageBox.Show(owner, Resx.DeleteFormulaCommand_NoFormulas); } } } diff --git a/OneMore/Commands/Tables/FillCellsCommand.cs b/OneMore/Commands/Tables/FillCellsCommand.cs index 1c2a6caa9c..4512c02842 100644 --- a/OneMore/Commands/Tables/FillCellsCommand.cs +++ b/OneMore/Commands/Tables/FillCellsCommand.cs @@ -93,7 +93,7 @@ public override async Task Execute(params object[] args) if (anchor == null) { - UIHelper.ShowInfo(one.Window, Resx.InsertCellsCommand_NoSelection); + UI.MoreMessageBox.Show(owner, Resx.InsertCellsCommand_NoSelection); return; } diff --git a/OneMore/Commands/Tables/HighlightFormulaCommand.cs b/OneMore/Commands/Tables/HighlightFormulaCommand.cs index f472c557c4..3706e5c8cb 100644 --- a/OneMore/Commands/Tables/HighlightFormulaCommand.cs +++ b/OneMore/Commands/Tables/HighlightFormulaCommand.cs @@ -58,7 +58,7 @@ public override async Task Execute(params object[] args) } else { - UIHelper.ShowInfo(Resx.HighlightFormulaCommand_NoFormulas); + UI.MoreMessageBox.Show(owner, Resx.HighlightFormulaCommand_NoFormulas); } logger.WriteTime("highlight"); diff --git a/OneMore/Commands/Tables/InsertCellsCommand.cs b/OneMore/Commands/Tables/InsertCellsCommand.cs index 3deae85df8..1c68d91a9e 100644 --- a/OneMore/Commands/Tables/InsertCellsCommand.cs +++ b/OneMore/Commands/Tables/InsertCellsCommand.cs @@ -47,7 +47,7 @@ public override async Task Execute(params object[] args) if (anchor == null) { - UIHelper.ShowInfo(one.Window, Resx.InsertCellsCommand_NoSelection); + UI.MoreMessageBox.Show(owner, Resx.InsertCellsCommand_NoSelection); return; } diff --git a/OneMore/Commands/Tables/PasteCellsCommand.cs b/OneMore/Commands/Tables/PasteCellsCommand.cs index 618849dedd..a6e1d49952 100644 --- a/OneMore/Commands/Tables/PasteCellsCommand.cs +++ b/OneMore/Commands/Tables/PasteCellsCommand.cs @@ -55,7 +55,7 @@ public override async Task Execute(params object[] args) if (anchor == null) { logger.WriteLine("could not find anchor cell"); - UIHelper.ShowInfo(one.Window, "could not find anchor cell; this shouldn't happen!"); + UI.MoreMessageBox.Show(owner, "could not find anchor cell; this shouldn't happen!"); IsCancelled = true; return; } @@ -65,7 +65,7 @@ public override async Task Execute(params object[] args) var spage = await GetSourcePage(); if (spage == null) { - UIHelper.ShowInfo(one.Window, Resx.PasteCellsCommand_NoContent); + UI.MoreMessageBox.Show(owner, Resx.PasteCellsCommand_NoContent); IsCancelled = true; return; } @@ -73,7 +73,7 @@ public override async Task Execute(params object[] args) var source = GetSourceTable(spage); if (source == null) { - UIHelper.ShowInfo(one.Window, Resx.PasteCellsCommand_NoContent); + UI.MoreMessageBox.Show(owner, Resx.PasteCellsCommand_NoContent); IsCancelled = true; return; } @@ -120,7 +120,7 @@ private XElement GetTargetTableRoot(Page page, XNamespace ns) if (cell == null) { - UIHelper.ShowInfo(one.Window, Resx.PasteCellsCommand_SelectCell); + UI.MoreMessageBox.Show(owner, Resx.PasteCellsCommand_SelectCell); return null; } @@ -128,7 +128,7 @@ private XElement GetTargetTableRoot(Page page, XNamespace ns) if (root == null) { logger.WriteLine("error finding "); - UIHelper.ShowInfo(one.Window, "error finding ; this shouldn't happen!"); + UI.MoreMessageBox.Show(owner, "error finding ; this shouldn't happen!"); return null; } diff --git a/OneMore/Commands/Tables/RecalculateFormulaCommand.cs b/OneMore/Commands/Tables/RecalculateFormulaCommand.cs index b071185ebe..6570ce4729 100644 --- a/OneMore/Commands/Tables/RecalculateFormulaCommand.cs +++ b/OneMore/Commands/Tables/RecalculateFormulaCommand.cs @@ -64,7 +64,7 @@ where c.Root.Elements(ns + "OEChildren").Elements(ns + "OE").Elements(ns + "Meta if (!updated) { - UIHelper.ShowInfo(Resx.RecalculateFormulaCommand_NoFormula); + UI.MoreMessageBox.Show(owner, Resx.RecalculateFormulaCommand_NoFormula); } logger.WriteTime("recalcution"); diff --git a/OneMore/Commands/Tables/SplitTableCommand.cs b/OneMore/Commands/Tables/SplitTableCommand.cs index 01b93d01bc..2ed44a0da1 100644 --- a/OneMore/Commands/Tables/SplitTableCommand.cs +++ b/OneMore/Commands/Tables/SplitTableCommand.cs @@ -45,14 +45,14 @@ public override async Task Execute(params object[] args) if (anchor == null) { - UIHelper.ShowInfo(one.Window, Resx.SplitTableCommand_NoSelection); + UI.MoreMessageBox.Show(owner, Resx.SplitTableCommand_NoSelection); return; } var row = anchor.FirstAncestor(ns + "Row"); if (!row.ElementsBeforeSelf(ns + "Row").Any()) { - UIHelper.ShowInfo(one.Window, Resx.SplitTableCommand_FirstRow); + UI.MoreMessageBox.Show(owner, Resx.SplitTableCommand_FirstRow); return; } diff --git a/OneMore/Commands/Tables/TextToTableCommand.cs b/OneMore/Commands/Tables/TextToTableCommand.cs index 7e34c16a67..a0d2986b51 100644 --- a/OneMore/Commands/Tables/TextToTableCommand.cs +++ b/OneMore/Commands/Tables/TextToTableCommand.cs @@ -39,7 +39,7 @@ public override async Task Execute(params object[] args) if (selections.Count == 0 || (selections.Count == 1 && selections[0].Value == string.Empty)) { - UIHelper.ShowInfo(one.Window, Resx.TextToTable_NoText); + UI.MoreMessageBox.Show(owner, Resx.TextToTable_NoText); return; } diff --git a/OneMore/Commands/Tagging/HashtagDialog.Designer.cs b/OneMore/Commands/Tagging/HashtagDialog.Designer.cs index 4ca64735b9..9eff38fb53 100644 --- a/OneMore/Commands/Tagging/HashtagDialog.Designer.cs +++ b/OneMore/Commands/Tagging/HashtagDialog.Designer.cs @@ -220,6 +220,7 @@ private void InitializeComponent() this.tagBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tagBox.Location = new System.Drawing.Point(41, 12); this.tagBox.Name = "tagBox"; + this.tagBox.ProcessEnterKey = false; this.tagBox.Size = new System.Drawing.Size(608, 28); this.tagBox.TabIndex = 0; this.tagBox.ThemedBack = null; @@ -352,8 +353,6 @@ private void InitializeComponent() this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; - this.MaximizeBox = false; - this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(900, 400); this.Name = "HashtagDialog"; this.Text = "Find Hashtags"; diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs index 7b81b8a6b1..a434725b93 100644 --- a/OneMore/Properties/Resources.Designer.cs +++ b/OneMore/Properties/Resources.Designer.cs @@ -5677,15 +5677,6 @@ internal static string PlantUml_EmptySelection { } } - /// - /// Looks up a localized string similar to Invalid syntax or incomplete selection of PlantUML. - /// - internal static string PlantUml_Error { - get { - return ResourceManager.GetString("PlantUml_Error", resourceCulture); - } - } - /// /// Looks up a localized string similar to http://www.plantuml.com/plantuml/png/. /// @@ -6226,15 +6217,6 @@ internal static string RemindCommand_noReminder { } } - /// - /// Looks up a localized string similar to Click Yes to update this existing report, No to create a new report, or Cancel. - /// - internal static string RemindCommand_Reuse { - get { - return ResourceManager.GetString("RemindCommand_Reuse", resourceCulture); - } - } - /// /// Looks up a localized string similar to Due date. /// diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx index 3171fa434f..7444ea4ff8 100644 --- a/OneMore/Properties/Resources.ar-SA.resx +++ b/OneMore/Properties/Resources.ar-SA.resx @@ -2085,10 +2085,6 @@ اختيار فارغ. حدد كتلة صالحة من نص PlantUML. error message - - بناء جملة غير صالح أو تحديد غير كامل لـ PlantUML - error message - تم اكتشاف ملف XML غير صالح. error message @@ -2332,10 +2328,6 @@ ISO-code then comma then language name لا يوجد تذكير في هذه الفقرة message box - - انقر فوق "نعم" لتحديث هذا التقرير الموجود أو "لا" لإنشاء تقرير جديد أو "إلغاء الأمر" - message box - تاريخ الاستحقاق label diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx index c224079697..ef5f7fd367 100644 --- a/OneMore/Properties/Resources.de-DE.resx +++ b/OneMore/Properties/Resources.de-DE.resx @@ -2083,10 +2083,6 @@ Bewerben Sie sich auf dieses Notizbuch Leere Auswahl. Wählen Sie einen gültigen Block von PlantUML-Text aus. error message - - Ungültige Syntax oder unvollständige Auswahl von PlantUML - error message - Ungültiges XML erkannt. error message @@ -2329,10 +2325,6 @@ Jahr (2023) Es gibt keine Erinnerung zu diesem Absatz message box - - Klicke auf Ja, um diesen vorhandenen Bericht zu aktualisieren, auf Nein, um einen neuen Bericht zu erstellen, oder auf Abbrechen - message box - Geburtstermin label diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx index 127cb88cab..b5a161b8ce 100644 --- a/OneMore/Properties/Resources.es-ES.resx +++ b/OneMore/Properties/Resources.es-ES.resx @@ -2085,10 +2085,6 @@ Aplicar a este cuaderno Selección vacía. Seleccione un bloque válido de texto PlantUML. error message - - Sintaxis no válida o selección incompleta de PlantUML - error message - XML no válido detectado. error message @@ -2332,10 +2328,6 @@ Año (2023) No hay recordatorio en este párrafo message box - - Haga clic en Sí para actualizar este informe existente, No para crear un nuevo informe o Cancelar - message box - Fecha de vencimiento label diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx index 367c5bd4ac..666f222488 100644 --- a/OneMore/Properties/Resources.fr-FR.resx +++ b/OneMore/Properties/Resources.fr-FR.resx @@ -2085,10 +2085,6 @@ Postuler à ce carnet Sélection vide. Sélectionnez un bloc valide de texte PlantUML. error message - - Syntaxe invalide ou sélection incomplète de PlantUML - error message - XML non valide détecté. error message @@ -2331,10 +2327,6 @@ Année (2023) Il n'y a pas de rappel sur ce paragraphe message box - - Cliquez sur Oui pour mettre à jour ce rapport existant, Non pour créer un nouveau rapport ou Annuler - message box - Date d'échéance label diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx index 0d98c7d886..2d4ecd6278 100644 --- a/OneMore/Properties/Resources.he-IL.resx +++ b/OneMore/Properties/Resources.he-IL.resx @@ -2094,10 +2094,6 @@ Total Row Font בחירה ריקה. בחר בלוק חוקי של טקסט PlantUML. error message - - תחביר לא חוקי או בחירה לא מלאה של PlantUML - error message - זוהה XML לא חוקי. בדוק את קובץ היומן לפרטים error message @@ -2345,10 +2341,6 @@ ISO-code then comma then language name אין תזכורת בפסקה זו message box - - לחץ על כן כדי לעדכן דוח קיים זה, לא כדי ליצור דוח חדש, או בטל - message box - תאריך להגשה label diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx index a537d7892d..2458a43c32 100644 --- a/OneMore/Properties/Resources.nl-NL.resx +++ b/OneMore/Properties/Resources.nl-NL.resx @@ -2086,10 +2086,6 @@ Toepassen op dit notitieboekje Lege selectie. Selecteer een geldig blok PlantUML-tekst. error message - - Ongeldige syntaxis of onvolledige selectie van PlantUML - error message - Ongeldige XML gedetecteerd. error message @@ -2333,10 +2329,6 @@ Jaar (2023) Er is geen herinnering in deze paragraaf message box - - Klik op Ja om dit bestaande rapport bij te werken, op Nee om een ​​nieuw rapport te maken of op Annuleren - message box - Opleveringsdatum label diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx index 5449a08a79..a48c20ff65 100644 --- a/OneMore/Properties/Resources.pl-PL.resx +++ b/OneMore/Properties/Resources.pl-PL.resx @@ -2094,10 +2094,6 @@ Zastosuj do tego notatnika Pusty wybór. Wybierz prawidłowy blok tekstu PlantUML. error message - - Niepoprawna składnia lub niepełny wybór PlantUML - error message - Nieprawidłowy wykryty XML. Szczegółowe informacje można znaleźć w pliku dziennika error message @@ -2345,10 +2341,6 @@ Rok (2023) Nie ma przypomnienia na tym akapicie message box - - Kliknij Tak, aby zaktualizować ten istniejący raport, nie do utworzenia nowego raportu lub anuluj - message box - Termin label diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx index d32d068d3d..4ea080a729 100644 --- a/OneMore/Properties/Resources.pt-BR.resx +++ b/OneMore/Properties/Resources.pt-BR.resx @@ -2086,10 +2086,6 @@ Aplicar a este caderno Seleção vazia. Selecione um bloco válido de texto PlantUML. error message - - Sintaxe inválida ou seleção incompleta de PlantUML - error message - XML inválido detectado. error message @@ -2333,10 +2329,6 @@ Ano (2023) Não há lembrete neste parágrafo message box - - Clique em Sim para atualizar este relatório existente, Não para criar um novo relatório ou Cancelar - message box - Data de Vencimento label diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx index 64d1d7f970..3b82727b59 100644 --- a/OneMore/Properties/Resources.resx +++ b/OneMore/Properties/Resources.resx @@ -2110,10 +2110,6 @@ Apply to this notebook Empty selection. Select a valid block of PlantUML text. error message - - Invalid syntax or incomplete selection of PlantUML - error message - http://www.plantuml.com/plantuml/png/ PlantUML Remote servier SKIP @@ -2365,10 +2361,6 @@ Year (2023) There is no reminder on this paragraph message box - - Click Yes to update this existing report, No to create a new report, or Cancel - message box - Due date label diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx index 54b92c8230..895973dae3 100644 --- a/OneMore/Properties/Resources.zh-CN.resx +++ b/OneMore/Properties/Resources.zh-CN.resx @@ -2084,10 +2084,6 @@ OneNote 文件 (*.one) 空选择。选择一个有效的 PlantUML 文本块。 error message - - PlantUML 语法无效或选择不完整 - error message - 检测到无效的XML。 检查日志文件以获取详细信息 error message @@ -2331,10 +2327,6 @@ ISO-code then comma then language name 这一段没有提醒 message box - - 单击是更新此现有报告，单击否创建新报告，或单击取消 - message box - 到期日 label