mirror of
https://github.com/2dust/v2rayN.git
synced 2026-11-18 18:35:00 +03:00
Remove tray menu route selection in WPF version
This commit is contained in:
@@ -51,10 +51,7 @@ public partial class StatusBarViewModel : MyReactiveObject
|
|||||||
public ReactiveCommand<RxVoid, RxVoid> SystemProxySetCmd { get; }
|
public ReactiveCommand<RxVoid, RxVoid> SystemProxySetCmd { get; }
|
||||||
public ReactiveCommand<RxVoid, RxVoid> SystemProxyNothingCmd { get; }
|
public ReactiveCommand<RxVoid, RxVoid> SystemProxyNothingCmd { get; }
|
||||||
public ReactiveCommand<RxVoid, RxVoid> SystemProxyPacCmd { get; }
|
public ReactiveCommand<RxVoid, RxVoid> SystemProxyPacCmd { get; }
|
||||||
|
|
||||||
[Reactive]
|
|
||||||
public partial bool BlRouting { get; set; }
|
|
||||||
|
|
||||||
[Reactive]
|
[Reactive]
|
||||||
public partial int SystemProxySelected { get; set; }
|
public partial int SystemProxySelected { get; set; }
|
||||||
|
|
||||||
@@ -207,8 +204,6 @@ public partial class StatusBarViewModel : MyReactiveObject
|
|||||||
await InboundDisplayStatus();
|
await InboundDisplayStatus();
|
||||||
// The view refreshes its icon on initialization; interaction handlers are not registered yet.
|
// The view refreshes its icon on initialization; interaction handlers are not registered yet.
|
||||||
await ChangeSystemProxyAsync(_config.SystemProxyItem.SysProxyType, false);
|
await ChangeSystemProxyAsync(_config.SystemProxyItem.SysProxyType, false);
|
||||||
|
|
||||||
BlRouting = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task CopyProxyCmdToClipboard()
|
private async Task CopyProxyCmdToClipboard()
|
||||||
|
|||||||
@@ -170,24 +170,6 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</MenuItem.Header>
|
</MenuItem.Header>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<Separator x:Name="sepRoutings" />
|
|
||||||
<MenuItem
|
|
||||||
x:Name="menuRoutings"
|
|
||||||
Height="Auto"
|
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}">
|
|
||||||
<MenuItem.Header>
|
|
||||||
<DockPanel>
|
|
||||||
<ComboBox
|
|
||||||
x:Name="cmbRoutings"
|
|
||||||
MaxWidth="300"
|
|
||||||
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
|
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
|
|
||||||
DisplayMemberPath="Remarks"
|
|
||||||
FontSize="{DynamicResource StdFontSize}"
|
|
||||||
Style="{StaticResource MaterialDesignFilledComboBox}" />
|
|
||||||
</DockPanel>
|
|
||||||
</MenuItem.Header>
|
|
||||||
</MenuItem>
|
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
x:Name="menuAddServerViaClipboard2"
|
x:Name="menuAddServerViaClipboard2"
|
||||||
|
|||||||
@@ -26,13 +26,7 @@ public partial class StatusBarView
|
|||||||
this.BindCommand(ViewModel, vm => vm.SystemProxySetCmd, v => v.menuSystemProxySet).DisposeWith(disposables);
|
this.BindCommand(ViewModel, vm => vm.SystemProxySetCmd, v => v.menuSystemProxySet).DisposeWith(disposables);
|
||||||
this.BindCommand(ViewModel, vm => vm.SystemProxyNothingCmd, v => v.menuSystemProxyNothing).DisposeWith(disposables);
|
this.BindCommand(ViewModel, vm => vm.SystemProxyNothingCmd, v => v.menuSystemProxyNothing).DisposeWith(disposables);
|
||||||
this.BindCommand(ViewModel, vm => vm.SystemProxyPacCmd, v => v.menuSystemProxyPac).DisposeWith(disposables);
|
this.BindCommand(ViewModel, vm => vm.SystemProxyPacCmd, v => v.menuSystemProxyPac).DisposeWith(disposables);
|
||||||
|
|
||||||
//routings and servers
|
|
||||||
this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.cmbRoutings.ItemsSource).DisposeWith(disposables);
|
|
||||||
this.Bind(ViewModel, vm => vm.SelectedRouting, v => v.cmbRoutings.SelectedItem).DisposeWith(disposables);
|
|
||||||
this.OneWayBind(ViewModel, vm => vm.BlRouting, v => v.menuRoutings.Visibility).DisposeWith(disposables);
|
|
||||||
this.OneWayBind(ViewModel, vm => vm.BlRouting, v => v.sepRoutings.Visibility).DisposeWith(disposables);
|
|
||||||
|
|
||||||
//tray menu
|
//tray menu
|
||||||
this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard2).DisposeWith(disposables);
|
this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard2).DisposeWith(disposables);
|
||||||
this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan2).DisposeWith(disposables);
|
this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan2).DisposeWith(disposables);
|
||||||
@@ -56,7 +50,6 @@ public partial class StatusBarView
|
|||||||
this.Bind(ViewModel, vm => vm.SystemProxySelected, v => v.cmbSystemProxy.SelectedIndex).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.SystemProxySelected, v => v.cmbSystemProxy.SelectedIndex).DisposeWith(disposables);
|
||||||
this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.cmbRoutings2.ItemsSource).DisposeWith(disposables);
|
this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.cmbRoutings2.ItemsSource).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.SelectedRouting, v => v.cmbRoutings2.SelectedItem).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.SelectedRouting, v => v.cmbRoutings2.SelectedItem).DisposeWith(disposables);
|
||||||
this.OneWayBind(ViewModel, vm => vm.BlRouting, v => v.cmbRoutings2.Visibility).DisposeWith(disposables);
|
|
||||||
|
|
||||||
ViewModel.SetClipboardDataInteraction.RegisterHandler(interaction =>
|
ViewModel.SetClipboardDataInteraction.RegisterHandler(interaction =>
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user