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

Restore the Date calculator

Browse source
This commit is contained in:
Dr.Rx 2019-05-24 18:28:40 -04:00
commit 93f26159a3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator.Shared/Common/LocalizationSettings.cs
View file

@ -137,7 +137,7 @@ namespace CalculatorApp
m_currencyTrailingDigits = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits; m_currencyTrailingDigits = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits;
m_currencySymbolPrecedence = ~(NumberFormatInfo.CurrentInfo.CurrencyPositivePattern) & 1; m_currencySymbolPrecedence = ~(NumberFormatInfo.CurrentInfo.CurrencyPositivePattern) & 1;
m_resolvedName = CultureInfo.CurrentCulture.Name; m_resolvedName = CultureInfo.CurrentCulture.Name;
m_calendarIdentifier = ""; // new Windows.Globalization.Calendar().GetCalendarSystem(); m_calendarIdentifier = new Windows.Globalization.Calendar().GetCalendarSystem();
m_firstDayOfWeek = (Windows.Globalization.DayOfWeek)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek; m_firstDayOfWeek = (Windows.Globalization.DayOfWeek)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
#endif #endif
} }

6
src/Calculator.Shared/Views/DateCalculator.xaml
View file

@ -581,19 +581,19 @@
Margin="0,0,0,0" Margin="0,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" /> Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" />
<!--TOOD UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
<TextBlock x:Name="DateDiffAllUnitsResultLabel" <TextBlock x:Name="DateDiffAllUnitsResultLabel"
Grid.Row="8" Grid.Row="8"
Style="{ThemeResource SubtitleTextBlockStyle}" Style="{ThemeResource SubtitleTextBlockStyle}"
FontWeight="SemiBold" FontWeight="SemiBold"
AutomationProperties.LiveSetting="Polite" AutomationProperties.LiveSetting="Polite"
AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}" AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}"
ContextFlyout="{StaticResource ResultsContextMenu}"
Text="{Binding StrDateDiffResult}" /> Text="{Binding StrDateDiffResult}" />
<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
<TextBlock Grid.Row="10" <TextBlock Grid.Row="10"
Style="{ThemeResource BaseTextBlockStyle}" Style="{ThemeResource BaseTextBlockStyle}"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
ContextFlyout="{StaticResource ResultsContextMenu}"
Text="{Binding StrDateDiffResultInDays, Mode=OneWay}" Text="{Binding StrDateDiffResultInDays, Mode=OneWay}"
Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" /> Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
</Grid> </Grid>
@ -741,13 +741,13 @@
Grid.Row="8" Grid.Row="8"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" /> Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" />
<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
<TextBlock x:Name="DateResultLabel" <TextBlock x:Name="DateResultLabel"
Grid.Row="9" Grid.Row="9"
Style="{ThemeResource SubtitleTextBlockStyle}" Style="{ThemeResource SubtitleTextBlockStyle}"
FontWeight="SemiBold" FontWeight="SemiBold"
AutomationProperties.LiveSetting="Polite" AutomationProperties.LiveSetting="Polite"
AutomationProperties.Name="{Binding StrDateResultAutomationName}" AutomationProperties.Name="{Binding StrDateResultAutomationName}"
ContextFlyout="{StaticResource ResultsContextMenu}"
Text="{Binding StrDateResult}" /> Text="{Binding StrDateResult}" />
</Grid> </Grid>
</Grid> </Grid>