Skip to content

Commit 19fbedc

Browse files
billhennbillhenn
committed
Merge branch 'release/v25.1.2' into main
2 parents 14bc407 + 8af191c commit 19fbedc

File tree

65 files changed

+652
-182
lines changed

Some content is hidden

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

65 files changed

+652
-182
lines changed

‎.nuke/build.schema.json‎

Lines changed: 79 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,48 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Build Schema",
4-
"$ref": "#/definitions/build",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"Compile",
28+
"CompileSampleProjects",
29+
"CompileSourceProjects",
30+
"InstallLicense",
31+
"IntegrationBuild"
32+
]
33+
},
34+
"Verbosity": {
35+
"type": "string",
36+
"description": "",
37+
"enum": [
38+
"Verbose",
39+
"Normal",
40+
"Minimal",
41+
"Quiet"
42+
]
43+
},
44+
"NukeBuild": {
845
"properties": {
9-
"Configuration": {
10-
"type": "string",
11-
"description": "Configuration to build ('Debug' or 'Release')",
12-
"enum": [
13-
"Debug",
14-
"Release"
15-
]
16-
},
1746
"Continue": {
1847
"type": "boolean",
1948
"description": "Indicates to continue a previously failed build attempt"
@@ -23,33 +52,8 @@
2352
"description": "Shows the help text for this build assembly"
2453
},
2554
"Host": {
26-
"type": "string",
2755
"description": "Host for execution. Default is 'automatic'",
28-
"enum": [
29-
"AppVeyor",
30-
"AzurePipelines",
31-
"Bamboo",
32-
"Bitrise",
33-
"GitHubActions",
34-
"GitLab",
35-
"Jenkins",
36-
"Rider",
37-
"SpaceAutomation",
38-
"TeamCity",
39-
"Terminal",
40-
"TravisCI",
41-
"VisualStudio",
42-
"VSCode"
43-
]
44-
},
45-
"LibrariesSolution": {
46-
"type": "string",
47-
"description": "Path to a solution file that is automatically loaded. Default is Source/WPF-Libraries.sln"
48-
},
49-
"LicenseKey": {
50-
"type": "string",
51-
"description": "The license key to use",
52-
"default": "Secrets must be entered via 'nuke :secret [profile]'"
56+
"$ref": "#/definitions/Host"
5357
},
5458
"NoLogo": {
5559
"type": "boolean",
@@ -74,53 +78,59 @@
7478
"type": "string",
7579
"description": "Root directory during build execution"
7680
},
77-
"SampleBrowserSolution": {
78-
"type": "string",
79-
"description": "Path to a solution file that is automatically loaded. Default is Samples/SampleBrowser/SampleBrowser.sln"
80-
},
81-
"SamplePrismIntegrationUnitySolution": {
82-
"type": "string",
83-
"description": "Path to a solution file that is automatically loaded. Default is Samples/PrismIntegration/PrismIntegration.sln"
84-
},
8581
"Skip": {
8682
"type": "array",
8783
"description": "List of targets to be skipped. Empty list skips all dependencies",
8884
"items": {
89-
"type": "string",
90-
"enum": [
91-
"Compile",
92-
"CompileSampleProjects",
93-
"CompileSourceProjects",
94-
"InstallLicense",
95-
"IntegrationBuild"
96-
]
85+
"$ref": "#/definitions/ExecutableTarget"
9786
}
9887
},
9988
"Target": {
10089
"type": "array",
10190
"description": "List of targets to be invoked. Default is '{default_target}'",
10291
"items": {
103-
"type": "string",
104-
"enum": [
105-
"Compile",
106-
"CompileSampleProjects",
107-
"CompileSourceProjects",
108-
"InstallLicense",
109-
"IntegrationBuild"
110-
]
92+
"$ref": "#/definitions/ExecutableTarget"
11193
}
11294
},
11395
"Verbosity": {
114-
"type": "string",
11596
"description": "Logging verbosity during build execution. Default is 'Normal'",
97+
"$ref": "#/definitions/Verbosity"
98+
}
99+
}
100+
}
101+
},
102+
"allOf": [
103+
{
104+
"properties": {
105+
"Configuration": {
106+
"type": "string",
107+
"description": "Configuration to build ('Debug' or 'Release')",
116108
"enum": [
117-
"Minimal",
118-
"Normal",
119-
"Quiet",
120-
"Verbose"
109+
"Debug",
110+
"Release"
121111
]
112+
},
113+
"LibrariesSolution": {
114+
"type": "string",
115+
"description": "Path to a solution file that is automatically loaded. Default is Source/WPF-Libraries.sln"
116+
},
117+
"LicenseKey": {
118+
"type": "string",
119+
"description": "The license key to use",
120+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
121+
},
122+
"SampleBrowserSolution": {
123+
"type": "string",
124+
"description": "Path to a solution file that is automatically loaded. Default is Samples/SampleBrowser/SampleBrowser.sln"
125+
},
126+
"SamplePrismIntegrationUnitySolution": {
127+
"type": "string",
128+
"description": "Path to a solution file that is automatically loaded. Default is Samples/PrismIntegration/PrismIntegration.sln"
122129
}
123130
}
131+
},
132+
{
133+
"$ref": "#/definitions/NukeBuild"
124134
}
125-
}
126-
}
135+
]
136+
}

