Skip to content

Commit

Permalink
Version 1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
XceedBoucherS committed Jan 15, 2013
1 parent a64bb83 commit 0d9a63a
Show file tree
Hide file tree
Showing 1,120 changed files with 24,915 additions and 8,433 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
<ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
<Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
<Name>WPFToolkit.Extended</Name>
<Name>Xceed.Wpf.Toolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
<Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<TextBlock Text="DisplayAfter:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
<StackPanel Grid.Row="1" Grid.Column="1" Margin="5" HorizontalAlignment="Left" Orientation="Horizontal">
<xctk:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Value="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed." />
<xctk:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Text="0" DefaultValue="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed." />
<TextBlock Text="milliseconds" Margin="5,0" VerticalAlignment="Center" />
</StackPanel>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
<ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
<Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
<Name>WPFToolkit.Extended</Name>
<Name>Xceed.Wpf.Toolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
<Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Data;
using System.Globalization;
using System.Windows;

namespace Samples.Modules.Calculator.Converters
{
class FormatStringToVisibilityConverter : IValueConverter
{
public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
{
//When FormatString received is empty, make the Precision property Visible.
//This is to prevent something like this: Precision = "5" AND FormatString = "C2".
if( string.IsNullOrEmpty( ( string )value ) )
return Visibility.Visible;
return Visibility.Hidden;
}

public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
{
throw new NotImplementedException();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
<ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
<Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
<Name>WPFToolkit.Extended</Name>
<Name>Xceed.Wpf.Toolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
<Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
Expand All @@ -66,6 +66,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CalculatorModule.cs" />
<Compile Include="Converters\FormatStringToVisibilityConverter.cs" />
<Compile Include="NavigationItems\CalculatorNavItem.xaml.cs">
<DependentUpon>CalculatorNavItem.xaml</DependentUpon>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@
xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
Title="CalculatorUpDown"
xmlns:conv="clr-namespace:Samples.Modules.Calculator.Converters"
Description="The CalculatorUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel. It also provides a Calculator dropdown which allows you to perform mathematical calculations.">
<Grid>
<sample:DemoView.Resources>
<conv:FormatStringToVisibilityConverter x:Key="formatStringToVisibilityConverter" />
</sample:DemoView.Resources>

<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
Expand All @@ -35,28 +40,34 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Precision: " VerticalAlignment="Center" />
<xctk:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
<TextBlock Text="FormatString:" Grid.Row="1" VerticalAlignment="Center" />
<ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="1" Grid.Column="1" Width="150" Margin="5">
<ComboBoxItem Tag="C2">Currency</ComboBoxItem>
<ComboBoxItem Tag="F2">Fixed Point</ComboBoxItem>

<TextBlock Text="Enter Closes Calculator:" VerticalAlignment="Center" />
<CheckBox x:Name="_enterClosesCalculator" Grid.Column="1" VerticalAlignment="Center" Margin="5" />
<TextBlock Text="Watermark:" Grid.Row="1" VerticalAlignment="Center" />
<TextBox x:Name="_watermark" Grid.Row="1" Grid.Column="1" Width="150" Margin="5" Text="Enter Value" />
<TextBlock Text="FormatString:" Grid.Row="2" VerticalAlignment="Center" />
<ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="2" Grid.Column="1" Width="150" Margin="5">
<ComboBoxItem Tag="">None</ComboBoxItem>
<ComboBoxItem Tag="C">Currency</ComboBoxItem>
<ComboBoxItem Tag="F">Fixed Point</ComboBoxItem>
<ComboBoxItem Tag="G">General</ComboBoxItem>
<ComboBoxItem Tag="N">Number</ComboBoxItem>
<ComboBoxItem Tag="P2">Percent</ComboBoxItem>
<ComboBoxItem Tag="P">Percent</ComboBoxItem>
</ComboBox>
<TextBlock Text="Watermakr:" Grid.Row="2" VerticalAlignment="Center" />
<TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" Text="Enter Value" />
<TextBlock Grid.Column="2" Text="Increment" VerticalAlignment="Center" />
<TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum" VerticalAlignment="Center" />
<TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum" VerticalAlignment="Center" />
<TextBlock Text="Precision: " Grid.Row="3" VerticalAlignment="Center" Visibility="{Binding SelectedItem.Tag, ElementName=_formatString, Converter={StaticResource formatStringToVisibilityConverter}}" />
<xctk:IntegerUpDown x:Name="_precision" Grid.Row="3" Grid.Column="1" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" Visibility="{Binding SelectedItem.Tag, ElementName=_formatString, Converter={StaticResource formatStringToVisibilityConverter}}" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />

<TextBlock Grid.Column="2" Text="Increment:" VerticalAlignment="Center" Margin="20,0,0,0"/>
<TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum:" VerticalAlignment="Center" Margin="20,0,0,0"/>
<TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum:" VerticalAlignment="Center" Margin="20,0,0,0"/>
<xctk:IntegerUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="1" VerticalAlignment="Center" Margin="5" Width="150" />
<xctk:IntegerUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
<xctk:IntegerUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="5000" VerticalAlignment="Center" Margin="5" Width="150" />
Expand All @@ -71,7 +82,8 @@
Minimum="{Binding Value, ElementName=_minimum}"
Precision="{Binding Value, ElementName=_precision}"
FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}"
Watermark="{Binding Text, ElementName=_watermark}" />
Watermark="{Binding Text, ElementName=_watermark}"
EnterClosesCalculator="{Binding IsChecked, ElementName=_enterClosesCalculator}"/>
</StackPanel>
</Grid>
</sample:DemoView>
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<Reference Include="Microsoft.Practices.Unity">
<HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
<ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
<Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
<Name>WPFToolkit.Extended</Name>
<Name>Xceed.Wpf.Toolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
<Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,18 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<TextBlock Grid.Row="0" Grid.Column="0"
Text="Delimiter:"
Margin="2"/>
Margin="5"/>
<TextBox x:Name="_delimiter"
Grid.Row="0" Grid.Column="1"
Margin="5"
Expand All @@ -65,7 +66,7 @@

<TextBlock Grid.Row="1" Grid.Column="0"
Text="ValueMemberPath:"
Margin="2"/>
Margin="5"/>
<ComboBox x:Name="_valueMemberPath"
Grid.Row="1" Grid.Column="1"
HorizontalAlignment="Stretch"
Expand All @@ -75,7 +76,7 @@

<TextBlock Grid.Row="2" Grid.Column="0"
Text="SelectedValue:"
Margin="2"/>
Margin="5"/>
<TextBox x:Name="_selectedValue"
Grid.Row="2" Grid.Column="1"
Margin="5"
Expand All @@ -84,7 +85,7 @@

<TextBlock Grid.Row="0" Grid.Column="2"
Text="SelectedMemberPath:"
Margin="2"/>
Margin="5"/>
<TextBox x:Name="_selectedMemberPath"
Grid.Row="0" Grid.Column="3"
Margin="5"
Expand All @@ -94,7 +95,7 @@

<TextBlock Grid.Row="1" Grid.Column="2"
Text="DisplayMemberPath:"
Margin="2"/>
Margin="5"/>
<ComboBox x:Name="_displayMemberPath"
Grid.Row="1" Grid.Column="3"
Margin="5"
Expand All @@ -103,14 +104,30 @@
SelectedIndex="1"/>
<TextBlock Grid.Row="2" Grid.Column="2"
Text="IsDropDownOpen:"
Margin="2"/>
Margin="5"/>
<CheckBox x:Name="_isDropDownOpen"
Grid.Row="2" Grid.Column="3"
Margin="5"
HorizontalAlignment="Stretch"
Content="(CheckListBox only)"
Content="(CheckComboBox only)"
ClickMode="Press"
IsChecked="false" />
IsChecked="{Binding IsDropDownOpen, ElementName=_checkComboBox}" />
<TextBlock Grid.Row="3" Grid.Column="2"
Text="MaxDropDownHeight:"
Margin="5"/>
<StackPanel Orientation="Horizontal"
Grid.Row="3" Grid.Column="3"
HorizontalAlignment="Stretch"
Margin="5">
<xctk:DoubleUpDown x:Name="_maxDropDownHeight"
Width="45"
Value="{Binding MaxDropDownHeight, ElementName=_checkComboBox}"
DefaultValue="150"
AllowInputSpecialValues="PositiveInfinity"
Minimum="0"/>
<TextBlock Text="(CheckComboBox only)"
Margin="4"/>
</StackPanel>
</Grid>
</GroupBox>

Expand Down Expand Up @@ -143,6 +160,7 @@

<TextBlock Text="CheckComboBox Usage:" Grid.Column="1" Margin="5" Style="{StaticResource Header}"/>
<xctk:CheckComboBox Grid.Column="1"
x:Name="_checkComboBox"
Grid.Row="1"
Margin="5"
VerticalAlignment="Top"
Expand All @@ -151,7 +169,8 @@
ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}"
IsDropDownOpen="{Binding ElementName=_isDropDownOpen, Path=IsChecked, Mode=TwoWay}" />
</Grid>
IsDropDownOpen="false"
MaxDropDownHeight="100"/>
</Grid>
</Grid>
</sample:DemoView>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Data;
using System.Globalization;

namespace Samples.Modules.ChildWindow.Converters
{
class IntToBoolConverter : IValueConverter
{
public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
{
int intReceived = (int)value;

if( intReceived == 1 )
return false;
else
return true;
}

public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
{
throw new NotImplementedException();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
<ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
<Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
<Name>WPFToolkit.Extended</Name>
<Name>Xceed.Wpf.Toolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
<Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
Expand Down Expand Up @@ -76,6 +76,7 @@
<DependentUpon>NavigationView.xaml</DependentUpon>
</Compile>
<AppDesigner Include="Properties\" />
<Compile Include="Converters\IntToBoolConverter.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="Views\HomeView.xaml">
Expand Down
Loading

0 comments on commit 0d9a63a

Please sign in to comment.