mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-24 06:55:19 -07:00
Update Settings.xaml
This commit is contained in:
Niels Laute
parent
e8f50eafc9
commit
4f56251d01
1 changed files with 103 additions and 107 deletions
|
|
@ -79,121 +79,117 @@
|
||||||
Margin="0,60,0,0"
|
Margin="0,60,0,0"
|
||||||
Padding="24,0,24,16"
|
Padding="24,0,24,16"
|
||||||
Style="{StaticResource SettingsContentScrollViewStyle}">
|
Style="{StaticResource SettingsContentScrollViewStyle}">
|
||||||
<Grid>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition MaxWidth="1000"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Vertical" Spacing="{StaticResource SettingsCardSpacing}">
|
<StackPanel Orientation="Vertical" Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
<StackPanel.ChildrenTransitions>
|
<StackPanel.ChildrenTransitions>
|
||||||
<EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True"/>
|
<EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True"/>
|
||||||
</StackPanel.ChildrenTransitions>
|
<RepositionThemeTransition IsStaggeringEnabled="False"/>
|
||||||
<TextBlock x:Uid="SettingsAppearance"
|
</StackPanel.ChildrenTransitions>
|
||||||
Style="{StaticResource SettingsCategoryTitleTextBlockStyle}"
|
<TextBlock x:Uid="SettingsAppearance"
|
||||||
AutomationProperties.HeadingLevel="Level1"/>
|
Style="{StaticResource SettingsCategoryTitleTextBlockStyle}"
|
||||||
<labs:SettingsExpander x:Name="AppThemeExpander"
|
AutomationProperties.HeadingLevel="Level1"/>
|
||||||
Description="Select which app theme to display"
|
<labs:SettingsExpander x:Name="AppThemeExpander"
|
||||||
Header="App theme">
|
Description="Select which app theme to display"
|
||||||
<labs:SettingsExpander.HeaderIcon>
|
Header="App theme">
|
||||||
<FontIcon Glyph=""/>
|
<labs:SettingsExpander.HeaderIcon>
|
||||||
</labs:SettingsExpander.HeaderIcon>
|
<FontIcon Glyph=""/>
|
||||||
<labs:SettingsExpander.Items>
|
</labs:SettingsExpander.HeaderIcon>
|
||||||
<labs:SettingsCard ContentAlignment="Left">
|
<labs:SettingsExpander.Items>
|
||||||
<muxc:RadioButtons x:Name="ThemeRadioButtons"
|
<labs:SettingsCard ContentAlignment="Left">
|
||||||
Margin="0,-8,0,0"
|
<muxc:RadioButtons x:Name="ThemeRadioButtons"
|
||||||
SelectionChanged="OnThemeSelectionChanged">
|
Margin="0,-8,0,0"
|
||||||
<RadioButton x:Name="LightThemeRadioButton"
|
SelectionChanged="OnThemeSelectionChanged">
|
||||||
x:Uid="LightThemeRadioButton"
|
<RadioButton x:Name="LightThemeRadioButton"
|
||||||
Tag="Light"/>
|
x:Uid="LightThemeRadioButton"
|
||||||
<RadioButton x:Name="DarkThemeRadioButton"
|
Tag="Light"/>
|
||||||
x:Uid="DarkThemeRadioButton"
|
<RadioButton x:Name="DarkThemeRadioButton"
|
||||||
Tag="Dark"/>
|
x:Uid="DarkThemeRadioButton"
|
||||||
<RadioButton x:Name="SystemThemeRadioButton"
|
Tag="Dark"/>
|
||||||
x:Uid="SystemThemeRadioButton"
|
<RadioButton x:Name="SystemThemeRadioButton"
|
||||||
Tag="Default"/>
|
x:Uid="SystemThemeRadioButton"
|
||||||
</muxc:RadioButtons>
|
Tag="Default"/>
|
||||||
</labs:SettingsCard>
|
</muxc:RadioButtons>
|
||||||
</labs:SettingsExpander.Items>
|
</labs:SettingsCard>
|
||||||
</labs:SettingsExpander>
|
</labs:SettingsExpander.Items>
|
||||||
|
</labs:SettingsExpander>
|
||||||
|
|
||||||
<TextBlock x:Name="AboutGroupTitle"
|
<TextBlock x:Name="AboutGroupTitle"
|
||||||
x:Uid="AboutGroupTitle"
|
x:Uid="AboutGroupTitle"
|
||||||
Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}"
|
Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}"
|
||||||
AutomationProperties.HeadingLevel="Level1"/>
|
AutomationProperties.HeadingLevel="Level1"/>
|
||||||
<labs:SettingsExpander x:Name="AboutExpander">
|
<labs:SettingsExpander x:Name="AboutExpander">
|
||||||
<labs:SettingsExpander.HeaderIcon>
|
<labs:SettingsExpander.HeaderIcon>
|
||||||
<BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
|
<BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
|
||||||
</labs:SettingsExpander.HeaderIcon>
|
</labs:SettingsExpander.HeaderIcon>
|
||||||
<TextBlock x:Name="AboutBuildVersion"
|
<TextBlock x:Name="AboutBuildVersion"
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
||||||
IsTextSelectionEnabled="True"/>
|
IsTextSelectionEnabled="True"/>
|
||||||
<labs:SettingsExpander.Items>
|
<labs:SettingsExpander.Items>
|
||||||
<labs:SettingsCard ContentAlignment="Left">
|
<labs:SettingsCard ContentAlignment="Left">
|
||||||
<StackPanel Margin="0,4,0,6"
|
<StackPanel Margin="0,4,0,6"
|
||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
Spacing="12">
|
Spacing="12">
|
||||||
|
|
||||||
<HyperlinkButton x:Name="AboutEULA"
|
<HyperlinkButton x:Name="AboutEULA"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
|
NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
|
||||||
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
|
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
|
||||||
<TextBlock x:Uid="AboutEULA"
|
<TextBlock x:Uid="AboutEULA"
|
||||||
FontSize="{ThemeResource BodyFontSize}"
|
FontSize="{ThemeResource BodyFontSize}"
|
||||||
TextWrapping="Wrap"/>
|
TextWrapping="Wrap"/>
|
||||||
</HyperlinkButton>
|
</HyperlinkButton>
|
||||||
|
|
||||||
<HyperlinkButton x:Name="AboutControlServicesAgreement"
|
<HyperlinkButton x:Name="AboutControlServicesAgreement"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
|
NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
|
||||||
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
|
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
|
||||||
<TextBlock x:Uid="AboutControlServicesAgreement"
|
<TextBlock x:Uid="AboutControlServicesAgreement"
|
||||||
FontSize="{ThemeResource BodyFontSize}"
|
FontSize="{ThemeResource BodyFontSize}"
|
||||||
TextWrapping="Wrap"/>
|
TextWrapping="Wrap"/>
|
||||||
</HyperlinkButton>
|
</HyperlinkButton>
|
||||||
|
|
||||||
<HyperlinkButton x:Name="AboutControlPrivacyStatement"
|
<HyperlinkButton x:Name="AboutControlPrivacyStatement"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
|
NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
|
||||||
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
|
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
|
||||||
<TextBlock x:Uid="AboutControlPrivacyStatement"
|
<TextBlock x:Uid="AboutControlPrivacyStatement"
|
||||||
FontSize="{ThemeResource BodyFontSize}"
|
FontSize="{ThemeResource BodyFontSize}"
|
||||||
TextWrapping="Wrap"/>
|
TextWrapping="Wrap"/>
|
||||||
</HyperlinkButton>
|
</HyperlinkButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</labs:SettingsCard>
|
</labs:SettingsCard>
|
||||||
</labs:SettingsExpander.Items>
|
</labs:SettingsExpander.Items>
|
||||||
</labs:SettingsExpander>
|
</labs:SettingsExpander>
|
||||||
|
|
||||||
<HyperlinkButton x:Name="FeedbackButton"
|
<HyperlinkButton x:Name="FeedbackButton"
|
||||||
x:Uid="FeedbackButton"
|
x:Uid="FeedbackButton"
|
||||||
MinWidth="120"
|
MinWidth="120"
|
||||||
Margin="-12,4,0,0"
|
Margin="-12,4,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
FontSize="{StaticResource BodyFontSize}"
|
FontSize="{StaticResource BodyFontSize}"
|
||||||
Click="FeedbackButton_Click"/>
|
Click="FeedbackButton_Click"/>
|
||||||
|
|
||||||
<RichTextBlock x:Name="AboutContribute"
|
<RichTextBlock x:Name="AboutContribute"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
Margin="1,9,0,0"
|
Margin="1,9,0,0"
|
||||||
Style="{StaticResource SettingsRichTextBlockStyle}">
|
Style="{StaticResource SettingsRichTextBlockStyle}">
|
||||||
<Paragraph>
|
<Paragraph>
|
||||||
<!--
|
<!--
|
||||||
Note: don't put Hyperlink element start to the next line
|
Note: don't put Hyperlink element start to the next line
|
||||||
otherwise unexpected whitespace will be add.
|
otherwise unexpected whitespace will be add.
|
||||||
-->
|
-->
|
||||||
<Run x:Name="ContributeRunBeforeLink"/><Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
|
<Run x:Name="ContributeRunBeforeLink"/><Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
|
||||||
NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
|
NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
|
||||||
TextDecorations="None"
|
TextDecorations="None"
|
||||||
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
|
ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
|
||||||
UnderlineStyle="None">
|
UnderlineStyle="None">
|
||||||
<Run x:Name="ContributeRunLink"/>
|
<Run x:Name="ContributeRunLink"/>
|
||||||
</Hyperlink><Run x:Name="ContributeRunAfterLink"/>
|
</Hyperlink><Run x:Name="ContributeRunAfterLink"/>
|
||||||
</Paragraph>
|
</Paragraph>
|
||||||
</RichTextBlock>
|
</RichTextBlock>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue