|
693 | 693 | </ItemsControl>
|
694 | 694 | </Border>
|
695 | 695 |
|
696 |
| - <Border |
| 696 | + <Border |
697 | 697 | Margin="0,30,0,0"
|
698 | 698 | Padding="0"
|
699 | 699 | Style="{DynamicResource SettingGroupBox}">
|
|
720 | 720 | <ComboBox
|
721 | 721 | x:Name="SelectScreen"
|
722 | 722 | MinWidth="160"
|
723 |
| - Margin="0,0,18,0" |
| 723 | + Margin="0,0,18,0" |
724 | 724 | VerticalAlignment="Center"
|
725 | 725 | FontSize="14"
|
726 | 726 | ItemsSource="{Binding ScreenNumbers}"
|
|
738 | 738 | </ComboBox>
|
739 | 739 | </StackPanel>
|
740 | 740 | <TextBlock Style="{StaticResource Glyph}">
|
741 |
| -  |
| 741 | +  |
742 | 742 | </TextBlock>
|
743 | 743 | </ItemsControl>
|
744 | 744 | </Border>
|
745 | 745 |
|
746 |
| - <Separator |
747 |
| - Width="Auto" |
748 |
| - BorderThickness="1"> |
| 746 | + <Separator Width="Auto" BorderThickness="1"> |
749 | 747 | <Separator.Style>
|
750 | 748 | <Style BasedOn="{StaticResource SettingSeparatorStyle}" TargetType="Separator">
|
751 | 749 | <Setter Property="Visibility" Value="Visible" />
|
|
758 | 756 | </Separator.Style>
|
759 | 757 | </Separator>
|
760 | 758 |
|
761 |
| - <Border |
762 |
| - Margin="0" |
763 |
| - BorderThickness="0"> |
| 759 | + <Border Margin="0" BorderThickness="0"> |
764 | 760 | <Border.Style>
|
765 | 761 | <Style BasedOn="{StaticResource SettingGroupBox}" TargetType="Border">
|
766 | 762 | <Setter Property="Visibility" Value="Visible" />
|
|
786 | 782 | FontSize="14"
|
787 | 783 | ItemsSource="{Binding SearchWindowAligns}"
|
788 | 784 | SelectedValue="{Binding Settings.SearchWindowAlign}"
|
789 |
| - SelectedValuePath="Value"> |
790 |
| - </ComboBox> |
| 785 | + SelectedValuePath="Value" /> |
791 | 786 | <StackPanel Margin="0,0,18,0" Orientation="Horizontal">
|
792 | 787 | <StackPanel.Style>
|
793 | 788 | <Style TargetType="StackPanel">
|
|
817 | 812 | </StackPanel>
|
818 | 813 | </StackPanel>
|
819 | 814 | <TextBlock Style="{StaticResource Glyph}">
|
820 |
| -  |
| 815 | +  |
821 | 816 | </TextBlock>
|
822 | 817 | </ItemsControl>
|
823 | 818 | </Border>
|
|
3014 | 3009 | TextAlignment="left" />
|
3015 | 3010 |
|
3016 | 3011 |
|
3017 |
| - <Border Margin="0,9,0,0" Style="{DynamicResource SettingGroupBox}"> |
| 3012 | + <Border |
| 3013 | + Margin="0,9,0,0" |
| 3014 | + CornerRadius="8 8 0 0" |
| 3015 | + Style="{DynamicResource SettingGroupBox}"> |
3018 | 3016 | <ItemsControl Style="{StaticResource SettingGrid}">
|
3019 | 3017 | <StackPanel Style="{StaticResource TextPanel}">
|
3020 | 3018 | <TextBlock
|
|
3026 | 3024 | <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource version}" />
|
3027 | 3025 | </StackPanel>
|
3028 | 3026 | <StackPanel Grid.Column="2" Orientation="Horizontal">
|
3029 |
| - <Button |
3030 |
| - Margin="0,0,10,0" |
3031 |
| - HorizontalAlignment="Right" |
3032 |
| - Click="OnCheckUpdates" |
3033 |
| - Content="{DynamicResource checkUpdates}" /> |
3034 | 3027 | <Button
|
3035 | 3028 | Margin="0,0,14,0"
|
3036 | 3029 | Padding="0"
|
|
3054 | 3047 | </ItemsControl>
|
3055 | 3048 | </Border>
|
3056 | 3049 |
|
| 3050 | + |
| 3051 | + <Border |
| 3052 | + Margin="0,0,0,8" |
| 3053 | + CornerRadius="0 0 8 8" |
| 3054 | + Style="{DynamicResource SettingGroupBox}"> |
| 3055 | + <ItemsControl Style="{StaticResource SettingGrid}"> |
| 3056 | + <StackPanel Style="{StaticResource TextPanel}"> |
| 3057 | + <TextBlock |
| 3058 | + Grid.Column="1" |
| 3059 | + VerticalAlignment="Center" |
| 3060 | + Style="{DynamicResource SettingTitleLabel}" |
| 3061 | + Text="Update Source" /> |
| 3062 | + </StackPanel> |
| 3063 | + <StackPanel Grid.Column="2" Orientation="Horizontal"> |
| 3064 | + <ComboBox Margin="0,0,8,0" SelectedIndex="0"> |
| 3065 | + <ComboBoxItem>Release</ComboBoxItem> |
| 3066 | + <ComboBoxItem>Preview</ComboBoxItem> |
| 3067 | + </ComboBox> |
| 3068 | + <Button |
| 3069 | + Margin="0,0,14,0" |
| 3070 | + HorizontalAlignment="Right" |
| 3071 | + Click="OnCheckUpdates" |
| 3072 | + Content="{DynamicResource checkUpdates}" /> |
| 3073 | + </StackPanel> |
| 3074 | + <TextBlock Width="50" Style="{StaticResource Glyph}" /> |
| 3075 | + </ItemsControl> |
| 3076 | + </Border> |
| 3077 | + |
3057 | 3078 | <Border Height="62" Style="{DynamicResource SettingGroupBox}">
|
3058 | 3079 | <ItemsControl Style="{StaticResource SettingGrid}">
|
3059 | 3080 | <StackPanel Style="{StaticResource TextPanel}">
|
|
0 commit comments