|
14 | 14 | <Design.DataContext> |
15 | 15 | <vm:SettingPageViewModel /> |
16 | 16 | </Design.DataContext> |
17 | | - <UserControl.Styles> |
18 | | - <Style Selector="ComboBox.ListFontAll"> |
19 | | - <Setter Property="ItemsSource" Value="{Binding SystemFontList}" /> |
20 | | - </Style> |
21 | | - <Style Selector="ComboBox.ListFontMono"> |
22 | | - <Setter Property="ItemsSource" Value="{Binding MonoFontList}" /> |
23 | | - </Style> |
24 | | - </UserControl.Styles> |
25 | 17 | <TabControl> |
26 | 18 | <TabItem Header="常规设置"> |
27 | 19 | <ScrollViewer Background="{DynamicResource SemiGrey0}"> |
|
33 | 25 | <TabItem Header="外观与字体" IsSelected="True"> |
34 | 26 | <ScrollViewer Background="{DynamicResource SemiGrey0}"> |
35 | 27 | <StackPanel Margin="10" Spacing="5"> |
36 | | - <CheckBox |
37 | | - Margin="5,5,5,0" |
38 | | - Command="{Binding RefreshFontIndexCommand}" |
39 | | - Content="限制使用等宽字体" |
40 | | - IsChecked="{Binding UseMonoFont}" /> |
41 | | - <Separator Margin="0,10" /> |
42 | 28 | <Grid |
43 | 29 | Margin="5,0" |
44 | 30 | ColumnDefinitions="*, 250" |
|
52 | 38 | Grid.Row="0" |
53 | 39 | Grid.Column="1" |
54 | 40 | Width="250" |
55 | | - Classes.ListFontAll="{Binding !UseMonoFont}" |
56 | | - Classes.ListFontMono="{Binding UseMonoFont}" |
| 41 | + ItemsSource="{Binding SystemFontList}" |
57 | 42 | SelectedIndex="{Binding PacketFontIndex}" |
58 | 43 | SelectedItem="{Binding PacketFontFamily, Source={x:Static services:Utils.Setting}}"> |
59 | 44 | <ComboBox.ItemTemplate> |
|
71 | 56 | Grid.Row="2" |
72 | 57 | Grid.Column="1" |
73 | 58 | Width="250" |
74 | | - Classes.ListFontAll="{Binding !UseMonoFont}" |
75 | | - Classes.ListFontMono="{Binding UseMonoFont}" |
| 59 | + ItemsSource="{Binding SystemFontList}" |
76 | 60 | SelectedIndex="{Binding PacketHexFontIndex}" |
77 | 61 | SelectedItem="{Binding PacketHexFontFamily, Source={x:Static services:Utils.Setting}}"> |
78 | 62 | <ComboBox.ItemTemplate> |
|
90 | 74 | Grid.Row="4" |
91 | 75 | Grid.Column="1" |
92 | 76 | Width="250" |
93 | | - Classes.ListFontAll="{Binding !UseMonoFont}" |
94 | | - Classes.ListFontMono="{Binding UseMonoFont}" |
| 77 | + ItemsSource="{Binding SystemFontList}" |
95 | 78 | SelectedIndex="{Binding PacketHeaderFontIndex}" |
96 | 79 | SelectedItem="{Binding PacketHeaderFontFamily, Source={x:Static services:Utils.Setting}}"> |
97 | 80 | <ComboBox.ItemTemplate> |
|
109 | 92 | Grid.Row="6" |
110 | 93 | Grid.Column="1" |
111 | 94 | Width="250" |
112 | | - Classes.ListFontAll="{Binding !UseMonoFont}" |
113 | | - Classes.ListFontMono="{Binding UseMonoFont}" |
| 95 | + ItemsSource="{Binding SystemFontList}" |
114 | 96 | SelectedIndex="{Binding PacketExtraFontIndex}" |
115 | 97 | SelectedItem="{Binding PacketExtraFontFamily, Source={x:Static services:Utils.Setting}}"> |
116 | 98 | <ComboBox.ItemTemplate> |
|
0 commit comments