Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-20 06:02:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust UI for desktop

Browse source
This commit is contained in:
2dust 2025-01-09 21:03:17 +08:00
parent e0ae101ff4
commit 1a5eeb9401
9 changed files with 31 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
View file

@ -10,6 +10,12 @@
d:DesignWidth="800" d:DesignWidth="800"
x:DataType="vms:BackupAndRestoreViewModel" x:DataType="vms:BackupAndRestoreViewModel"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Styles>
<Style Selector="Button">
<Setter Property="MinWidth" Value="180" />
</Style>
</UserControl.Styles>
<DockPanel Classes="Margin8"> <DockPanel Classes="Margin8">
<DockPanel Classes="Margin8" DockPanel.Dock="Bottom"> <DockPanel Classes="Margin8" DockPanel.Dock="Bottom">
@ -23,7 +29,7 @@
<Border <Border
Margin="4" Margin="4"
VerticalAlignment="Center" VerticalAlignment="Center"
Theme="{StaticResource CardBorder}"> Theme="{DynamicResource CardBorder}">
<Grid <Grid
Classes="Margin8" Classes="Margin8"
@ -69,7 +75,7 @@
<Border <Border
Margin="4" Margin="4"
VerticalAlignment="Center" VerticalAlignment="Center"
Theme="{StaticResource CardBorder}"> Theme="{DynamicResource CardBorder}">
<Grid <Grid
Classes="Margin8" Classes="Margin8"
ColumnDefinitions="300,200" ColumnDefinitions="300,200"

18
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
View file

@ -35,7 +35,11 @@
Content="{x:Static resx:ResUI.menuCheckUpdate}" /> Content="{x:Static resx:ResUI.menuCheckUpdate}" />
</StackPanel> </StackPanel>
<StackPanel> <Border
Margin="4"
VerticalAlignment="Center"
Theme="{DynamicResource CardBorder}">
<ListBox <ListBox
x:Name="lstCheckUpdates" x:Name="lstCheckUpdates"
BorderThickness="1" BorderThickness="1"
@ -47,12 +51,7 @@
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border <Panel Width="500" VerticalAlignment="Center">
Width="500"
Height="80"
Margin="-8"
VerticalAlignment="Center"
Theme="{StaticResource CardBorder}">
<Grid ColumnDefinitions="1*,1*,3*" RowDefinitions="Auto"> <Grid ColumnDefinitions="1*,1*,3*" RowDefinitions="Auto">
<ToggleSwitch <ToggleSwitch
x:Name="togAutoRefresh" x:Name="togAutoRefresh"
@ -73,11 +72,10 @@
Text="{Binding Remarks}" Text="{Binding Remarks}"
TextWrapping="WrapWithOverflow" /> TextWrapping="WrapWithOverflow" />
</Grid> </Grid>
</Border> </Panel>
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ListBox> </ListBox>
</StackPanel> </Border>
</DockPanel> </DockPanel>
</UserControl> </UserControl>

4
v2rayN/v2rayN.Desktop/Views/MsgView.axaml
View file

@ -65,7 +65,7 @@
Margin="8,0" Margin="8,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsChecked="True" IsChecked="True"
Theme="{StaticResource SimpleToggleSwitch}" /> Theme="{DynamicResource SimpleToggleSwitch}" />
<TextBlock <TextBlock
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -75,7 +75,7 @@
Margin="8,0" Margin="8,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsChecked="True" IsChecked="True"
Theme="{StaticResource SimpleToggleSwitch}" /> Theme="{DynamicResource SimpleToggleSwitch}" />
</WrapPanel> </WrapPanel>
<TextBox <TextBox
Name="txtMsg" Name="txtMsg"

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

@ -114,7 +114,7 @@
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Classes="Margin8" Classes="Margin8"
SelectionMode="Multiple" SelectionMode="Multiple,Toggle"
Theme="{DynamicResource CardCheckGroupListBox}" /> Theme="{DynamicResource CardCheckGroupListBox}" />
<TextBlock <TextBlock

2
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
View file

@ -165,7 +165,7 @@
Classes="Solid Red" Classes="Solid Red"
Content="{x:Static resx:ResUI.TipActiveServer}" Content="{x:Static resx:ResUI.TipActiveServer}"
IsVisible="{Binding IsActive}" IsVisible="{Binding IsActive}"
Theme="{StaticResource TagLabel}" /> Theme="{DynamicResource TagLabel}" />
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"

4
v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
View file

@ -94,7 +94,7 @@
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Classes="Margin8" Classes="Margin8"
SelectionMode="Multiple" SelectionMode="Multiple,Toggle"
Theme="{DynamicResource CardCheckGroupListBox}" /> Theme="{DynamicResource CardCheckGroupListBox}" />
<TextBlock <TextBlock
@ -108,7 +108,7 @@
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="Margin8" Classes="Margin8"
SelectionMode="Multiple" SelectionMode="Multiple,Toggle"
Theme="{DynamicResource CardCheckGroupListBox}" /> Theme="{DynamicResource CardCheckGroupListBox}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="4"

27
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
View file

@ -18,40 +18,29 @@
<StackPanel <StackPanel
Classes="Margin8" Classes="Margin8"
DockPanel.Dock="Top" DockPanel.Dock="Top"
Orientation="Horizontal"> Orientation="Horizontal"
Spacing="4">
<Menu> <Menu>
<MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" /> <MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
<MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" /> <MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
</Menu> </Menu>
<TextBlock Margin="8,0,0,0" VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click"> <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
<TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" /> <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
</HyperlinkButton> </HyperlinkButton>
</TextBlock> </TextBlock>
<ComboBox <ComboBox x:Name="cmbdomainStrategy" Width="110" />
x:Name="cmbdomainStrategy"
Width="110"
Margin="8,0,0,0" />
<Separator /> <Separator />
<TextBlock <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbdomainMatcher}" />
Margin="8,0,0,0" <ComboBox x:Name="cmbdomainMatcher" Width="60" />
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbdomainMatcher}" />
<ComboBox
x:Name="cmbdomainMatcher"
Width="60"
Margin="8,0,0,0" />
<Separator /> <Separator />
<TextBlock Margin="8,0,0,0" VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click"> <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
<TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" /> <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
</HyperlinkButton> </HyperlinkButton>
</TextBlock> </TextBlock>
<ComboBox <ComboBox x:Name="cmbdomainStrategy4Singbox" Width="100" />
x:Name="cmbdomainStrategy4Singbox"
Width="100"
Margin="8,0,0,0" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel

2
v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
View file

@ -45,7 +45,7 @@
x:Name="togEnableTun" x:Name="togEnableTun"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Classes="Margin8" Classes="Margin8"
Theme="{StaticResource SimpleToggleSwitch}" /> Theme="{DynamicResource SimpleToggleSwitch}" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel

1
v2rayN/v2rayN/Views/CheckUpdateView.xaml
View file

@ -64,7 +64,6 @@
<DataTemplate> <DataTemplate>
<Border <Border
Width="500" Width="500"
Height="50"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
Padding="0" Padding="0"
VerticalAlignment="Center"> VerticalAlignment="Center">