Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions OpenUtau.Core/SingerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,18 @@ public void SearchAllSingers() {
stopWatch.Stop();
Log.Information($"Search all singers: {stopWatch.Elapsed}");
} catch (Exception e) {
Log.Error(e, "Failed to search singers.");
if (InitializationTask.Status == TaskStatus.Running) {
Log.Error(e, "Failed to search singers.");
} else {
var customEx = new MessageCustomizableException("Failed to search singers.", "<translate:errors.failed.searchsinger>", e);
DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(customEx));
}
Singers = new Dictionary<string, USinger>();
}
}

public USinger GetSinger(string name) {
Log.Information(name);
Log.Information($"Attach singer to track: {name}");
name = name.Replace("%VOICE%", "");
if (Singers.ContainsKey(name)) {
return Singers[name];
Expand Down
1 change: 1 addition & 0 deletions OpenUtau/Strings/Strings.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<system:String x:Key="errors.failed.runeditingmacro">Failed to run editing macro</system:String>
<system:String x:Key="errors.failed.save">Failed to save</system:String>
<system:String x:Key="errors.failed.savesingerconfig">Failed to save singer config file</system:String>
<system:String x:Key="errors.failed.searchsinger">Failed to search singers</system:String>

<system:String x:Key="exps.abbr">Abbreviation</system:String>
<system:String x:Key="exps.apply">Apply</system:String>
Expand Down
1 change: 1 addition & 0 deletions OpenUtau/Strings/Strings.ja-JP.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<system:String x:Key="errors.failed.runeditingmacro">一括処理に失敗しました</system:String>
<system:String x:Key="errors.failed.save">保存に失敗しました</system:String>
<system:String x:Key="errors.failed.savesingerconfig">シンガー設定の保存に失敗しました</system:String>
<system:String x:Key="errors.failed.searchsinger">シンガーの取得に失敗しました</system:String>

<system:String x:Key="exps.abbr">パラメータの略称</system:String>
<system:String x:Key="exps.apply">適用</system:String>
Expand Down
8 changes: 4 additions & 4 deletions OpenUtau/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public void OpenSingersWindow() {
return;
}

DocManager.Inst.ExecuteCmd(new LoadingNotification(typeof(MainWindow), true, "singers window"));
MessageBox.ShowLoading(this);
var dialog = lifetime.Windows.FirstOrDefault(w => w is SingersDialog);
try {
if (dialog == null) {
Expand All @@ -581,7 +581,7 @@ public void OpenSingersWindow() {
} catch (Exception e) {
DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(e));
} finally {
DocManager.Inst.ExecuteCmd(new LoadingNotification(typeof(MainWindow), false, "singers window"));
MessageBox.CloseLoading();
}
if (dialog != null) {
dialog.Activate();
Expand Down Expand Up @@ -1078,12 +1078,12 @@ public void PartsCanvasDoubleTapped(object sender, TappedEventArgs args) {
var control = canvas.InputHitTest(args.GetPosition(canvas));
if (control is PartControl partControl && partControl.part is UVoicePart) {
if (pianoRollWindow == null) {
DocManager.Inst.ExecuteCmd(new LoadingNotification(typeof(MainWindow), true, "pianoroll window"));
MessageBox.ShowLoading(this);
pianoRollWindow = new PianoRollWindow() {
MainWindow = this,
};
pianoRollWindow.ViewModel.PlaybackViewModel = viewModel.PlaybackViewModel;
DocManager.Inst.ExecuteCmd(new LoadingNotification(typeof(MainWindow), false, "pianoroll window"));
MessageBox.CloseLoading();
}
// Workaround for new window losing focus.
openPianoRollWindow = true;
Expand Down
19 changes: 8 additions & 11 deletions OpenUtau/Views/PreferencesDialog.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using System.IO;
using System.IO;
using System.Threading.Tasks;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Platform.Storage;
Expand All @@ -26,16 +26,13 @@ async void SelectAddlSingersPath(object sender, RoutedEventArgs e) {
}
}

void ReloadSingers(object sender, RoutedEventArgs e) {
DocManager.Inst.ExecuteCmd(new LoadingNotification(typeof(PreferencesDialog), true, "singer"));
try {
async void ReloadSingers(object sender, RoutedEventArgs e) {
MessageBox.ShowLoading(this);
await Task.Run(() => {
SingerManager.Inst.SearchAllSingers();
DocManager.Inst.ExecuteCmd(new SingersRefreshedNotification());
} catch (Exception ex) {
DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(ex));
} finally {
DocManager.Inst.ExecuteCmd(new LoadingNotification(typeof(PreferencesDialog), false, "singer"));
}
});
DocManager.Inst.ExecuteCmd(new SingersRefreshedNotification());
MessageBox.CloseLoading();
}

void ResetVLabelerPath(object sender, RoutedEventArgs e) {
Expand Down