Merge branch 'release/v25.1.1' into main

Author: billhenn

Documentation/topics/bars/menu-features/main-menu.md

@@ -81,7 +81,9 @@ Those [BarMenuItem](xref:@ActiproUIRoot.Controls.Bars.BarMenuItem) children can
 
 ## Key Tips
 
-[Key Tips](../ribbon-features/key-tips.md) are not supported within a main menu.
+Key tips in child controls are supported since [BarMainMenu](xref:@ActiproUIRoot.Controls.Bars.BarMainMenu) is a root key tip scope.  Pressing keys like <kbd>Alt</kbd> will activate key tip mode the same as with a ribbon.
+
+See the [Key Tips](../ribbon-features/key-tips.md) topic for more information on key tips.
 
 ## Screen Tips
 

Documentation/topics/bars/ribbon-features/control-hierarchy.md

@@ -40,7 +40,7 @@ The following sample demonstrates how a `ContentControl` might be configured wit
 	</actipro:RibbonContainerPanel>
 
 </actipro:RibbonWindow>
- ```
+```
 }
 @if (wpf) {
 ```xaml
@@ -57,8 +57,8 @@ The following sample demonstrates how a `ContentControl` might be configured wit
 	</bars:RibbonContainerPanel>
 
 </bars:RibbonWindow>
- ```
- }
+```
+}
 
 In the code-behind, the `ribbonContent.Content` should be assigned an instance of `Ribbon`.
 

Documentation/topics/bars/toolbar-features/dockable-toolbars.md

@@ -258,9 +258,7 @@ The [DockableToolBar](xref:@ActiproUIRoot.Controls.Bars.DockableToolBar).[HasOpt
 
 ## Key Tips
 
-Key tips in child controls are supported since [BarMainMenu](xref:@ActiproUIRoot.Controls.Bars.BarMainMenu) is a root key tip scope.  Pressing keys like <kbd>Alt</kbd> will activate key tip mode the same as with a ribbon.
-
-See the [Key Tips](../ribbon-features/key-tips.md) topic for more information on key tips.
+[Key Tips](../ribbon-features/key-tips.md) are not supported within dockable toolbars.
 
 ## Screen Tips
 

Documentation/topics/bars/toolbar-features/standalone-toolbars.md

@@ -26,25 +26,13 @@ The toolbar's `Background`, `BorderBrush`, `BorderThickness`, `CornerRadius`, [H
 The toolbar's `Background`, `BorderBrush`, `BorderThickness`, [CornerRadius](xref:@ActiproUIRoot.Controls.Bars.StandaloneToolBar.CornerRadius), [HasShadow](xref:@ActiproUIRoot.Controls.Bars.StandaloneToolBar.HasShadow), `ItemSpacing`, `Padding`, and [UserInterfaceDensity](xref:@ActiproUIRoot.Controls.Bars.StandaloneToolBar.UserInterfaceDensity) properties can be set to achieve an appearance like above.
 }
 
-@if (avalonia) {
-### Secondary Toolbar
-
-[StandaloneToolBar](xref:@ActiproUIRoot.Controls.Bars.StandaloneToolBar) also works great out-of-the-box as a toolbar that can be placed in another container, such as within a panel.
-
-![Screenshot](../images/standalone-toolbar-toolwindow.png)
-
-*A standalone toolbar in a panel*
-}
-
-@if (wpf) {
 ### Tool Window Toolbar
 
 [StandaloneToolBar](xref:@ActiproUIRoot.Controls.Bars.StandaloneToolBar) also works great out-of-the-box as a toolbar that can be placed in another container, such as within a tool window from the [Actipro Docking/MDI product](../../docking/index.md).
 
 ![Screenshot](../images/standalone-toolbar-toolwindow.png)
 
 *A standalone toolbar in a tool window*
-}
 
 In this usage scenario, it's generally better to use the default appearance that is more compact.
 

Documentation/topics/conversion/converting-to-v25-1.md

@@ -65,4 +65,27 @@ No application logic updates should be required for this change, but user docume
 
 This version enhances the [Intra-Text Adornments](../syntaxeditor/user-interface/adornment/intra-text-adornments.md) feature with the ability to position the intra-text adornment after the tagged text range instead of before.  This option is handy for scenarios such as when AI suggestions should be displayed at the end of a line, after the last character.
 
-The [IsSpacerBefore](xref:ActiproSoftware.Text.Tagging.IIntraTextSpacerTag.IsSpacerBefore) property was added to the [IIntraTextSpacerTag](xref:ActiproSoftware.Text.Tagging.IIntraTextSpacerTag) interface to support this new option.  Any classes implementing this interface should return `true` for this property to retain prior version functionality where the adornment appears before the tagged range.
+The [IsSpacerBefore](xref:ActiproSoftware.Text.Tagging.IIntraTextSpacerTag.IsSpacerBefore) property was added to the [IIntraTextSpacerTag](xref:ActiproSoftware.Text.Tagging.IIntraTextSpacerTag) interface to support this new option.  Any classes implementing this interface should return `true` for this property to retain prior version functionality where the adornment appears before the tagged range.
+
+## Shared Library String Resource Updates
+
+These existing string resources were updated to include underscore characters so that menu item accelerators are available:
+
+- `SRName.UICommandCloseWindowText`
+- `SRName.UICommandMaximizeWindowText`
+- `SRName.UICommandMinimizeWindowText`
+- `SRName.UICommandMoveWindowText`
+- `SRName.UICommandRestoreWindowText`
+- `SRName.UICommandSizeWindowText`
+
+Since some controls like window title bar buttons previously used the above string resources, new resources have been added that do not have underscores.  Use these new string resources in non-menu item contexts:
+
+- `SRName.UICloseButtonToolTip`
+- `SRName.UIMaximizeButtonToolTip`
+- `SRName.UIMinimizeButtonToolTip`
+- `SRName.UIMoveButtonToolTip`
+- `SRName.UIRestoreButtonToolTip`
+- `SRName.UISizeButtonToolTip`
+
+> [!TIP]
+> If you have previously localized the original string resources, you should also localize the new set of string resources.

Documentation/topics/grids/tree-control-features/inline-editing.md

@@ -45,7 +45,7 @@ By specifying a `ContentTemplate` on the content control, you can surround the b
 
 ```xaml
 <DataTemplate>
