Simplified Commands

TODO 1. Simplify other commands too 2. Currently slider's undo&redo memento saving is triggered whenever it is edited - Needs to change triggering points into mouse pressed / mouse released
EX3exp · Oct 31, 2024 · 23db624 · 23db624
1 parent 43ded8e
commit 23db624
Show file tree

Hide file tree

Showing 24 changed files with 253 additions and 256 deletions.
diff --git a/Mirivoice/App.axaml.cs b/Mirivoice/App.axaml.cs
@@ -65,9 +65,10 @@ public override void OnFrameworkInitializationCompleted()
 
                 }
             }
-            mainviewModel.OnPropertyChanged((mainviewModel.Title));
+            mainWindow.Content = new MainView(mainviewModel);
             mainWindow.DataContext = mainviewModel;
-            desktop.MainWindow = mainWindow; 
+            mainviewModel.OnPropertyChanged((mainviewModel.Title));
+            desktop.MainWindow = mainWindow;
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/Mirivoice/Commands/AddLineBoxReceiver.cs → Mirivoice/Commands/AddLineBoxCommand.cs b/Mirivoice/Commands/AddLineBoxReceiver.cs → Mirivoice/Commands/AddLineBoxCommand.cs
@@ -3,21 +3,20 @@
 
 namespace Mirivoice.Commands
 {
-    public class AddLineBoxReceiver : MReceiver
+    public class AddLineBoxCommand : ICommand
     {
         private readonly MainViewModel v;
         private int LineBoxIndexLastAdded;
-        public AddLineBoxReceiver(MainViewModel mainViewModel)
+        public AddLineBoxCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
-
-            var lineBox = new LineBoxView(v); 
+            var lineBox = new LineBoxView(v);
             int LineNoToBeAdded = v.LineBoxCollection.Count + 1;
-        
+
             lineBox.viewModel.SetLineNo(LineNoToBeAdded);
             lineBox.ShouldPhonemizeWhenSelected = true;
 
@@ -26,7 +25,7 @@ public override void DoAction()
             lineBox.ScrollToEnd();
         }
 
-        public override void UndoAction()
+        public void UnExecute()
         {
             if (LineBoxIndexLastAdded < 0)
                 return;
@@ -37,5 +36,6 @@ public override void UndoAction()
         }
 
 
+
     }
 }
diff --git a/Mirivoice/Commands/AddLineBoxesReceiver.cs → Mirivoice/Commands/AddLineBoxesCommand.cs b/Mirivoice/Commands/AddLineBoxesReceiver.cs → Mirivoice/Commands/AddLineBoxesCommand.cs
@@ -10,7 +10,7 @@
 
 namespace Mirivoice.Commands
 {
-    public class AddLineBoxesReceiver : MReceiver
+    public class AddLineBoxesCommand : ICommand
     {
         private MainViewModel v;
         private int InitialEndOfLineBoxCollection;
@@ -20,23 +20,19 @@ public class AddLineBoxesReceiver : MReceiver
         int DefaultVoicerMetaOriginal;
 
 
-        public AddLineBoxesReceiver(MainViewModel mainViewModel)
+        public AddLineBoxesCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;
             InitialEndOfLineBoxCollection = v.LineBoxCollection.Count - 1; // if undo, remove all lineboxes after this index
 
             DefaultVoicerOriginal = MainManager.Instance.DefaultVoicerIndex;
             DefaultVoicerMetaOriginal = MainManager.Instance.DefaultMetaIndex;
-        }
 
-        public void SetScript(string newscript) // should be called when script is changed
-        {
-            script = newscript;
+            script = v.mTextBoxEditor.CurrentScript;
             InitialEndOfLineBoxCollection = v.LineBoxCollection.Count - 1; // if undo, remove all lineboxes after this index
-
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
             string pattern = @"\[(?<nickname>[^\]]+)\](?:\s*\((?<style>[^\)]+)\))?";
             var regex = new Regex(pattern);
@@ -72,7 +68,7 @@ public override void DoAction()
                 }
                 else
                 {
-                    
+
                     AddLineBox(line.Trim());
                     results.Add(line.Trim());
                 }
@@ -81,14 +77,21 @@ public override void DoAction()
 
             MainManager.Instance.DefaultVoicerIndex = DefaultVoicerOriginal;
             MainManager.Instance.DefaultMetaIndex = DefaultVoicerMetaOriginal;
+        }
+
+        public void SetScript(string newscript) // should be called when script is changed
+        {
+            script = newscript;
+            InitialEndOfLineBoxCollection = v.LineBoxCollection.Count - 1; // if undo, remove all lineboxes after this index
 
         }
 
