Added style icon

Mirivoice/Commands/MementoCommand.cs

@@ -24,7 +24,7 @@ public void Execute(bool isRedoing)
             if (!isRedoing)
             {
                 _originator.ClearRedoMemento();
-                _originator.PrintMemento();
+                //_originator.PrintMemento();
 
                 //Log.Debug($"-- exec");
             }
@@ -37,7 +37,7 @@ public void Execute(bool isRedoing)
                 }
                 //Log.Debug($"-- Redoing");
                 _originator.RestoreFromRedoMemento();
-                _originator.PrintMemento();
+                //_originator.PrintMemento();
             }
         }
 

Mirivoice/Commands/SetComboboxOriginator.cs

@@ -1,7 +1,4 @@
 using Mirivoice.Mirivoice.Core.Format;
-using Mirivoice.ViewModels;
-using Serilog;
-using System;
 
 namespace Mirivoice.Commands
 {
@@ -20,7 +17,7 @@ public SetProsodyOriginator(ref int index, MResult v) : base(ref index)
 
         public override void UpdateProperties()
         {
-            Log.Debug("[Updating Properties] -- {obj}", obj);
+            //Log.Debug("[Updating Properties] -- {obj}", obj);
             v.NotProcessingSetProsodyCommand = true; // prevent recursion loop
             v.Prosody = obj;
         }

Mirivoice/Commands/VITS2SetExpOriginator.cs

@@ -1,8 +1,4 @@
-using Mirivoice.Engines;
-using Mirivoice.Mirivoice.Core.Format;
-using Mirivoice.ViewModels;
-using Serilog;
-using System;
+using Mirivoice.ViewModels;
 
 namespace Mirivoice.Commands
 {
@@ -29,7 +25,7 @@ public VITS2SetExpOriginator(ref int index, ExpressionEditViewModelVITS2 v, ExpV
 
         public override void UpdateProperties()
         {
-            Log.Debug("[Updating Properties] -- {obj}", obj);
+            //Log.Debug("[Updating Properties] -- {obj}", obj);
             switch (type)
             {
                 case ExpVITS2.Speed:

Mirivoice/Engines/VoicerMeta.cs

@@ -24,10 +24,10 @@ public partial class VoicerMeta
         public string Phrase { get; set; } = "";
         public string Description { get; set; } = "";
 
-
+        public string StyleIcon { get; set; } = "";
+
 
 
-
 
         public VoicerMeta()
         {

Mirivoice/Mirivoice.Core/Editor/VoicerSelector.cs

@@ -33,16 +33,18 @@ public Voicer CurrentVoicer
                 {
                     this.RaiseAndSetIfChanged(ref _currentVoicer, value);
                     _currentVoicer.RefreshNickAndStyle();
+                    v.OnStyleChanged();
                     OnPropertyChanged(nameof(CurrentVoicer));
                     v._currentDefaultVoicerIndex = Voicers.IndexOf(value);
                     OnPropertyChanged(nameof(CurrentDefaultVoicerIndex));
-
+                    
                 }
 
             }
         }
 
 
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         protected virtual void OnPropertyChanged(string propertyName)
@@ -119,6 +121,7 @@ public void UpdateVoicerCollection()
                     }
                     updatedVoicer.CurrentVoicerMeta = updatedVoicer.VoicerMetaCollection[metaIndex];
                     updatedVoicer.RefreshNickAndStyle();
+
 
                     voicersToUpdate.Add(new VoicerUpdate(updatedVoicer, updatedVoicerIndex));
 
@@ -223,6 +226,9 @@ public int CurrentDefaultVoicerIndex
                 this.RaiseAndSetIfChanged(ref _currentDefaultVoicerIndex, value);
                 _currentVoicer = Voicers[_currentDefaultVoicerIndex];
                 _currentVoicer.RefreshNickAndStyle();
+                v.OnStyleChanged();
+
+
 
                 v.OnVoicerChanged(_currentVoicer);
                 OnPropertyChanged(nameof(CurrentVoicer));

Mirivoice/Mirivoice.Core/Format/MResult.cs

@@ -50,6 +50,7 @@ public class MResult : VoicerSelectingViewModelBase
         int lastProsodyIndex;
         public override MTextBoxEditor mTextBoxEditor { get; set; }
 
+        public override void OnStyleChanged() { }
         private ImageBrush _bosIcon;
         public ImageBrush BosIcon
         {

Mirivoice/Mirivoice.Core/Format/Voicer.cs

@@ -1,6 +1,7 @@
 using Mirivoice.Commands;
 using Mirivoice.Engines;
 using Mirivoice.Engines.TTS;
+using Mirivoice.ViewModels;
 using Mirivoice.Views;
 using ReactiveUI;
 using Serilog;
@@ -51,6 +52,7 @@ public class Voicer : ReactiveObject, INotifyPropertyChanged
 
         private VoicerMeta _currentVoicerMeta;
         private VoicerMeta lastVoicerMeta;
+        private LineBoxViewModel lv;
 
         private bool Undobackuped = false;
 
@@ -67,6 +69,14 @@ public void SetRootPath(string rootPath)
             Engine.Init(this);
         }
 
+        public void SetLineBoxViewModel(LineBoxViewModel lv)
+        {
+            this.lv = lv;
+            if (lv is not null)
+            {
+                lv.OnStyleChanged();
+            }
+        }
         public void Inference(string ipaText, string cacheFilePath, LineBoxView l)
         {
             //Log.Debug("[Infer Started] --- ipaText");
@@ -129,6 +139,11 @@ public VoicerMeta CurrentVoicerMeta
                     }
                     this.RaiseAndSetIfChanged(ref _currentVoicerMeta, value);
                     this.RefreshNickAndStyle();
+
+                    if (lv is not null)
+                    {
+                        lv.OnStyleChanged();
+                    }
                     OnPropertyChanged(nameof(NickAndStyle));
                     OnPropertyChanged(nameof(CurrentVoicerMeta));
 

Mirivoice/Mirivoice.Core/Managers/AudioManager.cs

@@ -390,7 +390,11 @@ private void OnPlaybackStopped(object? sender, EventArgs e)
                 if (audioPaths.Count == 0) // when stopped
                 {
                     v.isPlaying = false;
-                    v.EnableGlobalPlay = true;
+                    if (!_player.Paused)
+                    {
+                        v.EnableGlobalPlay = true;
+                    }
+
                     v.EnablePreviewPlay = true;
                     if (!MainViewModelPlaying)
                     {

Mirivoice/Mirivoice.Core/Managers/CommandManager.cs

@@ -56,7 +56,7 @@ void ClearStacks()
         }
         public void ExecuteCommand(ICommand command)
         {
-            Log.Debug("======== ExecuteCommand ========");
+            //Log.Debug("======== ExecuteCommand ========");
             command.Execute(false);
             _undoStack.Push(command);
             _redoStack.Clear();
@@ -71,7 +71,7 @@ public void ExecuteCommand(ICommand command)
         StreamWriter writer = new StreamWriter("filePath", false, Encoding.UTF8);
         public void Undo()
         {
-            Log.Debug("======== Undo ========");
+            //Log.Debug("======== Undo ========");
             if (_undoStack.Count > 0)
             {
                 var command = _undoStack.Pop();
@@ -89,7 +89,7 @@ public void Undo()
 
         public void Redo()
         {
-            Log.Debug("======== Redo ========");
+            //Log.Debug("======== Redo ========");
             if (_redoStack.Count > 0)
             {
                 var command = _redoStack.Pop();

Mirivoice/ViewModels/LineBoxViewModel.cs

@@ -32,7 +32,7 @@ public string LineNo
             }
         }
 
-        private string _langCode;  
+        private string _langCode;
         public string LangCode
         {
             get => _langCode;
@@ -91,7 +91,7 @@ public string LineText
             {
                 this.RaiseAndSetIfChanged(ref _lineText, value);
                 OnPropertyChanged(nameof(LineText));
-                
+
             }
         }
 
@@ -134,7 +134,7 @@ public ImageBrush Icon
         {
             get => _icon;
 
-            set 
+            set
             {
                 this.RaiseAndSetIfChanged(ref _icon, value);
                 OnPropertyChanged(nameof(Icon));
@@ -147,14 +147,16 @@ public override void OnVoicerChanged(Voicer voicer)
         {
             //Log.Debug($"OnVoicerChanged: {voicer.NickAndStyle}");
             VoicerInfo vInfo = voicer.Info;
+            voicer.SetLineBoxViewModel(this);
+
 
             if (phonemizer is null)
             {
                 phonemizer = GetPhonemizer(voicerSelector.CurrentVoicer.Info.LangCode);
             }
             if (lastType is not null && lastType != voicer.Info.Type)
             {
-                Log.Debug("Type Changed: {0}", voicer.Info.Type);
+                //Log.Debug("Type Changed: {0}", voicer.Info.Type);
                 l.ResetExpEditor(voicer.Info.Type);
             }
 
@@ -164,18 +166,52 @@ public override void OnVoicerChanged(Voicer voicer)
             VoicerType = voicer.Info.Type;
             if (vInfo.Icon != null && vInfo.Icon != string.Empty)
             {
-                string voicerIconPath = Path.Combine(voicer.RootPath,
-                vInfo.Icon.Replace('/', Path.DirectorySeparatorChar));
-                if (!File.Exists(voicerIconPath))
+                string voicerIconPath = null;
+                if (voicer.CurrentVoicerMeta.StyleIcon is not null)
                 {
-                    return;
+                    voicerIconPath = Path.Combine(voicer.RootPath,
+                    voicer.CurrentVoicerMeta.StyleIcon.Replace('/', Path.DirectorySeparatorChar));
+                    // try to get icon from style
+                    if (voicerIconPath is not null && !File.Exists(voicerIconPath))
+                    {
+                        voicerIconPath = Path.Combine(voicer.RootPath,
+                        vInfo.Icon.Replace('/', Path.DirectorySeparatorChar));
+                    }
+                }
+                else
+                {
+                    voicerIconPath = Path.Combine(voicerSelector.CurrentVoicer.RootPath,
+                        vInfo.Icon.Replace('/', Path.DirectorySeparatorChar));
                 }
+
 
-                Icon
+                // try to get icon from voicer
+                if (voicerIconPath is not null &&  !File.Exists(voicerIconPath))
+                {
+                    return;
+                }
+                if (voicerIconPath is not null)
+                {
+                    Icon
                 = new ImageBrush(new Bitmap(voicerIconPath))
                 {
                     Stretch = Stretch.UniformToFill,
                 };
+                }
+                else
+                {
+                    var uri = new Uri("avares://Mirivoice.Main/Assets/default_icon.bmp");
+                    var assets = AssetLoader.Open(uri);
+
+                    using (var stream = assets)
+                    {
+                        var bitmap = new Bitmap(stream);
+                        Icon = new ImageBrush(bitmap)
+                        {
+                            Stretch = Stretch.UniformToFill
+                        };
+                    }
+                }
 
             }
             else
@@ -193,7 +229,77 @@ public override void OnVoicerChanged(Voicer voicer)
                 }
             }
         }
+        public override void OnStyleChanged()
+        {
+            Log.Information("OnStyleChanged");
+            VoicerInfo vInfo = voicerSelector.CurrentVoicer.Info;
+            if (vInfo.Icon != null && vInfo.Icon != string.Empty)
+            {
+                string voicerIconPath = null;
+                if (voicerSelector.CurrentVoicer.CurrentVoicerMeta.StyleIcon is not null)
+                {
+                    voicerIconPath = Path.Combine(voicerSelector.CurrentVoicer.RootPath,
+                    voicerSelector.CurrentVoicer.CurrentVoicerMeta.StyleIcon.Replace('/', Path.DirectorySeparatorChar));
+                    // try to get icon from style
+                    if (voicerIconPath is not null && !File.Exists(voicerIconPath))
+                    {
+                        voicerIconPath = Path.Combine(voicerSelector.CurrentVoicer.RootPath,
+                        vInfo.Icon.Replace('/', Path.DirectorySeparatorChar));
+                    }
+                }
+                else
+                {
+                    voicerIconPath = Path.Combine(voicerSelector.CurrentVoicer.RootPath,
+                        vInfo.Icon.Replace('/', Path.DirectorySeparatorChar));
+                }
+
+
+                // try to get icon from voicer
+                if (voicerIconPath is not null && !File.Exists(voicerIconPath))
+                {
+                    return;
+                }
+                if (voicerIconPath is not null)
+                {
+                    Icon
+                = new ImageBrush(new Bitmap(voicerIconPath))
+                {
+                    Stretch = Stretch.UniformToFill,
+                };
+                }
+                else
+                {
+                    var uri = new Uri("avares://Mirivoice.Main/Assets/default_icon.bmp");
+                    var assets = AssetLoader.Open(uri);
+
+                    using (var stream = assets)
+                    {
+                        var bitmap = new Bitmap(stream);
+                        Icon = new ImageBrush(bitmap)
+                        {
+                            Stretch = Stretch.UniformToFill
+                        };
+                    }
+                }
+
+                OnPropertyChanged(nameof(Icon));
+            }
+            else
+            {
+                var uri = new Uri("avares://Mirivoice.Main/Assets/default_icon.bmp");
+                var assets = AssetLoader.Open(uri);
 
+                using (var stream = assets)
+                {
+                    var bitmap = new Bitmap(stream);
+                    Icon = new ImageBrush(bitmap)
+                    {
+                        Stretch = Stretch.UniformToFill
+                    };
+                }
+                OnPropertyChanged(nameof(Icon));
+            }
+        }
         bool cultureChangedFirst = false;
         public override void OnVoicerCultureChanged(CultureInfo culture)
         {