diff --git a/Mirivoice.Desktop/Program.cs b/Mirivoice.Desktop/Program.cs index 431094b..6618656 100644 --- a/Mirivoice.Desktop/Program.cs +++ b/Mirivoice.Desktop/Program.cs @@ -1,6 +1,5 @@ using Avalonia; using Avalonia.ReactiveUI; -using Microsoft.Extensions.Logging; using Mirivoice.Mirivoice.Core; using Serilog; using System; diff --git a/Mirivoice/App.axaml.cs b/Mirivoice/App.axaml.cs index c42971f..a018807 100644 --- a/Mirivoice/App.axaml.cs +++ b/Mirivoice/App.axaml.cs @@ -1,21 +1,19 @@ -using System; -using System.Diagnostics; -using Avalonia; +using Avalonia; +using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; - +using Avalonia.Styling; +using Mirivoice.Mirivoice.Core; using Mirivoice.ViewModels; using Mirivoice.Views; -using Mirivoice.Mirivoice.Core; using Serilog; -using System.IO; -using System.Threading.Tasks; -using System.Globalization; -using Avalonia.Controls; -using Avalonia.Styling; +using System; using System.Collections.Generic; +using System.Globalization; +using System.IO; using System.Linq; using System.Threading; +using System.Threading.Tasks; namespace Mirivoice; diff --git a/Mirivoice/Commands/AddLineBoxReceiver.cs b/Mirivoice/Commands/AddLineBoxReceiver.cs index 32a19d8..90fc22b 100644 --- a/Mirivoice/Commands/AddLineBoxReceiver.cs +++ b/Mirivoice/Commands/AddLineBoxReceiver.cs @@ -1,5 +1,4 @@ -using Avalonia.Controls; -using Mirivoice.ViewModels; +using Mirivoice.ViewModels; using Mirivoice.Views; namespace Mirivoice.Commands diff --git a/Mirivoice/Commands/AddLineBoxesReceiver.cs b/Mirivoice/Commands/AddLineBoxesReceiver.cs index c9568c6..65676db 100644 --- a/Mirivoice/Commands/AddLineBoxesReceiver.cs +++ b/Mirivoice/Commands/AddLineBoxesReceiver.cs @@ -1,5 +1,4 @@ -using Avalonia.Controls; -using Mirivoice.Mirivoice.Core; +using Mirivoice.Mirivoice.Core; using Mirivoice.Mirivoice.Core.Format; using Mirivoice.ViewModels; using Mirivoice.Views; diff --git a/Mirivoice/Commands/DelLineBoxReceiver.cs b/Mirivoice/Commands/DelLineBoxReceiver.cs index f93fad9..bbe8b8d 100644 --- a/Mirivoice/Commands/DelLineBoxReceiver.cs +++ b/Mirivoice/Commands/DelLineBoxReceiver.cs @@ -4,7 +4,6 @@ using Mirivoice.Views; using System; using System.Collections.ObjectModel; -using System.Linq; namespace Mirivoice.Commands { diff --git a/Mirivoice/Commands/DuplicateLineBoxReceiver.cs b/Mirivoice/Commands/DuplicateLineBoxReceiver.cs index 0dc017d..04d4e43 100644 --- a/Mirivoice/Commands/DuplicateLineBoxReceiver.cs +++ b/Mirivoice/Commands/DuplicateLineBoxReceiver.cs @@ -1,6 +1,4 @@ -using Avalonia.Controls; -using Mirivoice.ViewModels; -using Mirivoice.Views; +using Mirivoice.Views; using System; namespace Mirivoice.Commands diff --git a/Mirivoice/Commands/LockLineBoxReceiver.cs b/Mirivoice/Commands/LockLineBoxReceiver.cs index 62d0135..e9f7435 100644 --- a/Mirivoice/Commands/LockLineBoxReceiver.cs +++ b/Mirivoice/Commands/LockLineBoxReceiver.cs @@ -1,13 +1,4 @@ -using Avalonia.Controls; -using Mirivoice.Mirivoice.Core; -using Mirivoice.Mirivoice.Core.Format; -using Mirivoice.ViewModels; -using Mirivoice.Views; -using Serilog; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.RegularExpressions; +using Mirivoice.Views; namespace Mirivoice.Commands { diff --git a/Mirivoice/Engines/ConfigVITS2.cs b/Mirivoice/Engines/ConfigVITS2.cs index 9da24cc..0b3886a 100644 --- a/Mirivoice/Engines/ConfigVITS2.cs +++ b/Mirivoice/Engines/ConfigVITS2.cs @@ -1,10 +1,7 @@ -using Microsoft.Extensions.Primitives; -using Serilog; -using System; +using System.Collections.Generic; +using System.Linq; using System.Text; using VYaml.Annotations; -using System.Collections.Generic; -using System.Linq; namespace Mirivoice.Engines { diff --git a/Mirivoice/Engines/TTS/BaseEngine.cs b/Mirivoice/Engines/TTS/BaseEngine.cs index 976500c..d96a91b 100644 --- a/Mirivoice/Engines/TTS/BaseEngine.cs +++ b/Mirivoice/Engines/TTS/BaseEngine.cs @@ -1,11 +1,6 @@ -using NAudio.Wave; -using System; -using System.Collections.Generic; +using Mirivoice.Mirivoice.Core.Format; +using NAudio.Wave; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Mirivoice.Mirivoice.Core.Format; namespace Mirivoice.Engines.TTS { diff --git a/Mirivoice/Engines/TTS/EngineVITS2.cs b/Mirivoice/Engines/TTS/EngineVITS2.cs index 73df558..ffc6a73 100644 --- a/Mirivoice/Engines/TTS/EngineVITS2.cs +++ b/Mirivoice/Engines/TTS/EngineVITS2.cs @@ -2,18 +2,13 @@ using Microsoft.ML.OnnxRuntime; using Microsoft.ML.OnnxRuntime.Tensors; using Mirivoice.Engines; -using Mirivoice.Mirivoice.Core; -using NAudio.Wave; +using Mirivoice.Engines.TTS; +using Mirivoice.Mirivoice.Core.Format; using Serilog; using System.Collections.Generic; using System.IO; using System.Linq; -using VYaml.Annotations; using VYaml.Serialization; -using Mirivoice.Engines.TTS; -using Mirivoice.Mirivoice.Core.Format; -using System; -using System.Threading.Tasks; public class EngineVITS2 : BaseEngine { diff --git a/Mirivoice/Engines/VoicerMeta.cs b/Mirivoice/Engines/VoicerMeta.cs index a2f809a..50c94f1 100644 --- a/Mirivoice/Engines/VoicerMeta.cs +++ b/Mirivoice/Engines/VoicerMeta.cs @@ -1,6 +1,5 @@ -using Mirivoice.Engines.TTS; +using System.ComponentModel; using VYaml.Annotations; -using System.ComponentModel; namespace Mirivoice.Engines { public enum VoicerMetaType diff --git a/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs b/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs index 33a3605..352b28e 100644 --- a/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs +++ b/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs @@ -3,11 +3,10 @@ using ReactiveUI; using Serilog; using System.ComponentModel; -using VYaml.Annotations; namespace Mirivoice.Mirivoice.Core.Editor { - + public partial class MTextBoxEditor : ReactiveObject, INotifyPropertyChanged { string _currentScript; diff --git a/Mirivoice/Mirivoice.Core/Editor/VoicerSelector.cs b/Mirivoice/Mirivoice.Core/Editor/VoicerSelector.cs index 97fcab3..f188081 100644 --- a/Mirivoice/Mirivoice.Core/Editor/VoicerSelector.cs +++ b/Mirivoice/Mirivoice.Core/Editor/VoicerSelector.cs @@ -8,7 +8,6 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Globalization; -using System.Linq; namespace Mirivoice.Mirivoice.Core.Editor { diff --git a/Mirivoice/Mirivoice.Core/Format/Mrp.cs b/Mirivoice/Mirivoice.Core/Format/Mrp.cs index db4eb3c..afe90db 100644 --- a/Mirivoice/Mirivoice.Core/Format/Mrp.cs +++ b/Mirivoice/Mirivoice.Core/Format/Mrp.cs @@ -1,22 +1,15 @@ -using Mirivoice.Engines; +using Avalonia.Threading; +using Mirivoice.ViewModels; using Mirivoice.Views; +using R3; using Serilog; using System; -using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; using System.Linq; -using System.Linq.Expressions; -using System.Text; using System.Threading.Tasks; using VYaml.Annotations; using VYaml.Serialization; -using System.IO; -using Mirivoice.ViewModels; -using ReactiveUI; -using System.Collections.ObjectModel; -using R3; -using DynamicData; -using Avalonia.Threading; -using NAudio.Utils; namespace Mirivoice.Mirivoice.Core.Format { diff --git a/Mirivoice/Mirivoice.Core/Format/RecentFIles.cs b/Mirivoice/Mirivoice.Core/Format/RecentFIles.cs index a85fbd3..b1f2037 100644 --- a/Mirivoice/Mirivoice.Core/Format/RecentFIles.cs +++ b/Mirivoice/Mirivoice.Core/Format/RecentFIles.cs @@ -1,23 +1,18 @@ -using System; +using Avalonia.Controls; +using Mirivoice.ViewModels; +using R3; +using ReactiveUI; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.ObjectModel; using System.IO; +using System.Linq; using VYaml.Annotations; using VYaml.Serialization; -using System.Collections.ObjectModel; -using System.Windows.Input; -using Mirivoice.ViewModels; -using R3; -using ReactiveUI; -using Mirivoice.Mirivoice.Core.Format; -using Avalonia.Controls; namespace Mirivoice.Mirivoice.Core.Managers { - - [YamlObject] + + [YamlObject] public partial class RecentFiles { public List Files { get; set; } = new List(); diff --git a/Mirivoice/Mirivoice.Core/Format/UserSetting.cs b/Mirivoice/Mirivoice.Core/Format/UserSetting.cs index 256d83d..98d491c 100644 --- a/Mirivoice/Mirivoice.Core/Format/UserSetting.cs +++ b/Mirivoice/Mirivoice.Core/Format/UserSetting.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.IO; using VYaml.Annotations; using VYaml.Serialization; -using System.IO; namespace Mirivoice.Mirivoice.Core.Format { diff --git a/Mirivoice/Mirivoice.Core/Format/Voicer.cs b/Mirivoice/Mirivoice.Core/Format/Voicer.cs index df4760c..e2c64f3 100644 --- a/Mirivoice/Mirivoice.Core/Format/Voicer.cs +++ b/Mirivoice/Mirivoice.Core/Format/Voicer.cs @@ -1,5 +1,4 @@ -using Avalonia.Styling; -using Mirivoice.Commands; +using Mirivoice.Commands; using Mirivoice.Engines; using Mirivoice.Engines.TTS; using Mirivoice.Views; @@ -10,7 +9,6 @@ using System.ComponentModel; using System.Text; using VYaml.Annotations; -using System.Threading.Tasks; namespace Mirivoice.Mirivoice.Core.Format { diff --git a/Mirivoice/Mirivoice.Core/Managers/MainManager.cs b/Mirivoice/Mirivoice.Core/Managers/MainManager.cs index 489b16a..c9d0110 100644 --- a/Mirivoice/Mirivoice.Core/Managers/MainManager.cs +++ b/Mirivoice/Mirivoice.Core/Managers/MainManager.cs @@ -3,11 +3,9 @@ using Mirivoice.Mirivoice.Core.Utils; using Serilog; using System.Collections.ObjectModel; -using System.Threading.Tasks; using System.IO; -using VYaml.Annotations; +using System.Threading.Tasks; using VYaml.Serialization; -using Mirivoice.Views; namespace Mirivoice.Mirivoice.Core { diff --git a/Mirivoice/Mirivoice.Core/Managers/VoicerManager.cs b/Mirivoice/Mirivoice.Core/Managers/VoicerManager.cs index 403c5fe..14993d1 100644 --- a/Mirivoice/Mirivoice.Core/Managers/VoicerManager.cs +++ b/Mirivoice/Mirivoice.Core/Managers/VoicerManager.cs @@ -3,7 +3,6 @@ using Serilog; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.IO; using System.Linq; using VYaml.Serialization; diff --git a/Mirivoice/Mirivoice.Core/Utils/MemoryLogger.cs b/Mirivoice/Mirivoice.Core/Utils/MemoryLogger.cs deleted file mode 100644 index 484a146..0000000 --- a/Mirivoice/Mirivoice.Core/Utils/MemoryLogger.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Mirivoice.Mirivoice.Core.Utils -{ - public class LogUpdatedEventArgs : EventArgs - { - public string Text { get; set; } - } - - public class MemoryLogger : ILogger - { - public event EventHandler LogUpdated; - private readonly StringBuilder _sb = new StringBuilder(); - - public IDisposable BeginScope(TState state) - { - return null; - } - - public bool IsEnabled(LogLevel logLevel) - { - return true; - } - - public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) - { - lock (_sb) - { - var message = formatter(state, exception); - if (exception != null) message += "\n" + exception.ToString(); - Console.WriteLine("log: " + message); - _sb.AppendLine(message); - LogUpdated?.Invoke(this, new LogUpdatedEventArgs { Text = _sb.ToString() }); - } - } - - public override string ToString() - { - lock (_sb) - { - return _sb.ToString(); - } - } - } -} diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/EnglishUSIPAConverter.cs b/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/EnglishUSIPAConverter.cs index 064eda6..2ce146d 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/EnglishUSIPAConverter.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/EnglishUSIPAConverter.cs @@ -1,12 +1,5 @@ -using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers.Utils; -using Serilog; -using System.Collections.Generic; -using System.Linq; +using Serilog; using System; -using System.IO; -using System.Text; -using System.Reflection; -using System.Text.RegularExpressions; using System.Collections.Generic; namespace Mirivoice.Mirivoice.Plugins.Builtin.IPAConverters diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/KoreanIPAConverter.cs b/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/KoreanIPAConverter.cs index b3dd062..ce87f70 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/KoreanIPAConverter.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/IPAConverters/KoreanIPAConverter.cs @@ -1,7 +1,5 @@ using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers.Utils; -using Serilog; using System.Collections.Generic; -using System.Linq; namespace Mirivoice.Mirivoice.Plugins.Builtin.IPAConverters { diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs index fa7cb8c..f53acc1 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/EnglishUSPhonemizer.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/EnglishUSPhonemizer.cs index 203a413..8d1965f 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/EnglishUSPhonemizer.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/EnglishUSPhonemizer.cs @@ -1,7 +1,5 @@ using Mirivoice.Mirivoice.Plugins.Builtin.IPAConverters; using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers.Utils; -using Serilog; -using System; using System.Collections.Generic; using System.Text; diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/CmuDict.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/CmuDict.cs index 02f4dab..108e94d 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/CmuDict.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/CmuDict.cs @@ -3,9 +3,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers.Utils { diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/EnglishUSPhonemizerUtil.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/EnglishUSPhonemizerUtil.cs index 96e3616..eaadbdd 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/EnglishUSPhonemizerUtil.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/EnglishUSPhonemizerUtil.cs @@ -1,13 +1,4 @@ -using Avalonia.Media; -using Avalonia.Platform; -using Serilog; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Serilog; namespace Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers.Utils { diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/KoreanPhonemizerUtil.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/KoreanPhonemizerUtil.cs index 02b87bd..3cf9ab7 100644 --- a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/KoreanPhonemizerUtil.cs +++ b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/Utils/KoreanPhonemizerUtil.cs @@ -1,7 +1,5 @@ -using Serilog; -using System; +using System; using System.Collections; -using System.Diagnostics; namespace Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers.Utils { diff --git a/Mirivoice/ViewModels/AppUpdaterViewModel.cs b/Mirivoice/ViewModels/AppUpdaterViewModel.cs index 6fc0b53..0f5fc44 100644 --- a/Mirivoice/ViewModels/AppUpdaterViewModel.cs +++ b/Mirivoice/ViewModels/AppUpdaterViewModel.cs @@ -1,25 +1,21 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using Avalonia.Controls; using Avalonia.Media; -using Mirivoice.Mirivoice.Core.Managers; +using Mirivoice.Mirivoice.Core; using Mirivoice.Mirivoice.Core.Utils; -using Mirivoice.ViewModels; using NetSparkleUpdater; using NetSparkleUpdater.AppCastHandlers; using NetSparkleUpdater.Enums; using NetSparkleUpdater.Interfaces; -using NetSparkleUpdater.Properties; using NetSparkleUpdater.SignatureVerifiers; using Newtonsoft.Json; -using Serilog; using ReactiveUI; -using Mirivoice.Mirivoice.Core; -using Mirivoice.Views; -using Avalonia.Controls; +using Serilog; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; namespace Mirivoice.ViewModels { diff --git a/Mirivoice/ViewModels/GlobalSettingWindowViewModel.cs b/Mirivoice/ViewModels/GlobalSettingWindowViewModel.cs index ffbce17..0843fdc 100644 --- a/Mirivoice/ViewModels/GlobalSettingWindowViewModel.cs +++ b/Mirivoice/ViewModels/GlobalSettingWindowViewModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Mirivoice.Mirivoice.Core; +using Mirivoice.Mirivoice.Core; using ReactiveUI; namespace Mirivoice.ViewModels diff --git a/Mirivoice/ViewModels/LineBoxViewModel.cs b/Mirivoice/ViewModels/LineBoxViewModel.cs index 43ffb71..fdb3a75 100644 --- a/Mirivoice/ViewModels/LineBoxViewModel.cs +++ b/Mirivoice/ViewModels/LineBoxViewModel.cs @@ -1,19 +1,17 @@ using Avalonia; using Avalonia.Media; using Avalonia.Media.Imaging; +using Avalonia.Platform; using Mirivoice.Mirivoice.Core; using Mirivoice.Mirivoice.Core.Editor; -using System.Runtime.CompilerServices; -using System.IO; using Mirivoice.Mirivoice.Core.Format; using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers; +using Mirivoice.Views; +using ReactiveUI; using Serilog; -using System.Globalization; using System; -using Avalonia.Platform; -using ReactiveUI; -using Mirivoice.Views; -using Avalonia.Controls.Documents; +using System.Globalization; +using System.IO; namespace Mirivoice.ViewModels diff --git a/Mirivoice/ViewModels/MainViewModel.cs b/Mirivoice/ViewModels/MainViewModel.cs index 0f77413..840e096 100644 --- a/Mirivoice/ViewModels/MainViewModel.cs +++ b/Mirivoice/ViewModels/MainViewModel.cs @@ -1,28 +1,25 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml.Styling; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Platform.Storage; using global::Mirivoice.Views; using Mirivoice.Commands; using Mirivoice.Mirivoice.Core; using Mirivoice.Mirivoice.Core.Editor; using Mirivoice.Mirivoice.Core.Format; +using Mirivoice.Mirivoice.Core.Managers; +using Mirivoice.Mirivoice.Core.Utils; using ReactiveUI; -using System.Collections.Generic; using Serilog; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Globalization; +using System.IO; using System.Linq; +using System.Text; using System.Threading.Tasks; -using Mirivoice.Mirivoice.Core.Managers; -using System.IO; -using Avalonia.Platform.Storage; -using Avalonia; -using Mirivoice.Mirivoice.Core.Utils; -using Avalonia.Controls.Shapes; using VYaml.Serialization; -using System.Text; -using Avalonia.Interactivity; -using Avalonia.Controls.ApplicationLifetimes; -using System.Globalization; namespace Mirivoice.ViewModels { public class MainViewModel : VoicerSelectingViewModelBase diff --git a/Mirivoice/ViewModels/MessageWindowViewModel.cs b/Mirivoice/ViewModels/MessageWindowViewModel.cs index 07be645..4b65747 100644 --- a/Mirivoice/ViewModels/MessageWindowViewModel.cs +++ b/Mirivoice/ViewModels/MessageWindowViewModel.cs @@ -1,9 +1,4 @@ using ReactiveUI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Mirivoice.ViewModels { diff --git a/Mirivoice/ViewModels/SingleLineEditorViewModel.cs b/Mirivoice/ViewModels/SingleLineEditorViewModel.cs index 69e6ae0..91b4705 100644 --- a/Mirivoice/ViewModels/SingleLineEditorViewModel.cs +++ b/Mirivoice/ViewModels/SingleLineEditorViewModel.cs @@ -1,9 +1,6 @@ -using DynamicData; -using Mirivoice.Mirivoice.Core.Editor; +using Mirivoice.Mirivoice.Core.Editor; using Mirivoice.Mirivoice.Core.Format; -using Mirivoice.Views; using System.Globalization; -using System.Reactive.Linq; namespace Mirivoice.ViewModels { diff --git a/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs b/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs index 805783b..7629a71 100644 --- a/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs +++ b/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs @@ -1,8 +1,5 @@ using Mirivoice.Mirivoice.Core.Editor; -using Serilog; -using System.ComponentModel; using Mirivoice.Mirivoice.Core.Format; -using System; using System.Globalization; namespace Mirivoice.ViewModels diff --git a/Mirivoice/ViewModels/VoicersStyleBoxViewModel.cs b/Mirivoice/ViewModels/VoicersStyleBoxViewModel.cs index 00b9eb2..81399c2 100644 --- a/Mirivoice/ViewModels/VoicersStyleBoxViewModel.cs +++ b/Mirivoice/ViewModels/VoicersStyleBoxViewModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ReactiveUI; +using ReactiveUI; namespace Mirivoice.ViewModels { public class VoicersStyleBoxViewModel : ViewModelBase diff --git a/Mirivoice/ViewModels/VoicersVoicerButtonViewModel.cs b/Mirivoice/ViewModels/VoicersVoicerButtonViewModel.cs index 68490e1..2459d7f 100644 --- a/Mirivoice/ViewModels/VoicersVoicerButtonViewModel.cs +++ b/Mirivoice/ViewModels/VoicersVoicerButtonViewModel.cs @@ -1,18 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ReactiveUI; -using Mirivoice.Mirivoice.Core.Format; -using Avalonia.Media; -using Avalonia.Platform; -using Mirivoice.Mirivoice.Core.Editor; -using System.Collections.ObjectModel; -using System.IO; +using Avalonia.Media; using Avalonia.Media.Imaging; +using Avalonia.Platform; using Mirivoice.Engines; +using Mirivoice.Mirivoice.Core.Format; +using ReactiveUI; using Serilog; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; namespace Mirivoice.ViewModels { diff --git a/Mirivoice/ViewModels/VoicersWindowViewModel.cs b/Mirivoice/ViewModels/VoicersWindowViewModel.cs index 17792ba..24dcf97 100644 --- a/Mirivoice/ViewModels/VoicersWindowViewModel.cs +++ b/Mirivoice/ViewModels/VoicersWindowViewModel.cs @@ -1,12 +1,7 @@ -using System; +using Avalonia.Media; +using ReactiveUI; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ReactiveUI; -using Mirivoice.Mirivoice.Core.Format; -using Avalonia.Media; namespace Mirivoice.ViewModels { diff --git a/Mirivoice/Views/AppUpdaterWindow.axaml.cs b/Mirivoice/Views/AppUpdaterWindow.axaml.cs index 1569871..3803aa0 100644 --- a/Mirivoice/Views/AppUpdaterWindow.axaml.cs +++ b/Mirivoice/Views/AppUpdaterWindow.axaml.cs @@ -1,12 +1,11 @@ using Avalonia.Controls; +using Mirivoice.Mirivoice.Core; using Mirivoice.ViewModels; +using NetSparkleUpdater.Enums; using Serilog; using System; using System.Threading; -using NetSparkleUpdater.Enums; using System.Threading.Tasks; -using Mirivoice.Mirivoice.Core; -using Mirivoice.Views; namespace Mirivoice; public partial class AppUpdaterWindow : Window { diff --git a/Mirivoice/Views/DataPreprocessWindow.axaml.cs b/Mirivoice/Views/DataPreprocessWindow.axaml.cs index f217721..4e19e78 100644 --- a/Mirivoice/Views/DataPreprocessWindow.axaml.cs +++ b/Mirivoice/Views/DataPreprocessWindow.axaml.cs @@ -1,14 +1,12 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.Platform.Storage; +using Avalonia.Threading; using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers; using Mirivoice.ViewModels; -using Mirivoice.Views; -using System.IO; using System.Collections.Generic; -using Avalonia.Threading; +using System.IO; using System.Threading.Tasks; namespace Mirivoice; using Serilog; diff --git a/Mirivoice/Views/GlobalSettingWindow.axaml.cs b/Mirivoice/Views/GlobalSettingWindow.axaml.cs index db2f87d..1ad9f78 100644 --- a/Mirivoice/Views/GlobalSettingWindow.axaml.cs +++ b/Mirivoice/Views/GlobalSettingWindow.axaml.cs @@ -1,4 +1,3 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; using Mirivoice.ViewModels; diff --git a/Mirivoice/Views/LineBoxView.axaml.cs b/Mirivoice/Views/LineBoxView.axaml.cs index e972c0c..f645ed0 100644 --- a/Mirivoice/Views/LineBoxView.axaml.cs +++ b/Mirivoice/Views/LineBoxView.axaml.cs @@ -1,30 +1,20 @@ using Avalonia; using Avalonia.Controls; -using Avalonia.Controls.Primitives; -using Avalonia.Controls.Shapes; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.Media; -using Avalonia.Media.Imaging; using Avalonia.Threading; -using DynamicData; using Mirivoice.Commands; using Mirivoice.Engines; using Mirivoice.Mirivoice.Core; -using Mirivoice.Mirivoice.Core.Editor; using Mirivoice.Mirivoice.Core.Format; -using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers; using Mirivoice.ViewModels; using Serilog; -using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Globalization; -using System.IO; using System.Linq; using System.Reactive.Linq; -using System.Text; using System.Threading.Tasks; diff --git a/Mirivoice/Views/MainView.axaml.cs b/Mirivoice/Views/MainView.axaml.cs index dd7982c..77f7513 100644 --- a/Mirivoice/Views/MainView.axaml.cs +++ b/Mirivoice/Views/MainView.axaml.cs @@ -1,9 +1,5 @@ using Avalonia.Controls; -using Avalonia.Interactivity; using Avalonia.Markup.Xaml; -using Avalonia.Platform.Storage; -using Mirivoice.ViewModels; -using System.IO; namespace Mirivoice.Views; diff --git a/Mirivoice/Views/MainWindow.axaml.cs b/Mirivoice/Views/MainWindow.axaml.cs index a8fea06..7e14187 100644 --- a/Mirivoice/Views/MainWindow.axaml.cs +++ b/Mirivoice/Views/MainWindow.axaml.cs @@ -1,10 +1,9 @@ -using Avalonia.Controls; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using Mirivoice.ViewModels; using Serilog; using System.Threading.Tasks; -using Avalonia; -using Avalonia.Controls.ApplicationLifetimes; namespace Mirivoice.Views; public partial class MainWindow : Window diff --git a/Mirivoice/Views/MessageWindow.axaml.cs b/Mirivoice/Views/MessageWindow.axaml.cs index 3483438..7d2de73 100644 --- a/Mirivoice/Views/MessageWindow.axaml.cs +++ b/Mirivoice/Views/MessageWindow.axaml.cs @@ -1,10 +1,6 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Mirivoice.ViewModels; -using Mirivoice.Views; -using System.Diagnostics; using System.Linq; using System.Threading.Tasks; diff --git a/Mirivoice/Views/VoicersStyleBox.axaml.cs b/Mirivoice/Views/VoicersStyleBox.axaml.cs index e396d0b..8bf4f24 100644 --- a/Mirivoice/Views/VoicersStyleBox.axaml.cs +++ b/Mirivoice/Views/VoicersStyleBox.axaml.cs @@ -1,17 +1,13 @@ -using Avalonia; using Avalonia.Controls; +using Avalonia.Interactivity; using Avalonia.Markup.Xaml; -using Mirivoice.Engines; -using Mirivoice.ViewModels; +using Avalonia.Threading; +using Mirivoice.Mirivoice.Core; using Mirivoice.Mirivoice.Core.Format; using Mirivoice.Mirivoice.Plugins.Builtin.Phonemizers; -using Avalonia.Interactivity; -using Avalonia.Threading; +using Mirivoice.ViewModels; using System; -using Serilog; using System.IO; -using System.Linq; -using Mirivoice.Mirivoice.Core; namespace Mirivoice; diff --git a/Mirivoice/Views/VoicersVoicerButton.axaml.cs b/Mirivoice/Views/VoicersVoicerButton.axaml.cs index bf4422b..d2cc498 100644 --- a/Mirivoice/Views/VoicersVoicerButton.axaml.cs +++ b/Mirivoice/Views/VoicersVoicerButton.axaml.cs @@ -1,8 +1,7 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using Mirivoice.ViewModels; using Mirivoice.Mirivoice.Core.Format; +using Mirivoice.ViewModels; namespace Mirivoice; public partial class VoicersVoicerButton : UserControl diff --git a/Mirivoice/Views/VoicersWindow.axaml.cs b/Mirivoice/Views/VoicersWindow.axaml.cs index a4b34e1..d9bcaf0 100644 --- a/Mirivoice/Views/VoicersWindow.axaml.cs +++ b/Mirivoice/Views/VoicersWindow.axaml.cs @@ -1,4 +1,3 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; using Mirivoice.ViewModels;