Browse Source

1.8.0 Release - Various deployment fixes

pull/1645/head
emartin_cp 13 years ago
parent
commit
f068898687
  1. 144
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml
  2. 40
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml
  3. 6
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
  4. 20
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
  5. 14
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.fr.resx
  6. 22
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.resx
  7. 2
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
  8. 12
      ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml
  9. 2
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs
  10. 3
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
  11. 2
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
  12. 4
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
  13. 6
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs
  14. 8
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
  15. 4
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs
  16. 2
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
  17. 2
      ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs
  18. 3
      ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
  19. 2
      ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
  20. 4
      ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs

144
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml

@ -24,80 +24,80 @@
xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
xmlns:compModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
Title="Full Version" >
<StackPanel>
<RichTextBox IsReadOnly="True" IsDocumentEnabled="False" BorderThickness="0">
<FlowDocument>
<Paragraph>
The full featured version of the DataGrid available commercially will provide
you with extended features like:
</Paragraph>
<List>
<ListItem>
<Paragraph>Master Details</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Filter Row</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Insertion Row</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Excel Auto-Filtering</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Column Chooser</Paragraph>
</ListItem>
<ListItem>
<Paragraph>CardView, CompactCardView</Paragraph>
</ListItem>
<ListItem>
<Paragraph>3DView, MultiSurfaceView</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Statistical Functions and Summary row</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Print, Print Preview</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Export to Excel</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Fixed Column Splitter UI element</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Persist User Settings</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Design time support in Visual Studio and Expression Blend</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Comprehensive documentation fully integrated into Visual Studio</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Includes a variety of VB.NET and C# sample applications to get you started</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Office 2007 Themes: Blue, Black, and Silver</Paragraph>
</ListItem>
<ListItem>
<Paragraph>The Xceed Live Explorer theme</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Includes Xceed 3D Views for WPF</Paragraph>
</ListItem>
<ListItem>
<Paragraph>And many more....</Paragraph>
</ListItem>
</List>
</FlowDocument>
</RichTextBox>
<StackPanel>
<RichTextBox IsReadOnly="True" IsDocumentEnabled="False" BorderThickness="0">
<FlowDocument>
<Paragraph>
The full-featured version of the DataGrid available commercially provides
additional features such as the following:
</Paragraph>
<List>
<ListItem>
<Paragraph>Master-Detail</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Filter row</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Insertion row</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Excel auto-filtering</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Column chooser</Paragraph>
</ListItem>
<ListItem>
<Paragraph>CardView, CompactCardView</Paragraph>
</ListItem>
<ListItem>
<Paragraph>3DView, MultiSurfaceView</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Statistical functions and summary row</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Print, print preview</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Export to Excel</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Fixed column splitter UI element</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Persist user settings</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Design-time support in Visual Studio and Expression Blend</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Comprehensive documentation fully integrated into Visual Studio</Paragraph>
</ListItem>
<ListItem>
<Paragraph>A variety of VB.NET and C# sample applications to get you started</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Office 2007 themes: Blue, Black, and Silver</Paragraph>
</ListItem>
<ListItem>
<Paragraph>The Xceed Live Explorer theme</Paragraph>
</ListItem>
<ListItem>
<Paragraph>Xceed 3D Views for WPF is included</Paragraph>
</ListItem>
<ListItem>
<Paragraph>And much more!</Paragraph>
</ListItem>
</List>
</FlowDocument>
</RichTextBox>
<TextBlock Margin="0,20,0,0">
<TextBlock Margin="0,20,0,0">
<Hyperlink NavigateUri="http://www.xceed.com/Grid_WPF_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
Click here for more details about the full featured DataGrid control.
Click here for more details about the full-featured DataGrid control.
</Hyperlink>
</TextBlock>
</StackPanel>
</TextBlock>
</StackPanel>
</sample:DemoView>

40
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml

