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

Improved UI for Desktop CheckUpdate

Browse Source
This commit is contained in:
2dust
2024-10-04 16:01:36 +08:00
parent fe81b51dcb
commit 3ecbd3bc10
3 changed files with 83 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,15 +10,7 @@
d:DesignWidth="800" d:DesignWidth="800"
x:DataType="vms:CheckUpdateViewModel" x:DataType="vms:CheckUpdateViewModel"
mc:Ignorable="d"> mc:Ignorable="d">
<Button
Classes="Tertiary"
FontWeight="Regular"
Theme="{DynamicResource BorderlessButton}">
<Button.Content>
<TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
</Button.Content>
<Button.Flyout>
<Flyout Placement="RightEdgeAlignedTop">
<DockPanel Margin="16"> <DockPanel Margin="16">
<StackPanel <StackPanel
HorizontalAlignment="Right" HorizontalAlignment="Right"
@@ -93,7 +85,5 @@
</ListBox> </ListBox>
</StackPanel> </StackPanel>
</DockPanel> </DockPanel>
</Flyout>
</Button.Flyout>
</Button>
</UserControl> </UserControl>

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

@@ -90,11 +90,7 @@
</MenuItem.Header> </MenuItem.Header>
</MenuItem> </MenuItem>
<MenuItem Padding="8,0"> <MenuItem x:Name="menuCheckUpdate" Header="{x:Static resx:ResUI.menuCheckUpdate}" />
<MenuItem.Header>
<ContentControl x:Name="conCheckUpdate" />
</MenuItem.Header>
</MenuItem>
<MenuItem x:Name="menuHelp" Padding="8,0"> <MenuItem x:Name="menuHelp" Padding="8,0">
<MenuItem.Header> <MenuItem.Header>

11
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View File

@@ -20,6 +20,7 @@ namespace v2rayN.Desktop.Views
{ {
private static Config _config; private static Config _config;
private WindowNotificationManager? _manager; private WindowNotificationManager? _manager;
private CheckUpdateView? _checkUpdateView;
private BackupAndRestoreView? _backupAndRestoreView; private BackupAndRestoreView? _backupAndRestoreView;
public MainWindow() public MainWindow()
@@ -36,6 +37,7 @@ namespace v2rayN.Desktop.Views
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click; menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click; menuPromotion.Click += menuPromotion_Click;
menuClose.Click += menuClose_Click; menuClose.Click += menuClose_Click;
menuCheckUpdate.Click += MenuCheckUpdate_Click;
menuBackupAndRestore.Click += MenuBackupAndRestore_Click; menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
var IsAdministrator = true;//WindowsUtils.IsAdministrator(); var IsAdministrator = true;//WindowsUtils.IsAdministrator();
@@ -156,7 +158,6 @@ namespace v2rayN.Desktop.Views
tabClashConnections2.Content ??= new ClashConnectionsView(); tabClashConnections2.Content ??= new ClashConnectionsView();
} }
conTheme.Content ??= new ThemeSettingView(); conTheme.Content ??= new ThemeSettingView();
conCheckUpdate.Content ??= new CheckUpdateView();
RestoreUI(); RestoreUI();
AddHelpMenuItem(); AddHelpMenuItem();
@@ -368,7 +369,13 @@ namespace v2rayN.Desktop.Views
//ViewModel?.ScanScreenTaskAsync(result); //ViewModel?.ScanScreenTaskAsync(result);
} }
private void MenuBackupAndRestore_Click(object sender, RoutedEventArgs e) private void MenuCheckUpdate_Click(object? sender, RoutedEventArgs e)
{
_checkUpdateView ??= new CheckUpdateView();
DialogHost.Show(_checkUpdateView);
}
private void MenuBackupAndRestore_Click(object? sender, RoutedEventArgs e)
{ {
_backupAndRestoreView ??= new BackupAndRestoreView(this); _backupAndRestoreView ??= new BackupAndRestoreView(this);
DialogHost.Show(_backupAndRestoreView); DialogHost.Show(_backupAndRestoreView);