Skip to content

Commit

Permalink
adding conditional building for net6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe da Conceicao Guimaraes committed Jul 19, 2021
1 parent e18a31a commit 7bd7111
Show file tree
Hide file tree
Showing 4 changed files with 223 additions and 0 deletions.
134 changes: 134 additions & 0 deletions Sample Applications/DataBindingDemo/AddProductWindowOld.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<Window x:Class="DataBindingDemo.AddProductWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:DataBindingDemo"
mc:Ignorable="d"
Title="Add Product Listing" SizeToContent="WidthAndHeight" Loaded="OnInit">
<Window.Resources>
<local:SpecialFeaturesConverter x:Key="SpecialFeaturesConverter" />
<ControlTemplate x:Key="ValidationTemplate">
<DockPanel>
<TextBlock Foreground="Red" FontSize="20">!</TextBlock>
<AdornedElementPlaceholder />
</DockPanel>
</ControlTemplate>
</Window.Resources>

<Border Padding="20">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Border Grid.Row="0"
Style="{StaticResource BorderStyle}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="106" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
Style="{StaticResource TitleStyle}"
Margin="5">
Item for sale:
</TextBlock>

<TextBlock Grid.Row="1" Grid.Column="0"
Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">
Item Description:
</TextBlock>
<TextBox Name="DescriptionEntryForm" AutomationProperties.Name="Item Description" Grid.Row="1" Grid.Column="1"
Text="{Binding Path=Description, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource TextStyleTextBox}" Margin="8,5,0,5" />

<TextBlock Grid.Row="2" Grid.Column="0" Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">Start Price:</TextBlock>

<TextBox Name="StartPriceEntryForm" AutomationProperties.Name="Start Price" Grid.Row="2" Grid.Column="1"
Style="{StaticResource TextStyleTextBox}" Margin="8,5,0,5"
Validation.Error="OnValidationError">
<TextBox.Text>
<Binding Path="StartPrice" UpdateSourceTrigger="PropertyChanged"
NotifyOnValidationError="True">
<Binding.ValidationRules>
<ExceptionValidationRule />
</Binding.ValidationRules>
</Binding>
</TextBox.Text>
</TextBox>

<TextBlock Grid.Row="3" Grid.Column="0" Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">Start Date:</TextBlock>

<TextBox Name="StartDateEntryForm" AutomationProperties.Name="Start Date" Grid.Row="3" Grid.Column="1"
Validation.ErrorTemplate="{StaticResource ValidationTemplate}"
Style="{StaticResource TextStyleTextBox}" Margin="8,5,0,5"
Validation.Error="OnValidationError"
AutomationProperties.LiveSetting="Assertive">
<TextBox.Text>
<Binding Path="StartDate" UpdateSourceTrigger="PropertyChanged"
NotifyOnValidationError="True"
Converter="{StaticResource DateConverter}">
<Binding.ValidationRules>
<local:FutureDateRule />
</Binding.ValidationRules>
</Binding>
</TextBox.Text>
</TextBox>

<TextBlock Grid.Row="4" Grid.Column="0" Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">Category:</TextBlock>
<ComboBox Name="CategoryEntryForm" AutomationProperties.Name="Category" Grid.Row="4" Grid.Column="1"
SelectedValue="{Binding Path=Category}"
Style="{StaticResource ComboBoxStyle}"
ItemContainerStyle="{StaticResource ComboBoxItemStyle}" Margin="8,5,0,5">
<local:ProductCategory>Books</local:ProductCategory>
<local:ProductCategory>Computers</local:ProductCategory>
<local:ProductCategory>DvDs</local:ProductCategory>
<local:ProductCategory>Electronics</local:ProductCategory>
<local:ProductCategory>Home</local:ProductCategory>
<local:ProductCategory>Sports</local:ProductCategory>
</ComboBox>

<TextBlock Grid.Row="5" Grid.Column="0" Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">Special Features:</TextBlock>
<ComboBox Name="SpecialFeaturesEntryForm" AutomationProperties.Name="Special Features" Grid.Row="5" Grid.Column="1"
SelectedValue="{Binding Path=SpecialFeatures}"
Style="{StaticResource ComboBoxStyle}"
ItemContainerStyle="{StaticResource ComboBoxItemStyle}" Margin="8,5,0,5">
<local:SpecialFeatures>None</local:SpecialFeatures>
<local:SpecialFeatures>Color</local:SpecialFeatures>
<local:SpecialFeatures>Highlight</local:SpecialFeatures>
<ComboBox.IsEnabled>
<MultiBinding Converter="{StaticResource SpecialFeaturesConverter}">
<Binding Path="CurrentUser.Rating"
Source="{x:Static Application.Current}" />
<Binding Path="CurrentUser.MemberSince"
Source="{x:Static Application.Current}" />
</MultiBinding>
</ComboBox.IsEnabled>
</ComboBox>

