Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 21:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add wireguard core type settings

Browse source
This commit is contained in:
DHR60 2025-04-09 13:12:20 +08:00
parent efe2124274
commit 841f870da1
5 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
View file

@ -100,6 +100,7 @@ public class OptionSettingViewModel : MyReactiveObject
[Reactive] public string CoreType4 { get; set; } [Reactive] public string CoreType4 { get; set; }
[Reactive] public string CoreType5 { get; set; } [Reactive] public string CoreType5 { get; set; }
[Reactive] public string CoreType6 { get; set; } [Reactive] public string CoreType6 { get; set; }
[Reactive] public string CoreType9 { get; set; }
#endregion CoreType #endregion CoreType
@ -259,6 +260,10 @@ public class OptionSettingViewModel : MyReactiveObject
case 6: case 6:
CoreType6 = type; CoreType6 = type;
break; break;
case 9:
CoreType9 = type;
break;
} }
}); });
await Task.CompletedTask; await Task.CompletedTask;
@ -407,6 +412,10 @@ public class OptionSettingViewModel : MyReactiveObject
type = CoreType6; type = CoreType6;
break; break;
case 9:
type = CoreType9;
break;
default: default:
continue; continue;
} }

13
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View file

@ -891,6 +891,19 @@
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource Margin4}" /> Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="7"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Text="Wireguard" />
<ComboBox
x:Name="cmbCoreType9"
Grid.Row="7"
Grid.Column="1"
Width="200"
Margin="{StaticResource Margin4}" />
</Grid> </Grid>
</TabItem> </TabItem>
</TabControl> </TabControl>

2
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
View file

@ -64,6 +64,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
cmbCoreType4.Items.Add(it); cmbCoreType4.Items.Add(it);
cmbCoreType5.Items.Add(it); cmbCoreType5.Items.Add(it);
cmbCoreType6.Items.Add(it); cmbCoreType6.Items.Add(it);
cmbCoreType9.Items.Add(it);
}); });
for (var i = 2; i <= 8; i++) for (var i = 2; i <= 8; i++)
@ -160,6 +161,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.SelectedValue).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType9, v => v.cmbCoreType9.SelectedValue).DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
}); });

16
v2rayN/v2rayN/Views/OptionSettingWindow.xaml
View file

@ -1098,6 +1098,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
@ -1192,6 +1193,21 @@
Width="200" Width="200"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
Style="{StaticResource DefComboBox}" /> Style="{StaticResource DefComboBox}" />
<TextBlock
Grid.Row="7"
Grid.Column="0"
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="Wireguard" />
<ComboBox
x:Name="cmbCoreType9"
Grid.Row="7"
Grid.Column="1"
Width="200"
Margin="{StaticResource Margin8}"
Style="{StaticResource DefComboBox}" />
</Grid> </Grid>
</TabItem> </TabItem>
</TabControl> </TabControl>

2
v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
View file

@ -66,6 +66,7 @@ public partial class OptionSettingWindow
cmbCoreType4.Items.Add(it); cmbCoreType4.Items.Add(it);
cmbCoreType5.Items.Add(it); cmbCoreType5.Items.Add(it);
cmbCoreType6.Items.Add(it); cmbCoreType6.Items.Add(it);
cmbCoreType9.Items.Add(it);
}); });
for (var i = 2; i <= 8; i++) for (var i = 2; i <= 8; i++)
@ -178,6 +179,7 @@ public partial class OptionSettingWindow
this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType9, v => v.cmbCoreType9.Text).DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
}); });