-    <StackPanel Orientation="Horizontal">
+	<StackPanel Orientation="Horizontal">
 		<Image Width="16" Height="16" Source="{Binding ImageSource}" Stretch="None" VerticalAlignment="Center" />
 		<shared:EditableContentControl Margin="2,0,0,0" Content="{Binding Name, Mode=TwoWay}" IsEditing="{Binding IsEditing, Mode=TwoWay}">
 			<shared:EditableContentControl.ContentTemplate>
@@ -58,7 +58,7 @@ By specifying a `ContentTemplate` on the content control, you can surround the b
 				</DataTemplate>
 			</shared:EditableContentControl.ContentTemplate>
 		</shared:EditableContentControl>
-    </StackPanel>
+	</StackPanel>
 </DataTemplate>
 ```
 

Documentation/topics/licensing.md

@@ -85,6 +85,24 @@ public partial class App : Application {
 > [!WARNING]
 > When using this licensing option, *do not* include any Actipro entries in your application's *licenses.licx* file.
 
+### Notes on Unit Tests
+
+If your application build job runs any unit tests that create Actipro UI controls, the `ActiproLicenseManager.RegisterLicense` method must be called before the Actipro UI controls are created to avoid any licensing-related prompts or exceptions.
+
+```csharp
+using ActiproSoftware.Products;
+...
+public void OnTestActiproControl() {
+	// NOTE: Set "licensee" and "licenseKey" variables to your license information
+	ActiproLicenseManager.RegisterLicense(licensee, licenseKey);
+
+	// Unit test logic here that creates an Actipro control
+	...
+}
+```
+
+The license registration could alternatively be placed in a more centralized location, such as in the unit test class constructor.  The important thing is that it is called before Actipro UI controls are created.
+
 ## Licensing Via a Licenses.licx File
 
 This legacy licensing option is only available for applications that target the classic .NET Framework and is what Actipro exclusively used prior to v20.1.
@@ -152,7 +170,7 @@ The contents of a *licenses.licx* file are pretty simple.  It needs a single lin
 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:
 
 ```
-ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=25.1.0.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=25.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
 ```
 
 > [!IMPORTANT]

Documentation/topics/ribbon/controls/ribbonwindow.md

@@ -56,26 +56,26 @@ Properties like [TitleBarRightContentTemplate](xref:@ActiproUIRoot.Themes.Window
 
 ```xaml
 <ribbon:RibbonWindow.Resources>
