Remove avalonia edit hackjobs as they are no longer needed

Add find and replace to rich text editors (conflict solver)
bcssov · Jul 22, 2022 · 554ef04 · 554ef04
1 parent 6065970
commit 554ef04
Show file tree

Hide file tree

Showing 13 changed files with 299 additions and 334 deletions.
diff --git a/src/IronyModManager.Shared/LocalizationResources.cs b/src/IronyModManager.Shared/LocalizationResources.cs
@@ -432,6 +432,8 @@ public static class EditorContextMenu
                 public const string Undo = Prefix + "Undo";
                 public const string Redo = Prefix + "Redo";
                 public const string SelectAll = Prefix + "SelectAll";
+                public const string Find = Prefix + "Find";
+                public const string Replace = Prefix + "Replace";
             }
             public static class Modes
             {

diff --git a/src/IronyModManager/Implementation/AvaloniaEdit/TextAreaInputHandler.cs b/src/IronyModManager/Implementation/AvaloniaEdit/TextAreaInputHandler.cs
diff --git a/src/IronyModManager/Localization/de.json b/src/IronyModManager/Localization/de.json
@@ -327,7 +327,9 @@
             "Paste": "Einfügen",
             "Undo": "Rückgängig Machen",
             "Redo": "Wiederholen",
-            "SelectAll": "Alle Auswählen"
+            "SelectAll": "Alle Auswählen",
+            "Find": "Finden",
+            "Replace": "Ersetzen"
         },
         "Modes": {
             "Title": "Auswahlmodus",

diff --git a/src/IronyModManager/Localization/en.json b/src/IronyModManager/Localization/en.json
@@ -328,7 +328,9 @@
             "Paste": "Paste",
             "Undo": "Undo",
             "Redo": "Redo",
-            "SelectAll": "Select All"
+            "SelectAll": "Select All",
+            "Find": "Find",
+            "Replace": "Replace"
         },
         "Modes": {
             "Title": "Select Mode",

diff --git a/src/IronyModManager/Localization/es.json b/src/IronyModManager/Localization/es.json
@@ -327,7 +327,9 @@
             "Paste": "Pegar",
             "Undo": "Deshacer",
             "Redo": "Rehacer",
-            "SelectAll": "Seleccionar Todo"
+            "SelectAll": "Seleccionar Todo",
+            "Find": "Encuentre",
+            "Replace": "Sustituir"
         },
         "Modes": {
             "Title": "Seleccionar Modo",

diff --git a/src/IronyModManager/Localization/fr.json b/src/IronyModManager/Localization/fr.json
@@ -327,7 +327,9 @@
             "Paste": "Coller",
             "Undo": "annuler",
             "Redo": "Refaire",
-            "SelectAll": "Tout sélectionner"
+            "SelectAll": "Tout sélectionner",
+            "Find": "Trouvez",
+            "Replace": "Remplacer"
         },
         "Modes": {
             "Title": "Sélectionnez le mode",

diff --git a/src/IronyModManager/Localization/hr.json b/src/IronyModManager/Localization/hr.json
@@ -327,7 +327,9 @@
             "Paste": "Zalijepi",
             "Undo": "Poništi",
             "Redo": "Ponovi",
-            "SelectAll": "Odaberi sve"
+            "SelectAll": "Odaberi sve",
+            "Find": "Pronađi",
+            "Replace": "Zamijeni"
         },
         "Modes": {
             "Title": "Odaberi način rada",

diff --git a/src/IronyModManager/Localization/ru.json b/src/IronyModManager/Localization/ru.json
@@ -327,7 +327,9 @@
             "Paste": "Вставить",
             "Undo": "Отменить",
             "Redo": "Вернуть",
-            "SelectAll": "Выбрать все"
+            "SelectAll": "Выбрать все",
+            "Find": "Найти",
+            "Replace": "Заменить"
         },
         "Modes": {
             "Title": "Режим",

diff --git a/src/IronyModManager/Localization/zh.json b/src/IronyModManager/Localization/zh.json
@@ -327,7 +327,9 @@
             "Paste": "粘贴",
             "Undo": "撤销",
             "Redo": "重做",
-            "SelectAll": "全选"
+            "SelectAll": "全选",
+            "Find": "查找",
+            "Replace": "替换"
         },
         "Modes": {
             "Title": "选择模式",

diff --git a/src/IronyModManager/ViewModels/Controls/ConflictSolverCustomConflictsControlViewModel.cs b/src/IronyModManager/ViewModels/Controls/ConflictSolverCustomConflictsControlViewModel.cs
@@ -4,7 +4,7 @@
 // Created          : 07-28-2020
 //
 // Last Modified By : Mario
-// Last Modified On : 07-20-2022
+// Last Modified On : 07-22-2022
 // ***********************************************************************
 // <copyright file="ConflictSolverCustomConflictsControlViewModel.cs" company="Mario">
 //     Mario
@@ -173,6 +173,13 @@ public ConflictSolverCustomConflictsControlViewModel(INotificationAction notific
         [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Delete)]
         public virtual string EditorDelete { get; protected set; }
 
+        /// <summary>
+        /// Gets or sets the editor find.
+        /// </summary>
+        /// <value>The editor find.</value>
+        [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Find)]
+        public virtual string EditorFind { get; protected set; }
+
         /// <summary>
         /// Gets or sets the editor paste.
         /// </summary>
@@ -187,6 +194,13 @@ public ConflictSolverCustomConflictsControlViewModel(INotificationAction notific
         [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Redo)]
         public virtual string EditorRedo { get; protected set; }
 
+        /// <summary>
+        /// Gets or sets the editor replace.
+        /// </summary>
+        /// <value>The editor replace.</value>
+        [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Replace)]
+        public virtual string EditorReplace { get; protected set; }
+
         /// <summary>
         /// Gets or sets the editor select all.
         /// </summary>

diff --git a/src/IronyModManager/ViewModels/Controls/MergeViewerControlViewModel.cs b/src/IronyModManager/ViewModels/Controls/MergeViewerControlViewModel.cs
@@ -4,7 +4,7 @@
 // Created          : 03-20-2020
 //
 // Last Modified By : Mario
-// Last Modified On : 01-28-2022
+// Last Modified On : 07-22-2022
 // ***********************************************************************
 // <copyright file="MergeViewerControlViewModel.cs" company="Mario">
 //     Mario
@@ -355,6 +355,13 @@ public MergeViewerControlViewModel(IScrollState scrollState,
         [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Delete)]
         public virtual string EditorDelete { get; protected set; }
 
+        /// <summary>
+        /// Gets or sets the editor find.
+        /// </summary>
+        /// <value>The editor find.</value>
+        [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Find)]
+        public virtual string EditorFind { get; protected set; }
+
         /// <summary>
         /// Gets or sets the editor paste.
         /// </summary>
@@ -369,6 +376,13 @@ public MergeViewerControlViewModel(IScrollState scrollState,
         [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Redo)]
         public virtual string EditorRedo { get; protected set; }
 
+        /// <summary>
+        /// Gets or sets the editor replace.
+        /// </summary>
+        /// <value>The editor replace.</value>
+        [StaticLocalization(LocalizationResources.Conflict_Solver.EditorContextMenu.Replace)]
+        public virtual string EditorReplace { get; protected set; }
+
         /// <summary>
         /// Gets or sets the editor select all.
         /// </summary>