Skip to content

Commit

Permalink
Merge branch 'release/v23.1.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
billhenn committed Apr 19, 2023
2 parents acc02b6 + 67105da commit 4d77778
Show file tree
Hide file tree
Showing 1,137 changed files with 44,706 additions and 4,713 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
LICENSEKEY: ${{ secrets.ACTIPRO_CONTROLS_WPF_V22_1_LICENSEKEY }}
LICENSEKEY: ${{ secrets.ACTIPRO_CONTROLS_WPF_V23_1_LICENSEKEY }}

steps:
- name: Cancel duplicate runs
Expand Down
84 changes: 42 additions & 42 deletions Documentation/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,50 @@
{
"src": [
{
"src": "../../Source/bin/ReferenceAssemblies",
"src": "../../Deploy/Build/AssembliesDocFX",
"files": [
// WPF reference assemblies
"PresentationCore.dll",
"PresentationFramework.dll",
"System.Xaml.dll",
"WindowsBase.dll"
]
},
{
"src": "../../Source/bin/Release",
"files": [
"net452/Antlr3.Runtime.dll",
"net452/Irony.dll",
"net452/ActiproSoftware.Shared.Wpf.dll",
"net452/ActiproSoftware.BarCode.Wpf.dll",
"net452/ActiproSoftware.Charts.Wpf.dll",
"net452/ActiproSoftware.DataGrid.Contrib.Wpf.dll",
"net452/ActiproSoftware.Docking.Wpf.dll",
"net452/ActiproSoftware.Editors.Interop.DataGrid.Wpf.dll",
"net452/ActiproSoftware.Editors.Interop.Grids.Wpf.dll",
"net452/ActiproSoftware.Editors.Wpf.dll",
"net452/ActiproSoftware.Gauge.Wpf.dll",
"net452/ActiproSoftware.Grids.Wpf.dll",
"net452/ActiproSoftware.MicroCharts.Wpf.dll",
"net452/ActiproSoftware.Navigation.Wpf.dll",
"net452/ActiproSoftware.Ribbon.Wpf.dll",
"net452/ActiproSoftware.Shell.Wpf.dll",
"net452/ActiproSoftware.SyntaxEditor.Addons.DotNet.Wpf.dll",
"net452/ActiproSoftware.SyntaxEditor.Addons.JavaScript.Wpf.dll",
"net452/ActiproSoftware.SyntaxEditor.Addons.Python.Wpf.dll",
"net452/ActiproSoftware.SyntaxEditor.Addons.Xml.Wpf.dll",
"net452/ActiproSoftware.SyntaxEditor.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.Antlr.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.DotNet.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.DotNet.Roslyn.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.Irony.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.JavaScript.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.Python.Wpf.dll",
"net452/ActiproSoftware.Text.Addons.Xml.Wpf.dll",
"net452/ActiproSoftware.Text.LLParser.Wpf.dll",
"net452/ActiproSoftware.Text.Wpf.dll",
"net452/ActiproSoftware.Themes.Aero.Wpf.dll",
"net452/ActiproSoftware.Views.Wpf.dll",
"net452/ActiproSoftware.Wizard.Wpf.dll"
"WindowsBase.dll",
// Additional assemblies
"Antlr3.Runtime.dll",
"Irony.dll",
// Actipro assemblies
"ActiproSoftware.Shared.Wpf.dll",
"ActiproSoftware.BarCode.Wpf.dll",
"ActiproSoftware.Bars.Wpf.dll",
"ActiproSoftware.Bars.Mvvm.Wpf.dll",
"ActiproSoftware.Charts.Wpf.dll",
"ActiproSoftware.DataGrid.Contrib.Wpf.dll",
"ActiproSoftware.Docking.Wpf.dll",
"ActiproSoftware.Editors.Interop.DataGrid.Wpf.dll",
"ActiproSoftware.Editors.Interop.Grids.Wpf.dll",
"ActiproSoftware.Editors.Wpf.dll",
"ActiproSoftware.Gauge.Wpf.dll",
"ActiproSoftware.Grids.Wpf.dll",
"ActiproSoftware.MicroCharts.Wpf.dll",
"ActiproSoftware.Navigation.Wpf.dll",
"ActiproSoftware.Ribbon.Wpf.dll",
"ActiproSoftware.Shell.Wpf.dll",
"ActiproSoftware.SyntaxEditor.Addons.DotNet.Wpf.dll",
"ActiproSoftware.SyntaxEditor.Addons.JavaScript.Wpf.dll",
"ActiproSoftware.SyntaxEditor.Addons.Python.Wpf.dll",
"ActiproSoftware.SyntaxEditor.Addons.Xml.Wpf.dll",
"ActiproSoftware.SyntaxEditor.Wpf.dll",
"ActiproSoftware.Text.Addons.Antlr.Wpf.dll",
"ActiproSoftware.Text.Addons.DotNet.Wpf.dll",
"ActiproSoftware.Text.Addons.DotNet.Roslyn.Wpf.dll",
"ActiproSoftware.Text.Addons.Irony.Wpf.dll",
"ActiproSoftware.Text.Addons.JavaScript.Wpf.dll",
"ActiproSoftware.Text.Addons.Python.Wpf.dll",
"ActiproSoftware.Text.Addons.Xml.Wpf.dll",
"ActiproSoftware.Text.LLParser.Wpf.dll",
"ActiproSoftware.Text.Wpf.dll",
"ActiproSoftware.Themes.Aero.Wpf.dll",
"ActiproSoftware.Views.Wpf.dll",
"ActiproSoftware.Wizard.Wpf.dll"
// "**.csproj"
]
}
Expand Down Expand Up @@ -74,7 +74,7 @@
"**.png",
"**.gif",
"**.jpg"
],
]
}
],
"overwrite": [
Expand All @@ -96,7 +96,7 @@
"_docsCopyrightYears": "1999-2023",
"_docsProductHref": "https://www.actiprosoftware.com/products/controls/wpf",
"_docsProductName": "WPF Controls",
"_docsProductVersion": "22.1",
"_docsProductVersion": "23.1",
"_disableContribution": true,
"_enableNewTab": true,
"_gitContribute": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ symbology.Value = "ABC-123";
BitmapSource source = symbology.ToBitmap(96, 96);
```

This sample code takes the `BitmapSource` from the previous sample code and writes it to a `PNG` file whose path is assumed to be in `outputPath`.
This sample code takes the `BitmapSource` from the previous sample code and writes it to a PNG file whose path is assumed to be in `outputPath`.

```csharp
FileStream outStream = new FileStream(outputPath, FileMode.Create);
Expand Down
2 changes: 1 addition & 1 deletion Documentation/topics/barcode/barcode-basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The [Caption](xref:@ActiproUIRoot.Controls.BarCode.BarCode.Caption) property can

## Setting a Symbology

Each bar code symbology is implemented in a separate .NET type. For instance, `Code 39` is implemented by the [Code39Symbology](xref:@ActiproUIRoot.Controls.BarCode.Code39Symbology) class.
Each bar code symbology is implemented in a separate .NET type. For instance, Code 39 is implemented by the [Code39Symbology](xref:@ActiproUIRoot.Controls.BarCode.Code39Symbology) class.

Set the symbology that you would like to use for your bar code to the [BarCode](xref:@ActiproUIRoot.Controls.BarCode.BarCode).[Symbology](xref:@ActiproUIRoot.Controls.BarCode.BarCode.Symbology) property.

Expand Down
16 changes: 8 additions & 8 deletions Documentation/topics/barcode/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We've engineered bar code to be extremely easy to use.

## Add Assembly References

First, add references to the "ActiproSoftware.Shared.@@PlatformAssemblySuffix.dll" and "ActiproSoftware.BarCode.@@PlatformAssemblySuffix.dll" assemblies. They should have been installed in the GAC during the control installation process. However they also will be located in the appropriate Program Files folders. See the product's Readme for details on those locations.
First, add references to the *ActiproSoftware.Shared.@@PlatformAssemblySuffix.dll* and *ActiproSoftware.BarCode.@@PlatformAssemblySuffix.dll* assemblies. They should have been installed in the GAC during the control installation process. However, they will also be located in the appropriate *Program Files* folders. See the product's Readme for details on those locations.

## Add the BarCode Control

Expand All @@ -18,11 +18,11 @@ Then find the parent element that will contain the bar code. This could be a `W
Next, add a [BarCode](xref:@ActiproUIRoot.Controls.BarCode.BarCode) control to the desired parent element. In this sample we will add the [BarCode](xref:@ActiproUIRoot.Controls.BarCode.BarCode) to a `FlowDocument`:

```xaml
<FlowDocument
<FlowDocument
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:barCode="http://schemas.actiprosoftware.com/winfx/xaml/barcode"
FontFamily="Calibri" FontSize="14" TextAlignment="Left"
xmlns:barCode="http://schemas.actiprosoftware.com/winfx/xaml/barcode"
FontFamily="Calibri" FontSize="14" TextAlignment="Left"
>
<barCode:BarCode>
</barCode:BarCode>
Expand All @@ -34,11 +34,11 @@ Next, add a [BarCode](xref:@ActiproUIRoot.Controls.BarCode.BarCode) control to t
Now we need to set the type of symbology that we wish to use. In this sample we will use Code 39 Extended, which is one of the most common types of bar codes and supports all lower ASCII characters.

```xaml
<FlowDocument
<FlowDocument
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:barCode="http://schemas.actiprosoftware.com/winfx/xaml/barcode"
FontFamily="Calibri" FontSize="14" TextAlignment="Left"
xmlns:barCode="http://schemas.actiprosoftware.com/winfx/xaml/barcode"
FontFamily="Calibri" FontSize="14" TextAlignment="Left"
>
<barCode:BarCode>
<barCode:Code39ExtendedSymbology Value="123456" BarHeight="25" />
Expand All @@ -54,6 +54,6 @@ That's all we need to do! You can optionally configure many other settings for

It's very easy to use Bar Code and there are probably a lot of great features that you aren't aware of.

Run through the feature documentation and also look at the numerous QuickStarts located in the sample project. The documentation is very thorough and the sample project demonstrates almost every feature of Bar Code.
Run through the feature documentation and also look at the numerous QuickStarts located in the sample project. The documentation is very thorough, and the sample project demonstrates almost every feature of Bar Code.

If you require further assistance after looking through those, please visit our support forum for the product.
28 changes: 14 additions & 14 deletions Documentation/topics/barcode/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ Actipro Bar Code is a bar code generation product, which can be used in your org

*Two BarCode control instances, each with a different symbology*

This product is useful for adding bar codes to any WPF application or report. Bar codes can be saved in XPS document content, saved to image files, rendered directly to a WPF DrawingContext, or added as a child control in any FixedDocument, FlowDocument or other WPF control.
This product is useful for adding bar codes to any WPF application or report. Bar codes can be saved in XPS document content, saved to image files, rendered directly to a WPF `DrawingContext`, or added as a child control in any `FixedDocument`, `FlowDocument` or other WPF control.

Actipro Bar Code takes all the work out of the bar code generation process, by allowing you to simply say what value to encode. It will automatically calculate any appropriate checksums and will generate the bar code for you. The output is completely customizable with many options, everything from setting the bar height to display of the encoded value below the bar lines.

The most common symbologies are all supported, including EAN-13, EAN-8, UPC-A, UPC-E, Code 39 (and full ASCII variant), Code 93 (and full ASCII variant), Code 128, Codabar, Interleaved 2 of 5, and Postnet. In addition, the 2D QR Code symbology is supported.
The most common symbologies are all supported, including [2D QR Code](symbologies/qr-code.md), [EAN-13](symbologies/ean13.md), [EAN-8](symbologies/ean8.md), [UPC-A](symbologies/upc-a.md), [UPC-E](symbologies/upc-e.md), [Code 39](symbologies/code39.md) (and [full ASCII](symbologies/code39-extended.md) variant), [Code 93](symbologies/code93.md) (and [full ASCII](symbologies/code93-extended.md) variant), [Code 128](symbologies/code128.md), [Codabar](symbologies/codabar.md), and [Interleaved 2 of 5](symbologies/interleaved2of5.md).

## What About Bar Code Fonts?

Up until now, the only way to generate bar codes in WPF was to use bar code fonts (a.k.a. fontware). However bar code fonts have a lot of limitations. When you compare them to Actipro Bar Code, you'll find that Actipro Bar Code provides the best solution for bar code generation in WPF.
Up until now, the only way to generate bar codes in WPF was to use bar code fonts (a.k.a. fontware). However, bar code fonts have a lot of limitations. When you compare them to Actipro Bar Code, you'll find that Actipro Bar Code provides the best solution for bar code generation in WPF.

Please see our [Why Not Bar Code Fonts?](why-not-fonts.md) topic for more information.

Expand Down Expand Up @@ -84,8 +84,8 @@ Please see our [Why Not Bar Code Fonts?](why-not-fonts.md) topic for more inform

### BarCode Control Features

- Implemeted as a WPF Control that can be used in any WPF context.
- Use in a FixedDocument, FlowDocument, or add to an XPS document.
- Implemented as a WPF Control that can be used in any WPF context.
- Use in a `FixedDocument`, `FlowDocument`, or add to an XPS document.
- Add [borders around the bar code](barcode-basics.md) and adjust their corner radius.
- Add a [caption above the bar code](barcode-basics.md).
- Easily switch between symbologies.
Expand All @@ -94,22 +94,22 @@ Please see our [Why Not Bar Code Fonts?](why-not-fonts.md) topic for more inform

### Symbology Features

- Easily [render a bitmap](advanced-features/export-to-image.md) of the bar code and save to any image format (.png, .gif, .jpg, etc.) supported by WPF.
- Easily [render a bitmap](advanced-features/export-to-image.md) of the bar code and save to any image format (PNG, GIF, JPG, etc.) supported by WPF.
- Programmatically measure and [render bar codes to a DrawingContext](advanced-features/drawing-context.md).
- Set the fore and background colors of the bar code output.
- Set the bar height of linear bar codes.
- Set the cell size of 2D codes.
- Set the minimum bar height/width ratio so that long bar codes are tall enough to be read properly.
- Specify the thickness of the quiet zone surrounding the bar code.
- Use multiple value display styles for linear bar codes including:
- **None** - The value is not displayed.
- **Centered** - The value is centered horizontally.
- **LeftAligned** - The value is left-aligned.
- **RightAligned** - The value is right-aligned.
- **CharactersAlignedWithBars** - The characters in the value are centered under the bars that represent each character.
- **QuietZoneExtension** - The first and last characters are drawn in the lead/tail quiet zones and the remaining characters are centered under the encoded character runs. This is used for symbologies such as **UPC-A**.
- **QuietZoneExtensionLeft** - The first character is drawn in the lead quiet zones and the remaining characters are centered under the encoded character runs. This is used for symbologies such as **EIN-13**.

- `None` - The value is not displayed.
- `Centered` - The value is centered horizontally.
- `LeftAligned` - The value is left-aligned.
- `RightAligned` - The value is right-aligned.
- `CharactersAlignedWithBars` - The characters in the value are centered under the bars that represent each character.
- `QuietZoneExtension` - The first and last characters are drawn in the lead/tail quiet zones and the remaining characters are centered under the encoded character runs. This is used for symbologies such as **UPC-A**.
- `QuietZoneExtensionLeft` - The first character is drawn in the lead quiet zones and the remaining characters are centered under the encoded character runs. This is used for symbologies such as **EIN-13**.
- Specify how far (if at all) the displayed value "intrudes" into the bar lines (used in bar codes like UPC-A).
- Inclusion of [ValidationRule classes for every symbology](advanced-features/validation-rules.md), that can be used to validate input.
- Validate bar code values programmatically.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/topics/barcode/symbologies/codabar.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The following table gives an overview of the characteristics of the symbology.
|-----|-----|
| Implementation Class | [CodabarSymbology](xref:@ActiproUIRoot.Controls.BarCode.CodabarSymbology) |
| Base Class | [LinearBarCodeSymbology](xref:@ActiproUIRoot.Controls.BarCode.LinearBarCodeSymbology) |
| Related ValidationRule Class | [CodabarValidationRule](xref:@ActiproUIRoot.Controls.BarCode.ValidationRules.CodabarValidationRule) |
| Related `ValidationRule` Class | [CodabarValidationRule](xref:@ActiproUIRoot.Controls.BarCode.ValidationRules.CodabarValidationRule) |
| Encodable Characters | Number and `-$:/.+` characters, along with 4 start/stop characters. |
| Supports Checksum | No. This symbology is self-checking, so no checksum or check digit is required. |
| Has Special Start/Stop Characters | Yes. Each encoded value must start and stop with `A`, `B`, `C`, or `D`. |
Expand Down
2 changes: 1 addition & 1 deletion Documentation/topics/barcode/symbologies/code128.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The following table gives an overview of the characteristics of the symbology.
|-----|-----|
| Implementation Class | [Code128Symbology](xref:@ActiproUIRoot.Controls.BarCode.Code128Symbology) |
| Base Class | [LinearBarCodeSymbology](xref:@ActiproUIRoot.Controls.BarCode.LinearBarCodeSymbology) |
| Related ValidationRule Class | [Code128ValidationRule](xref:@ActiproUIRoot.Controls.BarCode.ValidationRules.Code128ValidationRule) |
| Related `ValidationRule` Class | [Code128ValidationRule](xref:@ActiproUIRoot.Controls.BarCode.ValidationRules.Code128ValidationRule) |
| Encodable Characters | All lower 128 ASCII characters. |
| Supports Checksum | Yes. This symbology implementation auto-calculates and inserts a check character. |
| Has Special Start/Stop Characters | No. |
Expand Down
6 changes: 3 additions & 3 deletions Documentation/topics/barcode/symbologies/code39-extended.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ order: 9
---
# Code 39 Extended

Code 39 Extended is a linear symbology, and supports the encoding of many more characters than standard Code 39.
Code 39 Extended is a linear symbology and supports the encoding of many more characters than standard Code 39.

This symbology is also known as Code 39 Full ASCII.

Expand All @@ -21,7 +21,7 @@ The following table gives an overview of the characteristics of the symbology.
|-----|-----|
| Implementation Class | [Code39ExtendedSymbology](xref:@ActiproUIRoot.Controls.BarCode.Code39ExtendedSymbology) |
| Base Class | [Code39Symbology](xref:@ActiproUIRoot.Controls.BarCode.Code39Symbology) |
| Related ValidationRule Class | [Code39ExtendedValidationRule](xref:@ActiproUIRoot.Controls.BarCode.ValidationRules.Code39ExtendedValidationRule) |
| Related `ValidationRule` Class | [Code39ExtendedValidationRule](xref:@ActiproUIRoot.Controls.BarCode.ValidationRules.Code39ExtendedValidationRule) |
| Encodable Characters | All lower 128 ASCII characters. |
| Supports Checksum | Yes. While this symbology is self-checking, the implementation can optionally auto-calculate and insert a check character. This is referred to as Code 39 mod 43. |
| Has Special Start/Stop Characters | Yes. Must start and stop with `*` characters, but these are automatically appended for you. |
Expand All @@ -33,7 +33,7 @@ This symbology has these important members:

| Member | Description |
|-----|-----|
| [AreStartStopCharactersVisible](xref:@ActiproUIRoot.Controls.BarCode.Code39Symbology.AreStartStopCharactersVisible) Property | Gets or sets whether the start/stop characters (*) are visible in the displayed value. |
| [AreStartStopCharactersVisible](xref:@ActiproUIRoot.Controls.BarCode.Code39Symbology.AreStartStopCharactersVisible) Property | Gets or sets whether the start/stop characters (`*`) are visible in the displayed value. |
| [Background](xref:@ActiproUIRoot.Controls.BarCode.BarCodeSymbology.Background) Property | Gets or sets the `Brush` to use for rendering the background. |
| [BarHeight](xref:@ActiproUIRoot.Controls.BarCode.LinearBarCodeSymbology.BarHeight) Property | Gets or sets the desired height of the bars. |
| [BarWidthRatio](xref:@ActiproUIRoot.Controls.BarCode.LinearBarCodeSymbology.BarWidthRatio) Property | Gets or sets the width ratio of wide lines to narrow lines. |
Expand Down
Loading

0 comments on commit 4d77778

Please sign in to comment.