diff --git a/VanArsdel/PropertyInspector/PropertyInspector.xaml b/VanArsdel/PropertyInspector/PropertyInspector.xaml index 2ea0719..8c54773 100644 --- a/VanArsdel/PropertyInspector/PropertyInspector.xaml +++ b/VanArsdel/PropertyInspector/PropertyInspector.xaml @@ -222,7 +222,9 @@ HorizontalAlignment="Stretch" dls:RichEditBoxAttachedProperties.BindableText="{x:Bind Path=Value, Mode=OneWay}" Header="{x:Bind Path=Header, Mode=OneWay}" - TextChanged="{x:Bind Path=RichEditBox_TextChanged, Mode=OneWay}" /> + TextChanged="{x:Bind Path=RichEditBox_TextChanged, Mode=OneWay}" + Loaded="RichEditBox_Loaded" + Unloaded="RichEditBox_Unloaded"/> Year + + Engraving + \ No newline at end of file diff --git a/VanArsdel/Store/ProductConfigurationPage.xaml b/VanArsdel/Store/ProductConfigurationPage.xaml index 42149e4..15c25e8 100644 --- a/VanArsdel/Store/ProductConfigurationPage.xaml +++ b/VanArsdel/Store/ProductConfigurationPage.xaml @@ -10,6 +10,7 @@ xmlns:devices="using:VanArsdel.Devices" xmlns:local="using:VanArsdel" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:winui="using:Microsoft.UI.Xaml.Controls" xmlns:shared="using:VanArsdel" d:DesignHeight="968" d:DesignWidth="1920" @@ -93,7 +94,20 @@ Margin="0,0,0,8" HorizontalAlignment="Stretch" Click="{x:Bind ViewModel.OnBeginPurchase}" - Style="{StaticResource AccentButtonStyle}" /> + Style="{StaticResource AccentButtonStyle}"> + + + + + + + diff --git a/VanArsdel/Store/StorePage.xaml.cs b/VanArsdel/Store/StorePage.xaml.cs index dce3a9e..a729e07 100644 --- a/VanArsdel/Store/StorePage.xaml.cs +++ b/VanArsdel/Store/StorePage.xaml.cs @@ -59,5 +59,15 @@ public StoreViewModel ViewModel } #endregion + + private void StoreCustomizeTip_Loaded(object sender, RoutedEventArgs e) + { + StoreCustomizeTip.IsOpen = true; + } + + private void StoreCustomizeTip_Closing(Microsoft.UI.Xaml.Controls.TeachingTip sender, Microsoft.UI.Xaml.Controls.TeachingTipClosingEventArgs args) + { + //EngraveTextTip.IsOpen = true; + } } } diff --git a/VanArsdel/VanArsdel.csproj b/VanArsdel/VanArsdel.csproj index 4714f08..b5cff31 100644 --- a/VanArsdel/VanArsdel.csproj +++ b/VanArsdel/VanArsdel.csproj @@ -11,7 +11,7 @@ VanArsdel en-US UAP - 10.0.17763.0 + 10.0.18295.0 10.0.17763.0 14 512 @@ -604,10 +604,10 @@ - 6.1.9 + 6.2.8 - 2.0.181018003.1 + 2.2.190416008-prerelease 1.23.0