Skip to content

Commit ad74b15

Browse files
2dust2dust
committed
Refactor dialog layouts
1 parent 514d769 commit ad74b15

6 files changed

Lines changed: 20 additions & 47 deletions

File tree

‎v2rayN/v2rayN.Desktop/Views/MainWindow.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
<MenuItem x:Name="menuOpenTheFileLocation" Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
9191
</MenuItem>
9292

93-
<MenuItem x:Name="menuReload" Header="{x:Static resx:ResUI.menuReload}" />
94-
9593
<MenuItem x:Name="menuHelp" Header="{x:Static resx:ResUI.menuHelp}">
9694
<MenuItem x:Name="menuCheckUpdate" Header="{x:Static resx:ResUI.menuCheckUpdate}" />
9795
<Separator />
9896
</MenuItem>
9997

98+
<MenuItem x:Name="menuReload" Header="{x:Static resx:ResUI.menuReload}" />
99+
100100
<MenuItem x:Name="menuPromotion" Header="{x:Static resx:ResUI.menuPromotion}" />
101101

102102
<MenuItem x:Name="menuClose" Header="{x:Static resx:ResUI.menuExit}" />

‎v2rayN/v2rayN/Views/BackupAndRestoreView.xaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<reactiveui:ReactiveUserControl
1+
<reactiveui:ReactiveUserControl
22
x:Class="v2rayN.Views.BackupAndRestoreView"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -23,15 +23,6 @@
2323
</UserControl.Resources>
2424
<DockPanel Margin="{StaticResource Margin8}">
2525
<DockPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
26-
<Button
27-
Width="100"
28-
Margin="{StaticResource Margin8}"
29-
Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
30-
Content="{x:Static resx:ResUI.menuClose}"
31-
DockPanel.Dock="Right"
32-
IsCancel="True"
33-
Style="{StaticResource DefButton}" />
34-
3526
<TextBlock
3627
x:Name="txtMsg"
3728
Margin="{StaticResource Margin8}"
@@ -252,4 +243,4 @@
252243
</materialDesign:Card>
253244
</StackPanel>
254245
</DockPanel>
255-
</reactiveui:ReactiveUserControl>
246+
</reactiveui:ReactiveUserControl>

‎v2rayN/v2rayN/Views/CheckUpdateView.xaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<reactiveui:ReactiveUserControl
1+
<reactiveui:ReactiveUserControl
22
x:Class="v2rayN.Views.CheckUpdateView"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -39,15 +39,6 @@
3939
Content="{x:Static resx:ResUI.menuCheckUpdate}"
4040
IsDefault="True"
4141
Style="{StaticResource DefButton}" />
42-
43-
<Button
44-
Width="100"
45-
Margin="{StaticResource Margin8}"
46-
HorizontalAlignment="Right"
47-
Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
48-
Content="{x:Static resx:ResUI.menuClose}"
49-
IsCancel="True"
50-
Style="{StaticResource DefButton}" />
5142
</StackPanel>
5243

5344
<StackPanel>
@@ -99,4 +90,4 @@
9990
</ListView>
10091
</StackPanel>
10192
</DockPanel>
102-
</reactiveui:ReactiveUserControl>
93+
</reactiveui:ReactiveUserControl>

‎v2rayN/v2rayN/Views/MainWindow.xaml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
<materialDesign:DialogHost
3434
materialDesign:TransitionAssist.DisableTransitions="True"
35+
CloseOnClickAway="True"
3536
Identifier="RootDialog"
3637
SnackbarMessageQueue="{Binding ElementName=MainSnackbar, Path=MessageQueue}"
3738
Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
@@ -233,37 +234,37 @@
233234
<Separator />
234235
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
235236
<MenuItem
236-
x:Name="menuReload"
237+
x:Name="menuHelp"
237238
Padding="{StaticResource MarginLeftRight8}"
238-
AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
239+
AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
239240
<MenuItem.Header>
240241
<StackPanel Orientation="Horizontal">
241242
<materialDesign:PackIcon
242243
Margin="{StaticResource MarginRight8}"
243244
VerticalAlignment="Center"
244-
Kind="Reload" />
245-
<TextBlock Text="{x:Static resx:ResUI.menuReload}" />
245+
Kind="HelpCircleOutline" />
246+
<TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
246247
</StackPanel>
247248
</MenuItem.Header>
249+
<MenuItem x:Name="menuCheckUpdate" Header="{x:Static resx:ResUI.menuCheckUpdate}" />
250+
<Separator Margin="-40,5" />
248251
</MenuItem>
249252
</Menu>
250253
<Separator />
251254
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
252255
<MenuItem
253-
x:Name="menuHelp"
256+
x:Name="menuReload"
254257
Padding="{StaticResource MarginLeftRight8}"
255-
AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
258+
AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
256259
<MenuItem.Header>
257260
<StackPanel Orientation="Horizontal">
258261
<materialDesign:PackIcon
259262
Margin="{StaticResource MarginRight8}"
260263
VerticalAlignment="Center"
261-
Kind="HelpCircleOutline" />
262-
<TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
264+
Kind="Reload" />
265+
<TextBlock Text="{x:Static resx:ResUI.menuReload}" />
263266
</StackPanel>
264267
</MenuItem.Header>
265-
<MenuItem x:Name="menuCheckUpdate" Header="{x:Static resx:ResUI.menuCheckUpdate}" />
266-
<Separator Margin="-40,5" />
267268
</MenuItem>
268269
</Menu>
269270
<Separator />

‎v2rayN/v2rayN/Views/QrcodeView.xaml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,7 @@
1515
<sys:Double x:Key="QrcodeWidth">400</sys:Double>
1616
</UserControl.Resources>
1717

18-
<DockPanel Margin="{StaticResource Margin8}">
19-
<StackPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
20-
<Button
21-
Width="100"
22-
HorizontalAlignment="Right"
23-
Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
24-
Content="{x:Static resx:ResUI.menuClose}"
25-
IsCancel="True"
26-
IsDefault="True"
27-
Style="{StaticResource DefButton}" />
28-
</StackPanel>
29-
18+
<StackPanel Margin="{StaticResource Margin8}">
3019
<Grid Margin="{StaticResource Margin8}">
3120
<Grid.RowDefinitions>
3221
<RowDefinition Height="Auto" />
@@ -51,5 +40,5 @@
5140
TextWrapping="Wrap"
5241
VerticalScrollBarVisibility="Auto" />
5342
</Grid>
54-
</DockPanel>
43+
</StackPanel>
5544
</UserControl>

‎v2rayN/v2rayN/Views/SubSettingWindow.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
mc:Ignorable="d">
2121
<materialDesign:DialogHost
2222
materialDesign:TransitionAssist.DisableTransitions="True"
23+
CloseOnClickAway="True"
2324
Identifier="SubDialog"
2425
Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
2526
<DockPanel>

0 commit comments

Comments
 (0)