<Button Name="Submit" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Right" Content="Submit"
Margin="5" Click="SubmitProduct" />
</Grid>
</Border>
<ContentControl Name="ShortPreview" Grid.Row="1"
Content="{Binding}"
HorizontalAlignment="Left" IsTabStop="False" />
<ContentControl Name="LongPreview" Grid.Row="2"
Content="{Binding}"
ContentTemplate="{StaticResource DetailsProductListingTemplate}"
HorizontalAlignment="Left" IsTabStop="False" />
</Grid>
</Border>
</Window>
9 changes: 9 additions & 0 deletions Sample Applications/DataBindingDemo/DataBindingDemo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,13 @@
<AssemblyName>DataBindingDemo</AssemblyName>
</PropertyGroup>

<ItemGroup Condition ="'$(TargetFramework)' == 'net6.0-windows'">
<Page Remove="MainWindowOld.xaml" />
<Page Remove="AddProductWindowOld.xaml" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
<Page Remove="AddProductWindow.xaml" />
<Page Remove="MainWindow.xaml" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<ItemGroup>
<Page Update="AddProductWindowOld.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="MainWindowOld.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Styles.xaml">
<SubType>Designer</SubType>
</Page>
Expand Down
74 changes: 74 additions & 0 deletions Sample Applications/DataBindingDemo/MainWindowOld.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<Window x:Class="DataBindingDemo.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:DataBindingDemo"
mc:Ignorable="d"
Title="List of Products" SizeToContent="WidthAndHeight">
<Window.Resources>
<DataTemplate x:Key="GroupingHeaderTemplate">
<TextBlock Text="{Binding Path=Name}" Style="{StaticResource GroupHeaderStyle}"/>
</DataTemplate>

<CollectionViewSource
Source="{Binding Source={x:Static Application.Current}, Path=AuctionItems}"
x:Key="ListingDataView" />
</Window.Resources>

<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="300" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>

<TextBlock Grid.Row="0" Grid.ColumnSpan="3"
Style="{StaticResource TitleStyle}" Margin="8,20,8,8">
List of items for sale:
</TextBlock>
<CheckBox Name="Grouping" Grid.Row="1" Grid.Column="0"
Checked="AddGrouping" Unchecked="RemoveGrouping"
Margin="8" Style="{StaticResource CheckBoxStyle}">
Group by category
</CheckBox>
<CheckBox Name="Filtering" Grid.Row="1" Grid.Column="1"
Checked="AddFiltering" Unchecked="RemoveFiltering"
Margin="8" Style="{StaticResource CheckBoxStyle}">
Show only bargains
</CheckBox>
<CheckBox Name="Sorting" Grid.Row="1" Grid.Column="2"
Checked="AddSorting" Unchecked="RemoveSorting"
Margin="8" Style="{StaticResource CheckBoxStyle}">
Sort by category and date
</CheckBox>


<ListBox Name="Master" AutomationProperties.Name="List of Items For Sale" Grid.Row="2" Grid.ColumnSpan="3" Margin="8"
ItemsSource="{Binding Source={StaticResource ListingDataView}}"
AutomationProperties.LiveSetting="Assertive">
<ListBox.GroupStyle>
<GroupStyle
HeaderTemplate="{StaticResource GroupingHeaderTemplate}" />
</ListBox.GroupStyle>
</ListBox>


<ContentControl Name="Detail" Grid.Row="3" Grid.ColumnSpan="3"
Content="{Binding Source={StaticResource ListingDataView}}"
ContentTemplate="{StaticResource DetailsProductListingTemplate}"
Margin="9,0,0,0" IsTabStop="False"/>
<Button Name="OpenAddProduct" Grid.Row="4" Grid.Column="1" Content="Add Product" HorizontalAlignment="Center"
Margin="8"
Click="OpenAddProductWindow" />

</Grid>
</Window>

0 comments on commit 7bd7111

Please sign in to comment.