Skip to content
Draft
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
4 changes: 3 additions & 1 deletion OpenUtau.Core/OpenUtau.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<SatelliteResourceLanguages>none</SatelliteResourceLanguages>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>embedded</DebugType>
Expand All @@ -26,7 +26,9 @@
<PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="System.Buffers" Version="4.6.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.3" />
<PackageReference Include="System.IO.Packaging" Version="9.0.2" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="TextCopy" Version="6.2.1" />
<PackageReference Include="UTF.Unknown" Version="2.5.1" />
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau.Plugin.Builtin/OpenUtau.Plugin.Builtin.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<SatelliteResourceLanguages>none</SatelliteResourceLanguages>
<DebugType>embedded</DebugType>
<Nullable>enable</Nullable>
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Classic/UstTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using SharpCompress.Common;
using SharpCompress.Readers;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Classic {
public class UstTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Classic/VoicebankConfigTest.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using OpenUtau.Core;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Classic {
public class VoicebankConfigTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Classic/VoicebankLoaderTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.IO;
using System.Text;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Classic {
public class VoicebankLoaderTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/Format/MusicXMLTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Linq;
using System.Reflection;
using Xunit;
using Xunit.Abstractions;

using OpenUtau.Core.Ustx;

Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/G2p/G2pTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Core.G2p {
public class G2pTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/SignalChain/WaveSourceTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using Xunit.Abstractions;
using System.IO;
using System.Reflection;
using NAudio.Wave;
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/USTx/UstxYamlTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Core.Ustx {
public class UstxYamlTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/Util/Base64Test.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Core.Util {
public class Base64Test {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/Util/MusicMathTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Core.Util {
public class MusicMathTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/Util/SplitLyricsTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Core.Util {
public class SplitLyricsTest {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Core/Util/TimeAxisTest.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using OpenUtau.Core.Ustx;
using Xunit;
using Xunit.Abstractions;


namespace OpenUtau.Core {
Expand Down
10 changes: 6 additions & 4 deletions OpenUtau.Test/OpenUtau.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<SatelliteResourceLanguages>none</SatelliteResourceLanguages>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.4" />
<PackageReference Include="Avalonia.Headless.XUnit" Version="12.0.0-rc1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand All @@ -25,6 +24,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.v3.common" Version="3.2.2" />
<PackageReference Include="xunit.v3.extensibility.core" Version="3.2.2" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/DeDiphoneTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class DeDiphoneTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/DeVccvTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class DeVccvTest : PhonemizerTestBase {
Expand Down
3 changes: 1 addition & 2 deletions OpenUtau.Test/Plugins/EnArpaPlusTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class EnArpaPlusTest : PhonemizerTestBase {
Expand Down Expand Up @@ -88,4 +87,4 @@ public void HintTest(string lyric, string hint, string[] aliases) {
RunPhonemizeTest("en_arpa-plus", new NoteParams[] { new NoteParams { lyric = lyric, hint = hint, tone = "C3", phonemes = SamePhonemeParams(4, 0, 0, "")} }, aliases);
}
}
}
}
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/EnArpaTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class EnArpaTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/EnToJaTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;
using System.Linq;

namespace OpenUtau.Plugins {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/EnVCCVTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class EnVCCVTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/EnXSampaTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class EnXSampaTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/JaCvvcTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class JaCvvcTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/JaPresampTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class JaPresampTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/JaVcvTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public class JaVcvTest : PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/PhonemizerTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using OpenUtau.Classic;
using OpenUtau.Core.Format;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins {
public abstract class PhonemizerTestBase {
Expand Down
1 change: 0 additions & 1 deletion OpenUtau.Test/Plugins/ZhCvvcTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OpenUtau.Api;
using OpenUtau.Plugin.Builtin;
using Xunit;
using Xunit.Abstractions;

namespace OpenUtau.Plugins
{
Expand Down
5 changes: 3 additions & 2 deletions OpenUtau/Controls/LyricBox.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public LyricBox() {
IsVisible = false;
}

private void Box_GotFocus(object? sender, GotFocusEventArgs e) {
private void Box_GotFocus(object? sender, RoutedEventArgs e) {
box.SelectAll();
}

Expand Down Expand Up @@ -158,14 +158,15 @@ public void Show(UVoicePart part, LyricBoxNoteOrPhoneme noteOrPhoneme, string te
viewModel.IsVisible = true;
box.SelectAll();
focusTimer = new DispatcherTimer(
TimeSpan.FromMilliseconds(15),
TimeSpan.FromMilliseconds(150),
DispatcherPriority.Normal,
FocusTimer_Tick);
focusTimer.Start();
}

private void FocusTimer_Tick(object? sender, System.EventArgs e) {
box.Focus();
box.SelectAll();
if (focusTimer != null) {
focusTimer.Tick -= FocusTimer_Tick;
focusTimer.Stop();
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau/Controls/NotePropertiesControl.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private void LoadPart(UPart? part) {
}

private string textBoxValue = string.Empty;
void OnTextBoxGotFocus(object? sender, GotFocusEventArgs args) {
void OnTextBoxGotFocus(object? sender, RoutedEventArgs args) {
Log.Debug("Note property textbox got focus");
if(sender is TextBox text) {
textBoxValue = text.Text ?? string.Empty;
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau/Controls/NotePropertyExpression.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public NotePropertyExpression() {

// textbox
private string textBoxValue = string.Empty;
void OnTextBoxGotFocus(object? sender, GotFocusEventArgs args) {
void OnTextBoxGotFocus(object? sender, RoutedEventArgs args) {
Log.Debug("Note property textbox got focus");
if (sender is TextBox textBox) {
textBoxValue = textBox.Text ?? string.Empty;
Expand Down
5 changes: 3 additions & 2 deletions OpenUtau/Controls/PropertyEditors/FloatEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Interactivity;
using ReactiveUI;

Expand Down Expand Up @@ -51,12 +52,12 @@ protected void OnTextChanged(string? newText)
}
}

protected override void OnLostFocus(RoutedEventArgs e) {
protected override void OnLostFocus(FocusChangedEventArgs e) {
base.OnLostFocus(e);
if (!float.TryParse(Text, out float newValue))
{
Text = Value.ToString();
}
}
}
}
}
6 changes: 4 additions & 2 deletions OpenUtau/Controls/PropertyEditors/IntEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Interactivity;
using Avalonia.Input;
using ReactiveUI;

namespace OpenUtau.Controls{
Expand Down Expand Up @@ -51,12 +52,13 @@ protected void OnTextChanged(string? newText)
}
}

protected override void OnLostFocus(RoutedEventArgs e) {
protected override void OnLostFocus(FocusChangedEventArgs e) {
base.OnLostFocus(e);

if (!int.TryParse(Text, out int newValue))
{
Text = Value.ToString();
}
}
}
}
}
2 changes: 1 addition & 1 deletion OpenUtau/Controls/SearchBar.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<TextBox Grid.Column="2" Name="box" Padding="4,3" Margin="0" Height="24" VerticalAlignment="Center" HorizontalAlignment="Stretch"
Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
Text="{Binding SearchWord}" Focusable="True" Watermark="{Binding Watermark}"
Text="{Binding SearchWord}" Focusable="True" PlaceholderText="{Binding Watermark}"
GotFocus="Box_GotFocus" KeyDown="Box_KeyDown"/>

<TextBlock Grid.Column="3" Text="{Binding ResultCount}" Width="54" VerticalAlignment="Center" TextAlignment="Center"/>
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau/Controls/SearchBar.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void OnClose(object sender, RoutedEventArgs args) {
}
}

private void Box_GotFocus(object? sender, GotFocusEventArgs e) {
private void Box_GotFocus(object? sender, RoutedEventArgs e) {
box.SelectAll();
}

Expand Down
6 changes: 3 additions & 3 deletions OpenUtau/Controls/TrackHeader.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ void PanFaderContextRequested(object sender, ContextRequestedEventArgs args) {
args.Handled = true;
}

void TrackSettingsButtonClicked(object sender, RoutedEventArgs args) {
async void TrackSettingsButtonClicked(object sender, RoutedEventArgs args) {
if (track?.Singer != null && track.Singer.Found) {
if (VisualRoot is Window window) {
if (TopLevel.GetTopLevel(this) is Window window) {
var dialog = new Views.TrackSettingsDialog(track);
dialog.ShowDialog(window);
await dialog.ShowDialog(window);
}
}
}
Expand Down
Loading
Loading