Skip to content

Commit 4925637

Browse files
committed
Updates for v25.1.3.
1 parent 2a10123 commit 4925637

File tree

105 files changed

+271
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+271
-177
lines changed

Build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<RootNamespace>ActiproSoftware.Tools.Builds</RootNamespace>
1919
<Company>Actipro Software LLC</Company>
2020
<Authors>Actipro Software LLC</Authors>
21-
<Copyright>Copyright (c) 2020-2025 Actipro Software LLC. All rights reserved.</Copyright>
21+
<Copyright>Copyright (c) 2020-2026 Actipro Software LLC. All rights reserved.</Copyright>
2222

2323
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
2424

Documentation/docfx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"_appTitle": "Actipro WPF Controls Docs",
5454
"_docsCompanyHref": "https://www.actiprosoftware.com/products/controls/wpf",
5555
"_docsCompanyName": "Actipro Software LLC",
56-
"_docsCopyrightYears": "1999-2025",
56+
"_docsCopyrightYears": "1999-2026",
5757
"_docsProductHref": "https://www.actiprosoftware.com/products/controls/wpf",
5858
"_docsProductName": "WPF Controls",
5959
"_docsProductVersion": "25.1",

Documentation/topics/editors/editboxes/datetimeeditbox.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ This edit box has multiple parts:
113113

114114
When the caret is over a part, the part value may be incremented or decremented. Please see the [Edit Box Basics](parteditboxbase.md) topic for information on how to do this.
115115

116+
## Parsing
117+
118+
When text is entered directly into the control, the value is initially parsed based on the current [Format](xref:@ActiproUIRoot.Controls.Editors.DateTimeEditBox.Format). If unsuccessful, additional date formats will be attempted.
119+
120+
The [ParsingStyles](xref:@ActiproUIRoot.Controls.Editors.DateTimeEditBox.ParsingStyles) property, which defaults to `DateTimeStyles.AllowWhiteSpaces`, can be used to provide additional control over how values are parsed, including options such as which time zone is applied when one is not specified.
121+
122+
> [!WARNING]
123+
> When setting [ParsingStyles](xref:@ActiproUIRoot.Controls.Editors.DateTimeEditBox.ParsingStyles) to a new value, it is recommend to OR the value with `DateTimeStyles.AllowWhiteSpaces` or else white space may not be parsed correctly. For example, to assume UTC when no time zone is specified and keep the default white space handling, set [ParsingStyles](xref:@ActiproUIRoot.Controls.Editors.DateTimeEditBox.ParsingStyles) to `DateTimeStyles.AllowWhiteSpaces | DateTimeStyles.AssumeUniversal`.
124+
116125
## Sample XAML
117126

118127
This control can be placed within any other XAML container control, such as a `Page` or `Panel` with this sort of XAML:

Documentation/topics/licensing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ The contents of a *licenses.licx* file are pretty simple. It needs a single lin
170170
This single line (update the version to match the one you use) should be added to the *licenses.licx* file in any project that uses Actipro @@PlatformName control or SyntaxEditor add-on products:
171171

172172
```
173-
ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=25.1.2.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
173+
ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=25.1.3.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
174174
```
175175

176176
> [!IMPORTANT]

Documentation/topics/shared/windows-controls/card.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ xmlns:shared="http://schemas.actiprosoftware.com/winfx/xaml/shared"
9494

9595
### Header
9696

97-
The [Title](xref:@ActiproUIRoot.Controls.Card.Title) and [Description](xref:@ActiproUIRoot.Controls.Card.Description) properties can be used to define a header with a default template where the [Title](xref:@ActiproUIRoot.Controls.Card.Title) is displayed with typography consistent with a heading, and the [Description](xref:@ActiproUIRoot.Controls.Card.Description), if defined, is displayed immediately below it.
97+
By default, the [Header](xref:@ActiproUIRoot.Controls.Card.Header) property is undefined. Instead, a default [HeaderTemplate](xref:@ActiproUIRoot.Controls.Card.HeaderTemplate) is provided which utilizes `TextBlock` controls to display the [Title](xref:@ActiproUIRoot.Controls.Card.Title) and [Description](xref:@ActiproUIRoot.Controls.Card.Description) properties. The [Title](xref:@ActiproUIRoot.Controls.Card.Title) is displayed with typography consistent with a heading, and the [Description](xref:@ActiproUIRoot.Controls.Card.Description), if defined, is displayed immediately below it.
9898