-    <DataTemplate x:Key="TitleBarRightContent">
-        <TextBlock>This is the right content</TextBlock>
-    </DataTemplate>
+	<DataTemplate x:Key="TitleBarRightContent">
+		<TextBlock>This is the right content</TextBlock>
+	</DataTemplate>
 </ribbon:RibbonWindow.Resources>
 ```
 
 This template can then be applied to the `WindowChrome` of the `RibbonWindow` in the code-behind file as shown in the following sample:
 
 ```csharp
 public MainWindow() {
-    ' Allow component initialization to complete first
-    InitializeComponent();
-
-    ' Attempt to locate the DataTemplate defined as a resource (make sure the key matches the resource)
-    var template = TryFindResource("TitleBarRightContent") as DataTemplate;
-    if (template != null) {
-        ' Get the WindowChrome pre-installed by this RibbonWindow
-        var chrome = WindowChrome.GetChrome(this);
-        ' Assign the template
-        chrome.TitleBarRightContentTemplate = template;
-    }
+	' Allow component initialization to complete first
+	InitializeComponent();
+
+	' Attempt to locate the DataTemplate defined as a resource (make sure the key matches the resource)
+	var template = TryFindResource("TitleBarRightContent") as DataTemplate;
+	if (template != null) {
+		' Get the WindowChrome pre-installed by this RibbonWindow
+		var chrome = WindowChrome.GetChrome(this);
+		' Assign the template
+		chrome.TitleBarRightContentTemplate = template;
+	}
 }
 ```

Documentation/topics/shared/windows-controls/user-prompt/builder-pattern.md

@@ -55,7 +55,7 @@ The following example demonstrates how a global callback can be registered to cu
 ```csharp
 UserPromptBuilder.RegisterGlobalConfigureCallback(_ => _
 	.WithHeaderFontSize(16)
-    .WithHeaderForeground(new SolidColorBrush(Colors.Blue))
+	.WithHeaderForeground(new SolidColorBrush(Colors.Blue))
 );
 ```
 }

Documentation/topics/syntaxeditor/ll-parser-framework/parser-infrastructure.md

@@ -116,19 +116,19 @@ In this example code, we will create and return a [MergableTokenReader](xref:Act
 /// </summary>
 public class SimpleParser : LLParserBase {
 
-    /// <summary>
-    /// Initializes a new instance of the <c>SimpleParser</c> class.
-    /// </summary>
-    public SimpleParser() : base(new SimpleGrammar()) {}
-
-    /// <summary>
-    /// Creates an <see cref="ITokenReader"/> that is used by the parser to read through tokens.
-    /// </summary>
-    /// <param name="reader">The <see cref="ITextBufferReader"/> that provides access to the text buffer.</param>
-    /// <returns>An <see cref="ITokenReader"/> that is used by the parser to read through tokens.</returns>
-    public override ITokenReader CreateTokenReader(ITextBufferReader reader) {
-        return new MergableTokenReader(reader, new SimpleLexer(new SimpleClassificationTypeProvider()));
-    }
+	/// <summary>
+	/// Initializes a new instance of the <c>SimpleParser</c> class.
+	/// </summary>
+	public SimpleParser() : base(new SimpleGrammar()) {}
+
+	/// <summary>
+	/// Creates an <see cref="ITokenReader"/> that is used by the parser to read through tokens.
+	/// </summary>
+	/// <param name="reader">The <see cref="ITextBufferReader"/> that provides access to the text buffer.</param>
+	/// <returns>An <see cref="ITokenReader"/> that is used by the parser to read through tokens.</returns>
+	public override ITokenReader CreateTokenReader(ITextBufferReader reader) {
+		return new MergableTokenReader(reader, new SimpleLexer(new SimpleClassificationTypeProvider()));
+	}
 }
 ```
 
@@ -151,7 +151,7 @@ protected virtual IParseData CreateParseData(IParseRequest request, IParserState
 	SimpleParseData parseData = new SimpleParseData();
 	this.InitializeParseData(parseData, state);
 
-    // Add custom parse data to the parseData object
+	// Add custom parse data to the parseData object
 
 	return parseData;
 }