@ -25,30 +25,32 @@
xmlns:compModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
Title="DataGrid"
x:Name="_demo">
<sample:DemoView.Description>
The experience Xceed DataGrid for WPF provides centers on its Tableflow view, which lets you take advantage of a stunning, shaded appearance and capabilities such as inertial smooth scrolling and animated full-column reordering—which mimic the physics of real-life movement. Add to that the datagrid’s zero-lag data virtualization, and you have the fastest WPF datagrid around—in performance and feel.
<sample:DemoView.Description>
The experience that Xceed DataGrid for WPF provides centers on its Tableflow view, which lets you take advantage of a stunning, shaded appearance and capabilities such as inertial smooth scrolling and animated full-column reordering—which mimics the physics of real-life movement. Add to that the datagrid’s zero-lag data virtualization, and you have the fastest WPF datagrid around—in performance and feel.
It's rock-solid and time-tested, so you can trust it in your most important applications. Constantly evolving—no other datagrid is updated as often—it has more features than any other offering and a flexible, extensible object model. It also provides unbeatable performance by handling millions of rows and thousands of columns, and integrates easily into any WPF app. It’s easy to understand why it’s the most-adopted WPF datagrid available and used by Microsoft in Visual Studio 2010 and by IBM U2 in SystemBuilder 4GL (SB+)!
</sample:DemoView.Description>
<Grid>
<Grid.Resources>
<xcdg:DataGridCollectionViewSource x:Key="cvsOrders"
Note: The datagrid included in Xceed Extended WPF Toolkit Plus contains a subset of the features of Xceed DataGrid for WPF.
</sample:DemoView.Description>
<Grid>
<Grid.Resources>
<xcdg:DataGridCollectionViewSource x:Key="cvsOrders"
Source="{Binding ElementName=_demo, Path=Orders}">
<xcdg:DataGridCollectionViewSource.GroupDescriptions>
<PropertyGroupDescription PropertyName="ShipCountry" />
<PropertyGroupDescription PropertyName="ShipCity" />
</xcdg:DataGridCollectionViewSource.GroupDescriptions>
</xcdg:DataGridCollectionViewSource>
</Grid.Resources>
<xcdg:DataGridControl x:Name="_dataGrid"
<xcdg:DataGridCollectionViewSource.GroupDescriptions>
<PropertyGroupDescription PropertyName="ShipCountry" />
<PropertyGroupDescription PropertyName="ShipCity" />
</xcdg:DataGridCollectionViewSource.GroupDescriptions>
</xcdg:DataGridCollectionViewSource>
</Grid.Resources>
<xcdg:DataGridControl x:Name="_dataGrid"
MaxHeight="400"
ItemsSource="{Binding Source={StaticResource cvsOrders}}" >
<xcdg:DataGridControl.View>
<xcdg:TableflowView FixedColumnCount="2" />
</xcdg:DataGridControl.View>
</xcdg:DataGridControl>
</Grid>
<xcdg:DataGridControl.View>
<xcdg:TableflowView FixedColumnCount="2" />
</xcdg:DataGridControl.View>
</xcdg:DataGridControl>
</Grid>
</sample:DemoView>

6
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml

@ -26,11 +26,11 @@
<RichTextBox IsReadOnly="True" BorderThickness="0">
<FlowDocument>
<Paragraph>
Numeric up-down controls 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
Numeric up-down controls provide a TextBox with button spinners that allow incrementing
and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.
</Paragraph>
<Paragraph>
The following controls are present to support various native numeric types:
The following controls are available to support various native numeric types:
ByteUpDown, ShortUpDown, IntegerUpDown, LongUpDown, SingleUpDown, DoubleUpDown, DecimalUpDown.
</Paragraph>
</FlowDocument>

20
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.Designer.cs