-        public override void UndoAction()
+
+        public void UnExecute()
         {
             for (int i = v.LineBoxCollection.Count - 1; i > InitialEndOfLineBoxCollection; i--)
             {
-                
+
 
                 if (v.CurrentLineBox == v.LineBoxCollection[i])
                 {
@@ -104,7 +107,6 @@ public override void UndoAction()
                 v.LineBoxCollection.RemoveAt(i);
             }
         }
-
 
 
 

diff --git a/Mirivoice/Commands/DelLineBoxReceiver.cs → Mirivoice/Commands/DelLineBoxCommand.cs b/Mirivoice/Commands/DelLineBoxReceiver.cs → Mirivoice/Commands/DelLineBoxCommand.cs
@@ -7,7 +7,7 @@
 
 namespace Mirivoice.Commands
 {
-    public class DelLineBoxReceiver : MReceiver
+    public class DelLineBoxCommand : ICommand
     {
         private MainViewModel v;
         private LineBoxView l;
@@ -21,13 +21,13 @@ public class DelLineBoxReceiver : MReceiver
 
         private SingleLineEditorView lastEditor;
 
-        public DelLineBoxReceiver(MainViewModel mainViewModel, LineBoxView l)
+        public DelLineBoxCommand(MainViewModel mainViewModel, LineBoxView l)
         {
             this.l = l;
             v = mainViewModel;
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
             lastLineBox = l; // backup
             LineBoxIndexLastDeleted = Int32.Parse(l.viewModel.LineNo) - 1;
@@ -36,7 +36,7 @@ public override void DoAction()
             RefreshLineNos(control);
 
 
-            
+
 
             v.LineBoxCollection.RemoveAt(RemoveIndex);
 
@@ -46,8 +46,8 @@ public override void DoAction()
                 v.CurrentSingleLineEditor = null;
                 lastResults = new ObservableCollection<MResult>(l.MResultsCollection);
                 v.MResultsCollection.Clear();
-                
-               if (v.CurrentEditIndex == 1)
+
+                if (v.CurrentEditIndex == 1)
                 {
                     v.CurrentEdit = null;
                     v.OnPropertyChanged(nameof(v.CurrentEdit));
@@ -56,12 +56,10 @@ public override void DoAction()
 
             RefreshLineNos(control);
             v.OnPropertyChanged(nameof(v.CurrentSingleLineEditor));
-
         }
 
-        public override void UndoAction()
+        public void UnExecute()
         {
-
             v.LineBoxCollection.Insert(LineBoxIndexLastDeleted, lastLineBox);
             RefreshLineNos(control);
             if (lastEditor != null)
@@ -79,6 +77,7 @@ public override void UndoAction()
 
             }
         }
+
 
         void RefreshLineNos(ItemsControl i)
         {

diff --git a/...oice/Commands/DuplicateLineBoxReceiver.cs → ...voice/Commands/DuplicateLineBoxCommand.cs b/...oice/Commands/DuplicateLineBoxReceiver.cs → ...voice/Commands/DuplicateLineBoxCommand.cs
@@ -6,16 +6,16 @@
 
 namespace Mirivoice.Commands
 {
-    public class DuplicateLineBoxReceiver : MReceiver
+    public class DuplicateLineBoxCommand : ICommand
     {
         private LineBoxView l;
         private int LineBoxIndexLastAdded;
-        public DuplicateLineBoxReceiver(LineBoxView l)
+        public DuplicateLineBoxCommand(LineBoxView l)
         {
             this.l = l;
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
             MLinePrototype mLinePrototype = new MLinePrototype(l);
             int LineNoToBeAdded = Int32.Parse(l.viewModel.LineNo);
@@ -31,16 +31,15 @@ public override void DoAction()
                 metaIndex++;
             }
             var lineBox = new LineBoxView(mLinePrototype, l.v, LineNoToBeAdded + 1, l.viewModel.voicerSelector.CurrentDefaultVoicerIndex, metaIndex, true);
-            
+
 
             l.v.LineBoxCollection.Insert(LineNoToBeAdded, lineBox);
             LineBoxIndexLastAdded = LineNoToBeAdded;
 
             RefreshLineNos();
 
         }
-
-        public override void UndoAction()
+        public void UnExecute()
         {
             if (LineBoxIndexLastAdded < 0)
                 return;

diff --git a/Mirivoice/Commands/LockLineBoxCommand.cs b/Mirivoice/Commands/LockLineBoxCommand.cs
@@ -0,0 +1,30 @@
+using Mirivoice.Views;
+using System;
+
+namespace Mirivoice.Commands
+{
+    [Obsolete("[still working class]")]
+    public class LockLineBoxCommand : ICommand
+    {
+        // Still implementing 
+        LineBoxView l;
+
+        public LockLineBoxCommand(LineBoxView lineBoxView)
+        {
+            l = lineBoxView;
+        }
+
+
+        public void Execute(bool isRedoing)
+        {
+            l.UnLock(false);
+        }
+
+        public void UnExecute()
+        {
+            l.UnLock(true);
+        }
+
+
+    }
+}
diff --git a/Mirivoice/Commands/LockLineBoxReceiver.cs b/Mirivoice/Commands/LockLineBoxReceiver.cs
diff --git a/Mirivoice/Commands/MCommand.cs b/Mirivoice/Commands/MCommand.cs
@@ -1,5 +1,8 @@
-namespace Mirivoice.Commands
+using System;
+
+namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand instead")]
     public class MCommand : ICommand
     {
         private readonly MReceiver _receiver;

diff --git a/Mirivoice/Commands/MOriginator.cs b/Mirivoice/Commands/MOriginator.cs
@@ -3,6 +3,7 @@
 
 namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand instead")]
     public class MOriginator<T>
     {
         protected T obj;

diff --git a/Mirivoice/Commands/MReceiver.cs b/Mirivoice/Commands/MReceiver.cs
@@ -3,6 +3,7 @@
 
 namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand instead")]
     public abstract class MReceiver
     {
         protected readonly List<object> _data = new List<object>();

diff --git a/Mirivoice/Commands/Memento.cs b/Mirivoice/Commands/Memento.cs
@@ -27,6 +27,8 @@ public T Pop()
             return states.Pop();
         }
 
+        public bool CanPop => states.Count > 0;
+
         public int Count => states.Count;
         public override string ToString()
         {

diff --git a/Mirivoice/Commands/MementoCommand.cs b/Mirivoice/Commands/MementoCommand.cs
@@ -1,7 +1,9 @@
 using Serilog;
+using System;
 
 namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand with Memento instead")]
     public class MementoCommand<T> : ICommand
     {
         // Handles undo/redo in combobox, textbox, etc.

diff --git a/Mirivoice/Commands/SetComboboxOriginator.cs b/Mirivoice/Commands/SetComboboxOriginator.cs