pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-07 13:05:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Avalonia to 12.1 (#9148)

Browse Source
This commit is contained in:
DHR60
2026-07-13 01:41:28 +00:00
committed by GitHub
parent 1de83f96ed
commit 6f50206606
14 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/v2rayN.Desktop/App.axaml
+1 -1
View File
@@ -8,7 +8,7 @@
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Name="v2rayN"
x:DataType="vms:StatusBarViewModel"
RequestedThemeVariant="Default">
RequestedThemeVariant="Default">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
v2rayN/v2rayN.Desktop/Program.cs
+3
View File
@@ -58,6 +58,9 @@ internal class Program
.UsePlatformDetect()
//.WithInterFont()
.WithFontByDefault()
#if DEBUG
.WithDeveloperTools()
#endif
.LogToTrace()
.UseReactiveUI(_ => { });
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+8 -8
View File
@@ -443,12 +443,12 @@
x:Name="txtMinGeckoPacketSize"
Width="90"
Margin="{StaticResource Margin4}"
Watermark="Min" />
PlaceholderText="Min" />
<TextBox
x:Name="txtMaxGeckoPacketSize"
Width="90"
Margin="{StaticResource Margin4}"
Watermark="Max" />
PlaceholderText="Max" />
</StackPanel>
<TextBlock
Margin="{StaticResource Margin4}"
@@ -481,7 +481,7 @@
Grid.Column="1"
Width="400"
Margin="{StaticResource Margin4}"
Watermark="1000-2000,3000,4000" />
PlaceholderText="1000-2000,3000,4000" />
<TextBlock
Grid.Row="2"
Grid.Column="2"
@@ -519,12 +519,12 @@
x:Name="txtUpMbps7"
Width="90"
Margin="{StaticResource Margin4}"
Watermark="Up" />
PlaceholderText="Up" />
<TextBox
x:Name="txtDownMbps7"
Width="90"
Margin="{StaticResource Margin4}"
Watermark="Down" />
PlaceholderText="Down" />
</StackPanel>
</Grid>
<Grid
@@ -633,7 +633,7 @@
Grid.Column="1"
Width="400"
Margin="{StaticResource Margin4}"
Watermark="0, 0, 0" />
PlaceholderText="0, 0, 0" />
<TextBlock
Grid.Row="5"
@@ -647,7 +647,7 @@
Grid.Column="1"
Width="400"
Margin="{StaticResource Margin4}"
Watermark="Ipv4,Ipv6" />
PlaceholderText="Ipv4,Ipv6" />
<TextBlock
Grid.Row="6"
@@ -662,7 +662,7 @@
Width="200"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
Watermark="1280" />
PlaceholderText="1280" />
</Grid>
<Grid
x:Name="gridAnytls"
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
+1 -1
View File
@@ -23,7 +23,7 @@
Width="200"
VerticalContentAlignment="Center"
Margin="{StaticResource MarginLr8}"
Watermark="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
PlaceholderText="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
<Button
x:Name="btnConnectionCloseAll"
v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+1 -1
View File
@@ -317,7 +317,7 @@
BorderThickness="1"
Classes="TextArea"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}" />
PlaceholderText="{x:Static resx:ResUI.TbDNSHostsConfig}" />
</Grid>
</ScrollViewer>
</TabItem>
v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
+1 -1
View File
@@ -11,7 +11,7 @@
CanResize="False"
ShowInTaskbar="False"
SizeToContent="Height"
SystemDecorations="Full"
WindowDecorations="Full"
WindowStartupLocation="CenterOwner"
mc:Ignorable="d">
v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+1 -1
View File
@@ -21,7 +21,7 @@
Width="200"
Margin="{StaticResource MarginLr8}"
VerticalContentAlignment="Center"
Watermark="{x:Static resx:ResUI.MsgFilterTitle}" />
PlaceholderText="{x:Static resx:ResUI.MsgFilterTitle}" />
<Button
x:Name="btnCopy"
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+8 -8
View File
@@ -279,12 +279,12 @@
x:Name="txtUpMbps"
Width="90"
Margin="{StaticResource Margin4}"
Watermark="Up" />
PlaceholderText="Up" />
<TextBox
x:Name="txtDownMbps"
Width="90"
Margin="{StaticResource Margin4}"
Watermark="Down" />
PlaceholderText="Down" />
</StackPanel>
<TextBlock
@@ -351,7 +351,7 @@
Width="120"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
Watermark="50-100" />
PlaceholderText="50-100" />
<TextBlock
Grid.Row="1"
Grid.Column="2"
@@ -373,7 +373,7 @@
Width="120"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
Watermark="10-20" />
PlaceholderText="10-20" />
<TextBlock
Grid.Row="2"
Grid.Column="2"
@@ -395,7 +395,7 @@
Width="120"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
Watermark="0" />
PlaceholderText="0" />
<TextBlock
Grid.Row="3"
Grid.Column="2"
@@ -461,7 +461,7 @@
Grid.Column="1"
Width="200"
Margin="{StaticResource Margin4}"
Watermark="0.0.0.0" />
PlaceholderText="0.0.0.0" />
<TextBlock
Grid.Row="23"
Grid.Column="2"
@@ -865,7 +865,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
TextWrapping="Wrap"
Watermark="proxy_set.sh" />
PlaceholderText="proxy_set.sh" />
<Button
x:Name="btnBrowseCustomSystemProxyScriptPath"
Margin="{StaticResource Margin4}"
@@ -910,7 +910,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
TextWrapping="Wrap"
Watermark="pac.txt" />
PlaceholderText="pac.txt" />
<Button
x:Name="btnBrowseCustomSystemProxyPacPath"
Margin="{StaticResource Margin4}"
v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
+1 -1
View File
@@ -65,7 +65,7 @@
Margin="8,0"
VerticalContentAlignment="Center"
Text="{Binding ServerFilter, Mode=TwoWay}"
Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
</WrapPanel>
<!-- Profiles grid -->
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+1 -1
View File
@@ -63,7 +63,7 @@
Width="200"
Margin="{StaticResource MarginLr4}"
VerticalContentAlignment="Center"
Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
<Button
x:Name="btnAutofitColumnWidth"
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+8 -8
View File
@@ -68,7 +68,7 @@
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<Button
Grid.Row="2"
Grid.Column="2"
@@ -99,7 +99,7 @@
Classes="TextArea"
MinLines="4"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
</StackPanel>
</Flyout>
</Button.Flyout>
@@ -128,7 +128,7 @@
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
DockPanel.Dock="Right"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Margin="{StaticResource Margin4}"
@@ -149,7 +149,7 @@
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="6"
@@ -178,7 +178,7 @@
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="8"
@@ -206,7 +206,7 @@
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
<Button
Grid.Row="9"
Grid.Column="2"
@@ -226,7 +226,7 @@
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
<Button
Grid.Row="10"
Grid.Column="2"
@@ -248,7 +248,7 @@
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
Watermark="{x:Static resx:ResUI.TipPreSocksPort}" />
PlaceholderText="{x:Static resx:ResUI.TipPreSocksPort}" />
<TextBlock
Grid.Row="12"
v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+1 -1
View File
@@ -16,7 +16,7 @@
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Avalonia.Desktop" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="AvaloniaUI.DiagnosticsSupport" />
<PackageReference Include="DialogHost.Avalonia" />
<PackageReference Include="ReactiveUI.Avalonia" />
<PackageReference Include="Semi.Avalonia" />