@ -70,7 +70,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to Favorite Actor 1 (No DisplayName).
/// Looks up a localized string similar to Favorite actor 1 (no DisplayName).
/// </summary>
internal static string FavoriteActor1 {
get {
@ -79,7 +79,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to This property type is an enum where values has no DisplayName attributes. Theses values display are provided by ToString() method.
/// Looks up a localized string similar to This property&apos;s type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method..
/// </summary>
internal static string FavoriteActor1Desc {
get {
@ -88,7 +88,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to Favorite Actor 2 (With DisplayName).
/// Looks up a localized string similar to Favorite actor 2 (with DisplayName).
/// </summary>
internal static string FavoriteActor2 {
get {
@ -97,7 +97,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to This property type is an enum where values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allow to customize display values.
/// Looks up a localized string similar to This property&apos;s type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized..
/// </summary>
internal static string FavoriteActor2Desc {
get {
@ -106,7 +106,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to Favorite Actor 3.
/// Looks up a localized string similar to Favorite actor 3.
/// </summary>
internal static string FavoriteActor3 {
get {
@ -115,7 +115,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to &quot;(Not listed)&quot; enum value show that enum values can also be localized.
/// Looks up a localized string similar to &quot;(Not listed)&quot; enum value shows that enum values can also be localized..
/// </summary>
internal static string FavoriteActor3Desc {
get {
@ -124,7 +124,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to First Name.
/// Looks up a localized string similar to First name.
/// </summary>
internal static string FirstName {
get {
@ -151,7 +151,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to Last Name.
/// Looks up a localized string similar to Last name.
/// </summary>
internal static string LastName {
get {
@ -160,7 +160,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to Usualy the Familly name of the person.
/// Looks up a localized string similar to Usually the familly name of the person.
/// </summary>
internal static string LastNameDesc {
get {
@ -169,7 +169,7 @@ namespace Samples.Modules.PropertyGrid.Views {
}
/// <summary>
/// Looks up a localized string similar to (No listed).
/// Looks up a localized string similar to (Not listed).
/// </summary>
internal static string NotListed {
get {

14
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.fr.resx

@ -121,22 +121,22 @@
<value>Détails</value>
</data>
<data name="FavoriteActor1" xml:space="preserve">
<value>Acteur Favori 1 (Aucun DisplayName)</value>
<value>Acteur favori 1 (aucun DisplayName)</value>
</data>
<data name="FavoriteActor1Desc" xml:space="preserve">
<value>Le type de cette propriété est un enum où les valeurs n'ont aucun attribut "DisplayName". Les valeur affiché sont retourné par la méthode ToString()</value>
<value>Le type de cette propriété est un enum où les valeurs n'ont aucun attribut "DisplayName". Les valeurs affichées sont retournées par la méthode ToString().</value>
</data>
<data name="FavoriteActor2" xml:space="preserve">
<value>Acteur Favori 2 (Avec DisplayName)</value>
<value>Acteur favori 2 (avec DisplayName)</value>
</data>
<data name="FavoriteActor2Desc" xml:space="preserve">
<value>Le type de cette propriété est un enum où les valeurs sont décoré avec l'attribut "DisplayName". Les valeurs affichées sont celles spécifié par l'attribut ExtendedDisplayName</value>
<value>Le type de cette propriété est un enum où les valeurs sont décorés avec l'attribut "DisplayName". Les valeurs affichées sont celles spécifiées par l'attribut ExtendedDisplayName.</value>
</data>
<data name="FavoriteActor3" xml:space="preserve">
<value>Acteur Favori 3</value>
<value>Acteur favori 3</value>
</data>
<data name="FavoriteActor3Desc" xml:space="preserve">
<value>La valeur "(Non proposé)" démontre que les valeur des enum peuvent aussi être localisée</value>
<value>La valeur "(Non proposé)" démontre que les valeurs des enums peuvent aussi être localisées.</value>
</data>
<data name="FirstName" xml:space="preserve">
<value>Prénom</value>
@ -156,4 +156,4 @@
<data name="NotListed" xml:space="preserve">
<value>(Non proposé)</value>
</data>
</root>
</root>

22
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.resx

@ -121,25 +121,25 @@
<value>Details</value>
</data>
<data name="FavoriteActor1" xml:space="preserve">
<value>Favorite Actor 1 (No DisplayName)</value>
<value>Favorite actor 1 (no DisplayName)</value>
</data>
<data name="FavoriteActor1Desc" xml:space="preserve">
<value>This property type is an enum where values has no DisplayName attributes. Theses values display are provided by ToString() method</value>
<value>This property's type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method.</value>
</data>
<data name="FavoriteActor2" xml:space="preserve">
<value>Favorite Actor 2 (With DisplayName)</value>
<value>Favorite actor 2 (with DisplayName)</value>
</data>
<data name="FavoriteActor2Desc" xml:space="preserve">
<value>This property type is an enum where values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allow to customize display values</value>
<value>This property's type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized.</value>
</data>
<data name="FavoriteActor3" xml:space="preserve">
<value>Favorite Actor 3</value>
<value>Favorite actor 3</value>
</data>
<data name="FavoriteActor3Desc" xml:space="preserve">
<value>"(Not listed)" enum value show that enum values can also be localized</value>
<value>"(Not listed)" enum value shows that enum values can also be localized.</value>
</data>
<data name="FirstName" xml:space="preserve">
<value>First Name</value>
<value>First name</value>
</data>
<data name="FirstNameDesc" xml:space="preserve">
<value>First name of that person</value>
@ -148,12 +148,12 @@
<value>Information</value>
</data>
<data name="LastName" xml:space="preserve">
<value>Last Name</value>
<value>Last name</value>
</data>
<data name="LastNameDesc" xml:space="preserve">
<value>Usualy the Familly name of the person</value>
<value>Usually the familly name of the person</value>
</data>
<data name="NotListed" xml:space="preserve">
<value>(No listed)</value>
<value>(Not listed)</value>
</data>
</root>
</root>

2
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml

@ -59,7 +59,7 @@
<TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" />
<CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property." />
<TextBlock Text="IsReadOnly:" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" />
<CheckBox x:Name="_isReadOnly" Grid.Row="2" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ToolTip="Set the IsReadOnly property to true or false" />
<CheckBox x:Name="_isReadOnly" Grid.Row="2" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ToolTip="Set the IsReadOnly property to true or false." />
</Grid>
</GroupBox>

12
ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml

@ -22,7 +22,7 @@
xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
Title="AutoSelectTextBox"
Description="The AutoSelectTextBox allow to select the text content when the control get the focus. It also allow to affect the Focus navigation behavior winthin the control">
Description="The AutoSelectTextBox allows the text content to be selected when the control get the focus. It also allows the Focus navigation behavior within the control to be affected.">
<StackPanel>
<StackPanel.Resources>
<Style TargetType="{x:Type xctk:AutoSelectTextBox}">
@ -60,7 +60,7 @@
<Paragraph>
<Bold>AutoSelectBehavior:</Bold>
<LineBreak/>
Controled by the "AutoSelectBehavior" property, the content of the AutoSelectTextBox will be selected or not when the control get the focus.
The value of the "AutoSelectBehavior" property determines whether the content of the AutoSelectTextBox will be selected or not when the control gets the focus.
<LineBreak/>
<LineBreak/>
<Bold>AutoMoveFocus:</Bold>
@ -68,8 +68,8 @@
<Italic>Effect with "MaxLength" property:</Italic>
<LineBreak/>
<LineBreak/>
Setting the "MaxLenght" of the text box allow the focus to move from the AutoSelectTextBox once the max lenght has been reached.
In the following "Telephone Number" fields, the "MaxLenght" property of the control has been set to 3, 3 and 4, respectively
Setting the "MaxLength" of the text box allows the focus to move from the AutoSelectTextBox once the max length has been reached.
In the following "Telephone Number" fields, the "MaxLength" properties of the controls have been set to 3, 3, and 4.
</Paragraph>
</FlowDocument>
</RichTextBox>
@ -89,8 +89,8 @@
<Italic>Effect with Arrow keys</Italic>
<LineBreak/>
<LineBreak/>
The "AutoMoveFocus" at true also allow to navigate the focus thru the controls using the arrow keys to move the focus up, down, left or right.
You are no longer limited to the "left-right" scenario of the "Tab, Shift-Tab" keys.
Setting "AutoMoveFocus" to true also allows navigating the focus through the controls using the arrow keys to move the focus up, down, left, or right.
You are no longer limited to the "left-right" navigation of the "Tab, Shift-Tab" keys.
</Paragraph>
</FlowDocument>
</RichTextBox>

2
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs

@ -25,7 +25,7 @@ internal static class _XceedVersionInfo
public const string BaseVersion = "1.8";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
_XceedVersionInfoCommon.Build;
".0.0";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string PublicKeyToken = "ba83ff368b7563c6";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]

3
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs

@ -265,6 +265,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
protected override void OnTextChanged( string oldValue, string newValue )
{
//If Text was changed in code-behind.
if( !_isTextChangedFromUI )
{
SyncTextAndValueProperties( true, Text );
@ -374,7 +375,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
{
try
{
Value = ConvertTextToValue( Text );
Value = ConvertTextToValue( text );
}
catch( Exception e )
{

2
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs

@ -25,7 +25,7 @@ using System.Windows.Input;
namespace Xceed.Wpf.Toolkit.Obselete
{
[Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead", false)]
[Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false)]
public class MaskedTextBox : TextBox
{
#region Members

4
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs

@ -556,8 +556,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
private string ResolveDescription()
{
//We do not simply rely on the "Description" property of PropertyDescriptor
//since this value is cached bye PropertyDescriptor and the localized version
//(eg. LocalizedDescriptionAttribute) value can dynamicaly change
//since this value is cached by PropertyDescriptor and the localized version
//(e.g., LocalizedDescriptionAttribute) value can dynamicaly change.
DescriptionAttribute descriptionAtt = GetAttribute<DescriptionAttribute>();
return ( descriptionAtt != null )
? descriptionAtt.Description

6
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs

@ -76,12 +76,12 @@ namespace Xceed.Wpf.DataGrid
{
try
{
// Null or empty string is an null date;
// Null or empty string is a null date;
DateTime? dateTime = ( !string.IsNullOrEmpty( Text ) )
? DateTime.Parse( Text, DateTimeFormatInfo.GetInstance( CultureInfo.CurrentCulture ) )
: ( DateTime? )null;
// This may throw an exception either if the typed date is
// This may throw an exception if the typed date is
// part of the blackout dates.
this.SelectedDate = dateTime;
}
@ -89,7 +89,7 @@ namespace Xceed.Wpf.DataGrid
{
_commitException = e;
// Return the TextField to the appropritate value for the current SelectedDate.
// Setting the "Text" property to an invalid content for a date was the
// Setting the "Text" property to invalid content for a date was the
// observed behavior for the DatePicker.
// "Invalid" is expected to be an invalid content.
// This will raise the "DateValidationError" event from the datepicker

8
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs

@ -34,12 +34,12 @@ using System.Windows.Markup;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle( "Xceed DataGrid for WPF" )]
[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - DataGrid" )]
[assembly: AssemblyDescription( "This assembly implements the Xceed.Wpf.DataGrid namespace, a data grid control for the Windows Presentation Framework." )]
[assembly: AssemblyCompany( "Xceed Software Inc." )]
[assembly: AssemblyProduct( "Xceed DataGrid for WPF" )]
[assembly: AssemblyCopyright( "Copyright � Xceed Software Inc. 2007-2011" )]
[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - DataGrid" )]
[assembly: AssemblyCopyright( "Copyright � Xceed Software Inc. 2010-2012" )]
[assembly: CLSCompliant( true )]
@ -50,8 +50,6 @@ using System.Windows.Markup;
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Converters")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Markup")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Views")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Print")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Stats")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Automation")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.ValidationRules")]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.FilterCriteria")]

4
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs

@ -104,13 +104,13 @@ namespace Xceed.Wpf.DataGrid
{
if( e.Key == Key.Enter )
{
// The DatePicker (and UpDownBase<T> OnValidationError) sets this as handled, which breaks the DataGrid commit
// The DatePicker (and UpDownBase<T> OnValidationError) sets this as handled, which breaks the DataGrid commit.
e.Handled = false;
}
if( e.Key == Key.Tab )
{
// We must commit the value before the tab is handled by the
// DataGrid, or the ValidationError event won't be triggered
// DataGrid, or the ValidationError event won't be triggered.
IValidateInput validationElement = this.Child as IValidateInput;
if( validationElement != null )
{

2
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj

@ -953,7 +953,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="GenSerializationAssembly" DependsOnTargets="AssignTargetPaths;Compile;ResolveKeySource" Inputs="$(MSBuildAllProjects);@(IntermediateAssembly)" Outputs="$(OutputPath)$(_SGenDllName)">
<SGen BuildAssemblyName="$(TargetFileName)" BuildAssemblyPath="$(OutputPath)" References="@(ReferencePath)" ShouldGenerateSerializer="true" UseProxyTypes="false" KeyContainer="$(KeyContainerName)" KeyFile="..\SolutionItems\Xceed.snk" DelaySign="$(DelaySign)" ToolPath="$(SGenToolPath)">
<SGen BuildAssemblyName="$(TargetFileName)" BuildAssemblyPath="$(OutputPath)" References="@(ReferencePath)" ShouldGenerateSerializer="true" UseProxyTypes="false" KeyContainer="$(KeyContainerName)" KeyFile="..\..\SolutionItems\Xceed.snk" DelaySign="$(DelaySign)" ToolPath="$(SGenToolPath)">
<Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
</SGen>
<CreateItem Include="$(TargetDir)$(TargetName)*.*;">

2
ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs

@ -25,7 +25,7 @@ internal static class _XceedVersionInfo
public const string BaseVersion = "1.8";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
_XceedVersionInfoCommon.Build;
".0.0";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string PublicKeyToken = "ba83ff368b7563c6";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]

3
ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs

@ -265,6 +265,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
protected override void OnTextChanged( string oldValue, string newValue )
{
//If Text was changed in code-behind.
if( !_isTextChangedFromUI )
{
SyncTextAndValueProperties( true, Text );
@ -374,7 +375,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
{
try
{
Value = ConvertTextToValue( Text );
Value = ConvertTextToValue( text );
}
catch( Exception e )
{

2
ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs

@ -25,7 +25,7 @@ using System.Windows.Input;
namespace Xceed.Wpf.Toolkit.Obselete
{
[Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead", false)]
[Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false)]
public class MaskedTextBox : TextBox
{
#region Members

4
ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs

@ -556,8 +556,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
private string ResolveDescription()
{
//We do not simply rely on the "Description" property of PropertyDescriptor
//since this value is cached bye PropertyDescriptor and the localized version
//(eg. LocalizedDescriptionAttribute) value can dynamicaly change
//since this value is cached by PropertyDescriptor and the localized version
//(e.g., LocalizedDescriptionAttribute) value can dynamicaly change.
DescriptionAttribute descriptionAtt = GetAttribute<DescriptionAttribute>();
return ( descriptionAtt != null )
? descriptionAtt.Description

Loading…
Cancel
Save