github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 06:13:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Settings page is redesigned.

Browse source 
Its a kind of diss to Pull Request #1964 😄
This commit is contained in:
Suleyman Poyraz 2023-03-04 23:37:56 +03:00
commit f1f61dfff6
7 changed files with 116 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Calculator/Resources/en-GB/Resources.resw
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -2321,6 +2321,14 @@
<value>To learn how you can contribute to Windows Calculator, check out the project on %HL%GitHub%HL%.</value> <value>To learn how you can contribute to Windows Calculator, check out the project on %HL%GitHub%HL%.</value>
<comment>{Locked="%HL%GitHub%HL%"}. GitHub link, Displayed on the About panel</comment> <comment>{Locked="%HL%GitHub%HL%"}. GitHub link, Displayed on the About panel</comment>
</data> </data>
<data name="AboutCalculator.Text" xml:space="preserve">
<value>About Calculator</value>
<comment>Title of about information expander.</comment>
</data>
<data name="LearnMoreAboutCalculator.Text" xml:space="preserve">
<value>Learn more about Windows Calculator</value>
<comment>Label of about information expander.</comment>
</data>
<data name="AboutGroupTitle.Text" xml:space="preserve"> <data name="AboutGroupTitle.Text" xml:space="preserve">
<value>About</value> <value>About</value>
<comment>Subtitle of about message on Settings page</comment> <comment>Subtitle of about message on Settings page</comment>

8
src/Calculator/Resources/en-US/Resources.resw
View file

@ -2721,6 +2721,14 @@
<value>To learn how you can contribute to Windows Calculator, check out the project on %HL%GitHub%HL%.</value> <value>To learn how you can contribute to Windows Calculator, check out the project on %HL%GitHub%HL%.</value>
<comment>{Locked="%HL%GitHub%HL%"}. GitHub link, Displayed on the About panel</comment> <comment>{Locked="%HL%GitHub%HL%"}. GitHub link, Displayed on the About panel</comment>
</data> </data>
<data name="AboutCalculator.Text" xml:space="preserve">
<value>About Calculator</value>
<comment>Title of about information expander.</comment>
</data>
<data name="LearnMoreAboutCalculator.Text" xml:space="preserve">
<value>Learn more about Windows Calculator</value>
<comment>Label of about information expander.</comment>
</data>
<data name="AboutGroupTitle.Text" xml:space="preserve"> <data name="AboutGroupTitle.Text" xml:space="preserve">
<value>About</value> <value>About</value>
<comment>Subtitle of about message on Settings page</comment> <comment>Subtitle of about message on Settings page</comment>

10
src/Calculator/Resources/tr-TR/Resources.resw
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -2321,6 +2321,14 @@
<value>Windows hesap makinesi 'ne nasıl katkıda bulunabileceğinizi öğrenmek için %HL%GitHub%HL% projeyi kullanıma alın.</value> <value>Windows hesap makinesi 'ne nasıl katkıda bulunabileceğinizi öğrenmek için %HL%GitHub%HL% projeyi kullanıma alın.</value>
<comment>{Locked="%HL%GitHub%HL%"}. GitHub link, Displayed on the About panel</comment> <comment>{Locked="%HL%GitHub%HL%"}. GitHub link, Displayed on the About panel</comment>
</data> </data>
<data name="AboutCalculator.Text" xml:space="preserve">
<value>Hesap Makinesi Hakkında</value>
<comment>Title of about information expander.</comment>
</data>
<data name="LearnMoreAboutCalculator.Text" xml:space="preserve">
<value>Windows Hesap Makinesi hakkında daha fazla bilgi edinin</value>
<comment>Label of about information expander.</comment>
</data>
<data name="AboutGroupTitle.Text" xml:space="preserve"> <data name="AboutGroupTitle.Text" xml:space="preserve">
<value>Hakkında</value> <value>Hakkında</value>
<comment>Subtitle of about message on Settings page</comment> <comment>Subtitle of about message on Settings page</comment>

109
src/Calculator/Views/Settings.xaml
View file

