Browse Source

Fix

pull/5701/head
2dust 3 months ago
parent
commit
8361b4e4a0
  1. 1
      v2rayN/ServiceLib/Handler/WebDavHandler.cs
  2. 2
      v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
  3. 2
      v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
  4. 8
      v2rayN/v2rayN/Views/CheckUpdateView.xaml
  5. 1
      v2rayN/v2rayN/Views/ProfilesView.xaml.cs

1
v2rayN/ServiceLib/Handler/WebDavHandler.cs

@ -100,6 +100,7 @@ namespace ServiceLib.Handler
}
else
{
SaveLog(result.Description);
return false;
}
}

2
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs

@ -28,7 +28,7 @@ namespace v2rayN.Desktop.Views
switch (action)
{
case EViewAction.DispatcherCheckUpdate:
if (obj is null) return false;
if (obj is null) return false;
Dispatcher.UIThread.Post(() =>
ViewModel?.UpdateViewResult((CheckUpdateItem)obj),
DispatcherPriority.Default);

2
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs

@ -21,7 +21,7 @@ namespace v2rayN.Views
this.WhenActivated(disposables =>
{
this.Bind(ViewModel, vm => vm.OperationMsg, v => v.txtMsg.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.url, v => v.txtWebDavUrl.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);

8
v2rayN/v2rayN/Views/CheckUpdateView.xaml

@ -21,18 +21,18 @@
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<TextBlock
<TextBlock
Margin="{StaticResource SettingItemMargin}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
<ToggleButton
x:Name="togEnableCheckPreReleaseUpdate"
x:Name="togEnableCheckPreReleaseUpdate"
Margin="{StaticResource SettingItemMargin}"
HorizontalAlignment="Left" />
<Button
x:Name="btnCheckUpdate"
x:Name="btnCheckUpdate"
Width="100"
Margin="8"
Content="{x:Static resx:ResUI.menuCheckUpdate}"
@ -40,7 +40,7 @@
IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" />
<Button
<Button
Width="100"
Margin="8"
HorizontalAlignment="Right"

1
v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@ -1,5 +1,4 @@
using MaterialDesignThemes.Wpf;
using Microsoft.Win32;
using ReactiveUI;
using Splat;
using System.Reactive.Disposables;

Loading…
Cancel
Save