9999
@if (avalonia) {
100-
Use the [TitleTheme](xref:@ActiproUIRoot.Controls.Card.TitleTheme) and [DescriptionTheme](xref:@ActiproUIRoot.Controls.Card.DescriptionTheme) properties to customize the appearance of each element.
100+
Use the [TitleTheme](xref:@ActiproUIRoot.Controls.Card.TitleTheme) and [DescriptionTheme](xref:@ActiproUIRoot.Controls.Card.DescriptionTheme) properties to customize the appearance of each `TextBlock` element in the default [HeaderTemplate](xref:@ActiproUIRoot.Controls.Card.HeaderTemplate).
101101
}
102102
@if (wpf) {
103-
Use the [TitleStyle](xref:@ActiproUIRoot.Controls.Card.TitleStyle) and [DescriptionStyle](xref:@ActiproUIRoot.Controls.Card.DescriptionStyle) properties to customize the appearance of each element.
103+
Use the [TitleStyle](xref:@ActiproUIRoot.Controls.Card.TitleStyle) and [DescriptionStyle](xref:@ActiproUIRoot.Controls.Card.DescriptionStyle) properties to customize the appearance of each `TextBlock` element in the default [HeaderTemplate](xref:@ActiproUIRoot.Controls.Card.HeaderTemplate).
104104
}
105105

106106
The following example demonstrates creating a [Card](xref:@ActiproUIRoot.Controls.Card) with both [Title](xref:@ActiproUIRoot.Controls.Card.Title) and [Description](xref:@ActiproUIRoot.Controls.Card.Description) defined:
@@ -126,16 +126,20 @@ xmlns:shared="http://schemas.actiprosoftware.com/winfx/xaml/shared"
126126

127127
Alternatively, the [Header](xref:@ActiproUIRoot.Controls.Card.Header) can be set to any value supported by `ContentPresenter`. In this case, the explicit content will be used instead of the default template based on the [Title](xref:@ActiproUIRoot.Controls.Card.Title) and [Description](xref:@ActiproUIRoot.Controls.Card.Description) properties.
128128

129-
The following example demonstrates creating a [Card](xref:@ActiproUIRoot.Controls.Card) with an explicit [Header](xref:@ActiproUIRoot.Controls.Card.Header) defined:
129+
> [!IMPORTANT]
130+
> The [Title](xref:@ActiproUIRoot.Controls.Card.Title) property is not the same as the [Header](xref:@ActiproUIRoot.Controls.Card.Header) property. It is only a `string` property that, along with the [Description](xref:@ActiproUIRoot.Controls.Card.Description) property, can be used by elements in a [Header](xref:@ActiproUIRoot.Controls.Card.Header) or [HeaderTemplate](xref:@ActiproUIRoot.Controls.Card.HeaderTemplate).
130131
131132
@if (avalonia) {
133+
The following example demonstrates creating a [Card](xref:@ActiproUIRoot.Controls.Card) with an explicit [Header](xref:@ActiproUIRoot.Controls.Card.Header) defined and whose `TextBlock` applies the [TitleTheme](xref:@ActiproUIRoot.Controls.Card.TitleTheme):
134+
132135
```xaml
133136
xmlns:actipro="http://schemas.actiprosoftware.com/avaloniaui"
134137
...
135138
<actipro:Card>
136139

137140
<actipro:Card.Header>
138-
<TextBlock FontWeight="Bold">Title Here</TextBlock>
141+
<TextBlock FontWeight="Bold" Text="Title Here"
142+
Theme="{Binding $parent[actipro:Card].TitleTheme}" />
139143
</actipro:Card.Header>
140144

141145
<!-- Insert Card Content Here -->
@@ -144,13 +148,16 @@ xmlns:actipro="http://schemas.actiprosoftware.com/avaloniaui"
144148
```
145149
}
146150
@if (wpf) {
151+
The following example demonstrates creating a [Card](xref:@ActiproUIRoot.Controls.Card) with an explicit [Header](xref:@ActiproUIRoot.Controls.Card.Header) defined and whose `TextBlock` applies the [TitleStyle](xref:@ActiproUIRoot.Controls.Card.TitleStyle):
152+
147153
```xaml
148154
xmlns:shared="http://schemas.actiprosoftware.com/winfx/xaml/shared"
149155
...
150156
<shared:Card>
151157

152158
<shared:Card.Header>
153-
<TextBlock FontWeight="Bold">Title Here</TextBlock>
159+
<TextBlock FontWeight="Bold" Text="Title Here"
160+
Style="{Binding TitleStyle, RelativeSource={RelativeSource AncestorType={x:Type shared:Card}}}" />
154161
</shared:Card.Header>
155162

156163
<!-- Insert Card Content Here -->
@@ -159,6 +166,9 @@ xmlns:shared="http://schemas.actiprosoftware.com/winfx/xaml/shared"
159166
```
160167
}
161168