‎Build/Build.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Nuke.Common" Version="6.0.1" />
32+
<PackageReference Include="Nuke.Common" Version="8.1.4" />
3333
</ItemGroup>
3434

3535
</Project>

‎Documentation/topics/bars/controls/button.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,10 @@ A [BarButton](xref:@ActiproUIRoot.Controls.Bars.BarButton).`Click` and [BarMenuI
261261

262262
See the [Using Commands](using-commands.md) topic for more information on commands.
263263

264+
### Focus Behavior
265+
266+
In cases where you wish for the button to remain focused after a click, set the [BarButton](xref:@ActiproUIRoot.Controls.Bars.BarButton).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.BarButton.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
267+
264268
## Input Gesture Text
265269

266270
The control can have input gesture text associated with it that describes a related keyboard shortcut, and is displayed in the screen tip for the control or in the menu item itself.

‎Documentation/topics/bars/controls/checkbox.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,10 @@ A [BarCheckBox](xref:@ActiproUIRoot.Controls.Bars.BarCheckBox).`Click` and [BarM
217217

218218
See the [Using Commands](using-commands.md) topic for more information on commands.
219219

220+
### Focus Behavior
221+
222+
In cases where you wish for the checkbox to remain focused after a click, set the [BarCheckBox](xref:@ActiproUIRoot.Controls.Bars.BarCheckBox).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.BarButton.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
223+
220224
## Input Gesture Text
221225

222226
The control can have input gesture text associated with it that describes a related keyboard shortcut,

‎Documentation/topics/bars/controls/combobox.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ The [PopupOpeningCommand](xref:@ActiproUIRoot.Controls.Bars.Primitives.BarMenuGa
240240

241241
See the [Using Commands](using-commands.md) topic for more information on commands.
242242

243+
### Focus Behavior
244+
245+
In cases where you wish for the combobox to remain focused after selecting an item or committing a value, set the [BarComboBox](xref:@ActiproUIRoot.Controls.Bars.BarComboBox).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.Primitives.BarMenuGalleryHostBase.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
246+
243247
## Screen Tips
244248

245249
The controls support screen tips, which are formatted tool tips.

‎Documentation/topics/bars/controls/control-basics.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,16 @@ For example, a regular button will execute its command and raise a `Click` event
194194

195195
See the [Using Commands](using-commands.md) topic for more information on commands.
196196

197+
### Focus Behavior
198+
199+
When the primary invocation of a control occurs, such as a button click, the `InvocationFocusBehavior` setting on the control determines what happens with focus. This property is available on most controls that can appear in a ribbon or toolbar context.
200+
201+
The value options are:
202+
203+
- [Default](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Default) - When the control is in a focus scope like a ribbon or toolbar, it will try to restore focus to control that last control had focus outside of the containing focus scope.
204+
- [None](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.None) - The Actipro logic for the control will not do any focus processing itself. However note that in some cases, external base classes may still process focus.
205+
- [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self) - The control will focus itself.
206+
197207
## Input Gesture Text
198208

199209
Input gestures are keyboard shortcuts that provide access to a control's command. For instance, <kbd>Ctrl</kbd>+<kbd>C</kbd> is commonly associated with the clipboard copy command.
@@ -264,9 +274,11 @@ Here is a list of common attached properties that are related to concepts descri
264274
| [MediumIconProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.MediumIconProperty) | Medium 24x24 size image. |
265275
| [LargeIconProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.LargeIconProperty) | Large 32x32 size image. |
266276
| [TitleProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.TitleProperty) | String title that can override the label in screen tips and customization UI. |
277+
| [InvocationFocusBehaviorProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.InvocationFocusBehaviorProperty) | Determine how focus is moved when the primary invocation, such as a click on a button, occurs on the control. |
267278
| [VariantSizeProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.VariantSizeProperty) | The current variant size of the control. Unless otherwise indicated, this property should only be manually set when the control is standalone, and not hosted by a bar control. |
268279
| [CanCloneToRibbonQuickAccessToolBarProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.CanCloneToRibbonQuickAccessToolBarProperty) | Whether the control can clone to the ribbon [Quick Access Toolbar](../ribbon-features/quick-access-toolbar.md). |
269-
| [HasExternalHeaderProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.HasExternalHeaderProperty) | Whether an external header (image/label) should be rendered for the control when in a ribbon control group stack. |}
280+
| [HasExternalHeaderProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.HasExternalHeaderProperty) | Whether an external header (image/label) should be rendered for the control when in a ribbon control group stack. |
281+
}
270282
@if (wpf) {
271283
| Attached Property | Description |
272284
|-----|-----|
@@ -276,6 +288,7 @@ Here is a list of common attached properties that are related to concepts descri
276288
| [MediumImageSourceProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.MediumImageSourceProperty) | Medium 24x24 size image. |
277289
| [LargeImageSourceProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.LargeImageSourceProperty) | Large 32x32 size image. |
278290
| [TitleProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.TitleProperty) | String title that can override the label in screen tips and customization UI. |
291+
| [InvocationFocusBehaviorProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.InvocationFocusBehaviorProperty) | Determine how focus is moved when the primary invocation, such as a click on a button, occurs on the control. |
279292
| [VariantSizeProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.VariantSizeProperty) | The current variant size of the control. Unless otherwise indicated, this property should only be manually set when the control is standalone, and not hosted by a bar control. |
280293
| [CanCloneToRibbonQuickAccessToolBarProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.CanCloneToRibbonQuickAccessToolBarProperty) | Whether the control can clone to the ribbon [Quick Access Toolbar](../ribbon-features/quick-access-toolbar.md). |
281294
| [HasExternalHeaderProperty](xref:@ActiproUIRoot.Controls.Bars.BarControlService.HasExternalHeaderProperty) | Whether an external header (image/label) should be rendered for the control when in a ribbon control group stack. |

‎Documentation/topics/bars/controls/gallery.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ A [RibbonGallery](xref:@ActiproUIRoot.Controls.Bars.RibbonGallery).`SelectionCha
403403

404404
See the [Using Commands](using-commands.md) topic for more information on commands.
405405

406+
### Focus Behavior
407+
408+
In cases where you wish for an in-ribbon gallery to remain focused after a click on one of its gallery items or the **More** button's popup menu items, set the [RibbonGallery](xref:@ActiproUIRoot.Controls.Bars.Primitives.BarMenuGalleryHostBase).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.BarPopupButton.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
409+
406410
## MVVM Support
407411

408412
The optional companion [MVVM Library](../mvvm-support.md) defines a [BarGalleryViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.BarGalleryViewModel) class that is intended to be used as a view model for galleries.

‎Documentation/topics/bars/controls/popup-button.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,10 @@ The `PopupOpeningCommand`'s can-execute result determines the enabled state of t
291291

292292
See the [Using Commands](using-commands.md) topic for more information on commands.
293293

294+
### Focus Behavior
295+
296+
In cases where you wish for the button to remain focused after a click on one of its popup menu items, set the [BarPopupButton](xref:@ActiproUIRoot.Controls.Bars.BarPopupButton).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.BarPopupButton.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
297+
294298
## Screen Tips
295299

296300
The controls support screen tips, which are formatted tool tips.

‎Documentation/topics/bars/controls/split-button.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ The [PopupOpeningCommand](xref:@ActiproUIRoot.Controls.Bars.Primitives.BarPopupB
286286

287287
See the [Using Commands](using-commands.md) topic for more information on commands.
288288

289+
### Focus Behavior
290+
291+
In cases where you wish for the button to remain focused after a click on it or one of its popup menu items, set the [BarSplitButton](xref:@ActiproUIRoot.Controls.Bars.BarSplitButton).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.BarPopupButton.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
292+
289293
## Input Gesture Text
290294

291295
The control can have input gesture text associated with it that describes a related keyboard shortcut, and is displayed in the screen tip for the control or in the menu item itself.

‎Documentation/topics/bars/controls/textbox.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ xmlns:actipro="http://schemas.actiprosoftware.com/avaloniaui"
6060
...
6161
<actipro:StandaloneToolBar>
6262
<!-- Label is auto-generated from Key -->
63-
<actipro:TextBox
63+
<actipro:BarTextBox
6464
Key="Search"
6565
RequestedWidth="120"
6666
Command="{Binding SearchCommand}"
@@ -75,7 +75,7 @@ xmlns:bars="http://schemas.actiprosoftware.com/winfx/xaml/bars"
7575
...
7676
<bars:StandaloneToolBar>
7777
<!-- Label is auto-generated from Key -->
78-
<bars:TextBox
78+
<bars:BarTextBox
7979
Key="Search"
8080
RequestedWidth="120"
8181
Command="{Binding SearchCommand}"
@@ -189,6 +189,10 @@ A `TextChanged` event is raised whenever the control's text changes.
189189

190190
See the [Using Commands](using-commands.md) topic for more information on commands.
191191

192+
### Focus Behavior
193+
194+
In cases where you wish for the textbox to remain focused after committing a value, set the [BarTextBox](xref:@ActiproUIRoot.Controls.Bars.BarTextBox).[InvocationFocusBehavior](xref:@ActiproUIRoot.Controls.Bars.BarTextBox.InvocationFocusBehavior) property to [Self](xref:@ActiproUIRoot.Controls.Bars.InvocationFocusBehavior.Self).
195+
192196
## Screen Tips
193197

194198
The controls support screen tips, which are formatted tool tips.

0 commit comments

Comments
 (0)