@ -115,6 +115,9 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition x:Name="AppearanceTitleRow" Height="Auto"/> <RowDefinition x:Name="AppearanceTitleRow" Height="Auto"/>
<RowDefinition x:Name="AppearanceExpanderRow" Height="Auto"/> <RowDefinition x:Name="AppearanceExpanderRow" Height="Auto"/>
<RowDefinition x:Name="ContentTitleRow" Height="Auto"/>
<RowDefinition x:Name="ContentExpanderRow" Height="Auto"/>
<RowDefinition x:Name="FeedbackRow" Height="Auto"/>
<RowDefinition x:Name="AboutTitleContentRow" Height="*"/> <RowDefinition x:Name="AboutTitleContentRow" Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -122,6 +125,7 @@
Style="{StaticResource BodyStrongTextBlockStyle}" Style="{StaticResource BodyStrongTextBlockStyle}"
AutomationProperties.HeadingLevel="Level1"/> AutomationProperties.HeadingLevel="Level1"/>
<muxc:Expander x:Name="AppThemeExpander" <muxc:Expander x:Name="AppThemeExpander"
x:Uid="AppThemeExpander" x:Uid="AppThemeExpander"
Grid.Row="1" Grid.Row="1"
@ -173,68 +177,105 @@
</muxc:Expander.Content> </muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>
<Grid x:Name="AboutContentGrid" Grid.Row="2"> <TextBlock x:Uid="AboutGroupTitle"
<Grid.RowDefinitions> Grid.Row="2"
<RowDefinition Height="Auto"/> Style="{StaticResource BodyStrongTextBlockStyle}"
<RowDefinition Height="Auto"/> AutomationProperties.HeadingLevel="Level1"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock x:Name="AboutGroupTitle" <muxc:Expander x:Name="AboutContentExpander"
x:Uid="AboutGroupTitle" x:Uid="AboutContentExpander"
Margin="0,20,0,0" Grid.Row="3"
Style="{ThemeResource BodyStrongTextBlockStyle}" Margin="0,8,0,0"
AutomationProperties.HeadingLevel="Level1"/> HorizontalAlignment="Stretch"
<StackPanel Grid.Row="1" VerticalAlignment="Top"
HorizontalContentAlignment="Left"
ExpandDirection="Down"
IsExpanded="False">
<muxc:Expander.Header>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<BitmapIcon Margin="0,0,12,0"
VerticalAlignment="Center"
AutomationProperties.AccessibilityView="Raw"
Height="16"
Width="16"
UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
<StackPanel Grid.Column="1"
Margin="0,12"
Orientation="Vertical">
<TextBlock x:Uid="AboutCalculator" Style="{StaticResource BodyTextBlockStyle}"/>
<TextBlock x:Uid="LearnMoreAboutCalculator"
Style="{StaticResource CaptionTextBlockStyle}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
TextWrapping="WrapWholeWords"/>
</StackPanel>
</Grid>
</muxc:Expander.Header>
<muxc:Expander.Content>
<StackPanel Grid.Row="1"
Margin="0,8,0,0" Margin="0,8,0,0"
Orientation="Vertical"> Orientation="Vertical">
<RichTextBlock x:Name="AboutContentBody" Style="{StaticResource SettingsRichTextBlockStyle}"> <TextBlock x:Name="AboutBuildVersion"
<Paragraph> TextWrapping="WrapWholeWords"/>
<Run x:Name="AboutBuildVersion"/> <TextBlock x:Name="AboutControlCopyrightRun"
<LineBreak/> Style="{StaticResource CaptionTextBlockStyle}"
<Run x:Name="AboutControlCopyrightRun"/> Foreground="{ThemeResource TextFillColorSecondaryBrush}"
</Paragraph> TextWrapping="WrapWholeWords"/>
</RichTextBlock> <HyperlinkButton x:Name="AboutEULA"
<HyperlinkButton x:Name="AboutEULA"
Margin="0,16,0,0" Margin="0,16,0,0"
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"
Margin="0,16,0,0" Margin="0,16,0,0"
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"
Margin="0,16,0,0" Margin="0,16,0,0"
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>
</muxc:Expander.Content>
</muxc:Expander>
<Button x:Name="FeedbackButton"
<Button x:Name="FeedbackButton"
x:Uid="FeedbackButton" x:Uid="FeedbackButton"
Grid.Row="4"
MinWidth="120" MinWidth="120"
Margin="0,24,0,0" Margin="0,24,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
FontSize="{StaticResource BodyFontSize}" FontSize="{StaticResource BodyFontSize}"
Click="FeedbackButton_Click"/> Click="FeedbackButton_Click"/>
</StackPanel>
<Grid x:Name="AboutContributeGrid" Grid.Row="5">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<RichTextBlock x:Name="AboutContribute" <RichTextBlock x:Name="AboutContribute"
Grid.Row="2" Grid.Row="2"
Margin="0,16,0,0" Margin="0,16,0,0"
@ -244,13 +285,15 @@
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>
</Grid> </Grid>

1
src/Calculator/Views/Settings.xaml.cs
View file

@ -109,6 +109,7 @@ namespace CalculatorApp
{ {
PackageVersion version = Package.Current.Id.Version; PackageVersion version = Package.Current.Id.Version;
string appName = AppResourceProvider.GetInstance().GetResourceString("AppName"); string appName = AppResourceProvider.GetInstance().GetResourceString("AppName");
AboutBuildVersion.Text = appName + " " + version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision; AboutBuildVersion.Text = appName + " " + version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
} }

4
src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
View file

@ -286,8 +286,12 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\calculator\views\titlebar.xaml.cs" />
<None Include="WindowsDev_TemporaryKey.pfx" /> <None Include="WindowsDev_TemporaryKey.pfx" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Page Include="..\calculator\views\titlebar.xaml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

4
src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
View file

@ -81,5 +81,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="WindowsDev_TemporaryKey.pfx" /> <None Include="WindowsDev_TemporaryKey.pfx" />
<None Include="..\calculator\views\titlebar.xaml.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="..\calculator\views\titlebar.xaml" />
</ItemGroup> </ItemGroup>
</Project> </Project>