169+
> [!NOTE]
170+
> The default [HeaderTemplate](xref:@ActiproUIRoot.Controls.Card.HeaderTemplate) (that uses the [Title](xref:@ActiproUIRoot.Controls.Card.Title) and [Description](xref:@ActiproUIRoot.Controls.Card.Description) properties) is only applied when the [Header](xref:@ActiproUIRoot.Controls.Card.Header) has not been explicitly defined, so there is no need to clear the default [HeaderTemplate](xref:@ActiproUIRoot.Controls.Card.HeaderTemplate) when defining a custom [Header](xref:@ActiproUIRoot.Controls.Card.Header).
171+
162172
### Thumbnail
163173

164174
The [Thumbnail](xref:@ActiproUIRoot.Controls.Card.Thumbnail) is displayed in the header area, but is separate from the [Header](xref:@ActiproUIRoot.Controls.Card.Header) content. [Thumbnail](xref:@ActiproUIRoot.Controls.Card.Thumbnail) can be set to any value supported by `ContentPresenter` but is typically used to display a small image.

License.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2025 Actipro Software LLC.
3+
Copyright (c) 2026 Actipro Software LLC.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Samples/PrismIntegration/ActiproSoftware.References.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
https://www.actiprosoftware.com/docs/controls/wpf/nuget
99
-->
1010
<PropertyGroup>
11-
<ActiproVersion>25.1.2</ActiproVersion>
11+
<ActiproVersion>25.1.3</ActiproVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

Samples/PrismIntegration/PrismIntegration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<RootNamespace>ActiproSoftware.Windows.PrismIntegration</RootNamespace>
1414
<Company>Actipro Software LLC</Company>
15-
<Copyright>Copyright (c) 2008-2025 Actipro Software LLC. All rights reserved.</Copyright>
15+
<Copyright>Copyright (c) 2008-2026 Actipro Software LLC. All rights reserved.</Copyright>
1616
<Title>Prism (Unity) Integration Sample</Title>
1717
<Product>$(Title)</Product>
1818
<Description>Sample application to demonstrate integrating into a Prism (Unity) application.</Description>

Samples/SampleBrowser/ActiproSoftware.References.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
https://www.actiprosoftware.com/docs/controls/wpf/nuget
99
-->
1010
<PropertyGroup>
11-
<ActiproVersion>25.1.2</ActiproVersion>
11+
<ActiproVersion>25.1.3</ActiproVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

Samples/SampleBrowser/ProductSamples/SyntaxEditorSamples/Languages/Definitions/Assembly.langdef

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Actipro Syntax Language Definition (.langdef)
66
http://www.actiprosoftware.com
77
88
'Assembly' language created by Actipro Software LLC.
9-
Copyright (c) 2001-2025 Actipro Software LLC. All rights reserved.
9+
Copyright (c) 2001-2026 Actipro Software LLC. All rights reserved.
1010
1111
-->
12-
<LanguageDefinition LanguageKey="Assembly" Creator="Actipro Software LLC" Copyright="Copyright (c) 2001-2025 Actipro Software LLC. All rights reserved." xmlns="http://schemas.actiprosoftware.com/langdef/1.0">
12+
<LanguageDefinition LanguageKey="Assembly" Creator="Actipro Software LLC" Copyright="Copyright (c) 2001-2026 Actipro Software LLC. All rights reserved." xmlns="http://schemas.actiprosoftware.com/langdef/1.0">
1313
<!-- Classification types -->
1414
<LanguageDefinition.ClassificationTypes>
1515
<ClassificationType Key="Comment" DefaultStyle="#FF008000" DarkStyle="#FF57A64A" />

0 commit comments

Comments
 (0)