Skip to content

Commit 1a89347

Browse files
wtcpythonwtcpython
committed
统一设置中的各个 Page
1 parent c0e10a6 commit 1a89347

File tree

7 files changed

+91
-94
lines changed

7 files changed

+91
-94
lines changed

‎Settings/About.xaml‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,50 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
11-
<StackPanel Spacing="5" Margin="10">
12-
<controls:SettingsCard
13-
Header="WebView2"
14-
Description="{x:Bind webViewVersion}">
15-
<Button
16-
Content="复制"
17-
Click="CopyWebViewVersion" />
18-
</controls:SettingsCard>
11+
<ScrollView>
12+
<StackPanel Spacing="5" Margin="10">
13+
<controls:SettingsCard
14+
Header="WebView2"
15+
Description="{x:Bind webViewVersion}">
16+
<Button
17+
Content="复制"
18+
Click="CopyWebViewVersion" />
19+
</controls:SettingsCard>
1920

20-
<controls:SettingsCard
21-
Header="应用程序版本"
22-
Description="{x:Bind appVersion}"
23-
Click="CheckUpdate"
24-
IsClickEnabled="True"
25-
IsActionIconVisible="False">
26-
<Button
27-
Content="复制"
28-
Click="CopyAppVersion" />
29-
</controls:SettingsCard>
21+
<controls:SettingsCard
22+
Header="应用程序版本"
23+
Description="{x:Bind appVersion}"
24+
Click="CheckUpdate"
25+
IsClickEnabled="True"
26+
IsActionIconVisible="False">
27+
<Button
28+
Content="复制"
29+
Click="CopyAppVersion" />
30+
</controls:SettingsCard>
3031

31-
<controls:SettingsCard
32-
Header="GitHub 仓库"
33-
Click="OpenRepoWebsite"
34-
IsClickEnabled="True">
35-
<controls:SettingsCard.ActionIcon>
36-
<FontIcon Glyph="&#xE8A7;" />
37-
</controls:SettingsCard.ActionIcon>
38-
</controls:SettingsCard>
32+
<controls:SettingsCard
33+
Header="GitHub 仓库"
34+
Click="OpenRepoWebsite"
35+
IsClickEnabled="True">
36+
<controls:SettingsCard.ActionIcon>
37+
<FontIcon Glyph="&#xE8A7;" />
38+
</controls:SettingsCard.ActionIcon>
39+
</controls:SettingsCard>
3940

40-
<controls:SettingsExpander
41-
Header="开源及第三方软件"
42-
ItemsSource="{x:Bind OpenSources}">
43-
<controls:SettingsExpander.ItemTemplate>
44-
<DataTemplate x:DataType="local:OpenSource">
45-
<HyperlinkButton
41+
<controls:SettingsExpander
42+
Header="开源及第三方软件"
43+
ItemsSource="{x:Bind OpenSources}">
44+
<controls:SettingsExpander.ItemTemplate>
45+
<DataTemplate x:DataType="local:OpenSource">
46+
<HyperlinkButton
4647
Content="{x:Bind Name}"
4748
NavigateUri="{x:Bind Uri}"
4849
ToolTipService.ToolTip="{x:Bind Uri}"
4950
Margin="5" />
50-
</DataTemplate>
51-
</controls:SettingsExpander.ItemTemplate>
52-
</controls:SettingsExpander>
53-
</StackPanel>
51+
</DataTemplate>
52+
</controls:SettingsExpander.ItemTemplate>
53+
</controls:SettingsExpander>
54+
</StackPanel>
55+
</ScrollView>
56+
5457
</Page>

‎Settings/AppearanceItem.xaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
1111
<ScrollView>
12-
13-
<StackPanel Spacing="10" Margin="15">
12+
<StackPanel Spacing="5" Margin="10">
1413
<controls:SettingsCard
1514
Header="整体外观"
1615
Description="适用于新的选项卡、页面、对话框和其他菜单。">
@@ -66,6 +65,5 @@
6665
</ItemsControl.ItemTemplate>
6766
</ItemsControl>
6867
</StackPanel>
69-
7068
</ScrollView>
7169
</Page>

‎Settings/DownloadItem.xaml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,25 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
11-
<StackPanel Spacing="10" Margin="15">
11+
<ScrollView>
12+
<StackPanel Spacing="5" Margin="10">
13+
<controls:SettingsCard
14+
x:Name="DownloadFolderCard"
15+
Header="位置">
16+
<Button Name="setFolderButton" Content="更改" Click="ChangeDownloadFolder"/>
17+
</controls:SettingsCard>
1218

13-
<controls:SettingsCard
14-
x:Name="DownloadFolderCard"
15-
Header="位置">
16-
<Button Name="setFolderButton" Content="更改" Click="ChangeDownloadFolder"/>
17-
</controls:SettingsCard>
18-
19-
<controls:SettingsCard
20-
Header="每次下载都询问我该做些什么"
21-
Description="始终询问我是要保存文件还是打开它而不保存">
22-
<ToggleSwitch Name="setDownloadBehavior" Toggled="DownloadBehaviorChanged"/>
23-
</controls:SettingsCard>
24-
25-
<controls:SettingsCard
26-
Header="下载开始时显示下载菜单"
27-
Description="关闭此设置会使人更难知道文件何时开始下载">
28-
<ToggleSwitch Name="setDownloadFlyout" Toggled="ShowFlyoutChanged"/>
29-
</controls:SettingsCard>
30-
31-
</StackPanel>
19+
<controls:SettingsCard
20+
Header="每次下载都询问我该做些什么"
21+
Description="始终询问我是要保存文件还是打开它而不保存">
22+
<ToggleSwitch Name="setDownloadBehavior" Toggled="DownloadBehaviorChanged"/>
23+
</controls:SettingsCard>
3224

