voronin9032/v2rayN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The first letter of the guiconfig attribute must be capitalized.

Browse Source
This commit is contained in:
2dust
2024-10-23 17:19:57 +08:00
parent 3c550c094a
commit ffb38129e2
27 changed files with 232 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
View File

@@ -86,31 +86,31 @@
<DataGrid.Columns>
<DataGridTextColumn
Width="240"
Binding="{Binding host}"
Binding="{Binding Host}"
Header="{x:Static resx:ResUI.TbSortingHost}" />
<DataGridTextColumn
Width="160"
Binding="{Binding chain}"
Binding="{Binding Chain}"
Header="{x:Static resx:ResUI.TbSortingChain}" />
<DataGridTextColumn
Width="80"
Binding="{Binding network}"
Binding="{Binding Network}"
Header="{x:Static resx:ResUI.TbSortingNetwork}" />
<DataGridTextColumn
Width="100"
Binding="{Binding type}"
Binding="{Binding Type}"
Header="{x:Static resx:ResUI.TbSortingType}" />
<DataGridTextColumn
Width="100"
Binding="{Binding uploadTraffic}"
Binding="{Binding UploadTraffic}"
Header="{x:Static resx:ResUI.TbSortingUpTraffic}" />
<DataGridTextColumn
Width="100"
Binding="{Binding downloadTraffic}"
Binding="{Binding DownloadTraffic}"
Header="{x:Static resx:ResUI.TbSortingDownTraffic}" />
<DataGridTextColumn
Width="100"
Binding="{Binding elapsed}"
Binding="{Binding Elapsed}"
Header="{x:Static resx:ResUI.TbSortingTime}" />
</DataGrid.Columns>
</DataGrid>

14
v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
View File

@@ -116,10 +116,10 @@
<RowDefinition Height="1*" />
</Grid.RowDefinitions>
<DockPanel Grid.Row="0">
<TextBlock DockPanel.Dock="Right" Text="{Binding type}" />
<TextBlock Text="{Binding name}" />
<TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
<TextBlock Text="{Binding Name}" />
</DockPanel>
<TextBlock Grid.Row="2" Text="{Binding now}" />
<TextBlock Grid.Row="2" Text="{Binding Now}" />
</Grid>
</DockPanel>
</Border>
@@ -163,14 +163,14 @@
</Grid.RowDefinitions>
<TextBlock
Grid.Row="0"
Text="{Binding name}"
Text="{Binding Name}"
TextWrapping="WrapWithOverflow" />
<DockPanel Grid.Row="2">
<TextBlock
DockPanel.Dock="Right"
Foreground="{Binding Path=delay, Converter={StaticResource DelayColorConverter}}"
Text="{Binding delayName}" />
<TextBlock Text="{Binding type}" />
Foreground="{Binding Path=Delay, Converter={StaticResource DelayColorConverter}}"
Text="{Binding DelayName}" />
<TextBlock Text="{Binding Type}" />
</DockPanel>
</Grid>
</DockPanel>

12
v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
View File

@@ -39,13 +39,13 @@ namespace v2rayN.Desktop.Views
cmbNetwork.Items.Add(it);
});
if (!rulesItem.id.IsNullOrEmpty())
if (!rulesItem.Id.IsNullOrEmpty())
{
rulesItem.protocol?.ForEach(it =>
rulesItem.Protocol?.ForEach(it =>
{
clbProtocol.SelectedItems.Add(it);
});
rulesItem.inboundTag?.ForEach(it =>
rulesItem.InboundTag?.ForEach(it =>
{
clbInboundTag.SelectedItems.Add(it);
});
@@ -54,9 +54,9 @@ namespace v2rayN.Desktop.Views
this.WhenActivated(disposables =>
{
this.Bind(ViewModel, vm => vm.SelectedSource.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.outboundTag, v => v.cmbOutboundTag.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.port, v => v.txtPort.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.OutboundTag, v => v.cmbOutboundTag.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.Port, v => v.txtPort.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.Enabled, v => v.togEnabled.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.Domain, v => v.txtDomain.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);

6
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
View File

@@ -218,11 +218,11 @@
Header="{x:Static resx:ResUI.LvRemarks}" />
<DataGridTextColumn
Width="120"
Binding="{Binding outboundTag}"
Binding="{Binding OutboundTag}"
Header="outboundTag" />
<DataGridTextColumn
Width="100"
Binding="{Binding port}"
Binding="{Binding Port}"
Header="port" />
<DataGridTextColumn
Width="100"
@@ -234,7 +234,7 @@
Header="inboundTag" />
<DataGridTextColumn
Width="90"
Binding="{Binding network}"
Binding="{Binding Network}"
Header="network" />
<DataGridTextColumn
Width="200"