25+
<controls:SettingsCard
26+
Header="下载开始时显示下载菜单"
27+
Description="关闭此设置会使人更难知道文件何时开始下载">
28+
<ToggleSwitch Name="setDownloadFlyout" Toggled="ShowFlyoutChanged"/>
29+
</controls:SettingsCard>
30+
</StackPanel>
31+
</ScrollView>
3332
</Page>

‎Settings/PrinterItem.xaml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,19 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
11-
<StackPanel Spacing="10" Margin="15">
11+
<ScrollView>
12+
<StackPanel Spacing="5" Margin="10">
13+
14+
<controls:SettingsCard
15+
Header="管理打印机"
16+
Click="OpenSettingsPrinter"
17+
IsClickEnabled="True">
18+
<controls:SettingsCard.ActionIcon>
19+
<FontIcon Glyph="&#xE8A7;" />
20+
</controls:SettingsCard.ActionIcon>
21+
</controls:SettingsCard>
22+
</StackPanel>
23+
</ScrollView>
1224

13-
<controls:SettingsCard
14-
Header="管理打印机"
15-
Click="OpenSettingsPrinter"
16-
IsClickEnabled="True">
17-
<controls:SettingsCard.ActionIcon>
18-
<FontIcon Glyph="&#xE8A7;" />
19-
</controls:SettingsCard.ActionIcon>
20-
</controls:SettingsCard>
21-
</StackPanel>
2225

2326
</Page>

‎Settings/PrivacyItem.xaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
1111
<ScrollView>
12-
13-
<StackPanel Spacing="10" Margin="15">
12+
<StackPanel Spacing="5" Margin="10">
1413
<TextBlock Text="防止跟踪" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Margin="0,10,0,0"/>
1514

1615
<TextBlock TextWrapping="WrapWholeWords">
@@ -59,7 +58,7 @@
5958
x:Name="ClearBrowsingDataButton"
6059
Header="选择每次关闭浏览器时要清除的内容"
6160
ItemsSource="{x:Bind BrowserDataKindList}">
62-
61+
6362
<controls:SettingsExpander.ItemTemplate>
6463
<DataTemplate x:DataType="local:BrowserDataKind">
6564
<controls:SettingsCard Header="{x:Bind Name}">
@@ -74,13 +73,12 @@
7473
<TextBlock TextWrapping="WrapWholeWords">
7574
管理 Edge 的安全设置
7675
</TextBlock>
77-
76+
7877
<controls:SettingsCard
7978
Header="Microsoft Defender Smartscreen"
8079
Description="使用 Microsoft Defender SmartScreen 帮助我抵御恶意网站和下载的侵害">
8180
<ToggleSwitch Name="msSmartScreen" Toggled="SmartScreenChanged"/>
8281
</controls:SettingsCard>
8382
</StackPanel>
84-
8583
</ScrollView>
8684
</Page>

‎Settings/ResetItem.xaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
11-
<StackPanel Spacing="10" Margin="15">
12-
13-
<controls:SettingsCard
14-
Header="将设置还原为默认值"
15-
Click="ResetUserSettings"
16-
IsClickEnabled="True">
17-
<controls:SettingsCard.ActionIcon>
18-
<FontIcon Glyph="&#xE8A7;" />
19-
</controls:SettingsCard.ActionIcon>
20-
</controls:SettingsCard>
21-
22-
<ContentDialog Name="resetDialog" Title="重置设置" CloseButtonText="取消" PrimaryButtonText="重置">
23-
<TextBlock TextWrapping="Wrap">此操作将重置启动页面、新选项卡页、搜索引擎和固定的选项卡。它还将禁用所有扩展并清除 Cookie 等临时数据。收藏夹、历史记录和保存的密码不会被清除。</TextBlock>
24-
</ContentDialog>
25-
</StackPanel>
11+
<ScrollView>
12+
<StackPanel Spacing="5" Margin="10">
13+
<controls:SettingsCard
14+
Header="将设置还原为默认值"
15+
Click="ResetUserSettings"
16+
IsClickEnabled="True">
17+
<controls:SettingsCard.ActionIcon>
18+
<FontIcon Glyph="&#xE8A7;" />
19+
</controls:SettingsCard.ActionIcon>
20+
</controls:SettingsCard>
2621

22+
<ContentDialog Name="resetDialog" Title="重置设置" CloseButtonText="取消" PrimaryButtonText="重置">
23+
<TextBlock TextWrapping="Wrap">此操作将重置启动页面、新选项卡页、搜索引擎和固定的选项卡。它还将禁用所有扩展并清除 Cookie 等临时数据。收藏夹、历史记录和保存的密码不会被清除。</TextBlock>
24+
</ContentDialog>
25+
</StackPanel>
26+
</ScrollView>
2727
</Page>

‎Settings/StartItem.xaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
1111
<ScrollView>
12-
13-
<StackPanel Spacing="10" Margin="20">
14-
12+
<StackPanel Spacing="5" Margin="10">
1513
<TextBlock Text="Edge 启动时" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Margin="5,10,0,0"/>
1614

1715
<Grid Background="{ThemeResource CardBackgroundFillColorDefault}"
@@ -67,8 +65,6 @@
6765
</controls:SettingsExpander.Items>
6866

6967
</controls:SettingsExpander>
70-
7168
</StackPanel>
72-
7369
</ScrollView>
7470
</Page>

0 commit comments

Comments
 (0)