Skip to content

Commit

Permalink
Merge pull request #550 from mikeirvingweb/main
Browse files Browse the repository at this point in the history
chore: typo corrections
  • Loading branch information
stevemonaco authored Nov 6, 2024
2 parents 7b9e729 + b5aed0b commit fc8e1ce
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docs/basics/user-interface/styling/themes/fluent.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Avalonia Fluent theme is inspired by Microsoft's Fluent Design System, which is
As a first step, [Avalonia.Themes.Fluent](https://www.nuget.org/packages/Avalonia.Themes.Fluent/) nuget package needs to be installed.

:::info
On how to add a nuget package, you can follow steps from the Nuget page or [Visual Studio](https://learn.microsoft.com/en-us/nuget/quickstart/install-and-use-a-package-in-visual-studio), [Rider](https://www.jetbrains.com/help/rider/Using_NuGet.html) documentation.
On how to add a nuget package, you can follow steps from the NuGet page or [Visual Studio](https://learn.microsoft.com/en-us/nuget/quickstart/install-and-use-a-package-in-visual-studio), [Rider](https://www.jetbrains.com/help/rider/Using_NuGet.html) documentation.
:::

After that theme needs to be included in the Application class:
Expand Down
2 changes: 1 addition & 1 deletion docs/basics/user-interface/styling/themes/simple.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Avalonia Simple theme is specifically designed to be minimal and lightweight, wi
As a first step, [Avalonia.Themes.Simple](https://www.nuget.org/packages/Avalonia.Themes.Simple/) nuget package needs to be installed.

:::info
On how to add a nuget package, you can follow steps from the Nuget page or [Visual Studio](https://learn.microsoft.com/en-us/nuget/quickstart/install-and-use-a-package-in-visual-studio), [Rider](https://www.jetbrains.com/help/rider/Using_NuGet.html) documentation.
On how to add a nuget package, you can follow steps from the NuGet page or [Visual Studio](https://learn.microsoft.com/en-us/nuget/quickstart/install-and-use-a-package-in-visual-studio), [Rider](https://www.jetbrains.com/help/rider/Using_NuGet.html) documentation.
:::

After that theme needs to be included in the Application class:
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/services/storage-provider/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Only supported on the OS, with physical file paths, primarily only desktop.
| `TryGetFolderFromPathAsync` ||||||||
| `TryGetWellKnownFolderAsync` ||||||||

\* Bookmarks are not properly supported on desktop platforms and instead return file path instead. MacOS support is planned in order to get it work with Sandboxed Apple Store apps.
\* Bookmarks are not properly supported on desktop platforms and instead return file path instead. macOS support is planned in order to get it work with Sandboxed Apple Store apps.

** Managed file picker works only on desktop platforms where it's possible to open a custom window.

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/macOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Add other runtime identifiers as necessary. Each one should be separated by a se

This type of icon file can not only be created on Apple devices, but it is also possible on Linux devices.
You can find more information about how you can achieve that in this blog post:
[Creating Mac OS X Icons (icns) on Linux](https://dentrassi.de/2014/02/25/creating-mac-os-x-icons-icns-on-linux/)
[Creating macOS Icons (icns) on Linux](https://dentrassi.de/2014/02/25/creating-mac-os-x-icons-icns-on-linux/)

### Notes on the `.app` executable file

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/controls/colorpicker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Developers using this control may:

## Using in Your App

Avalonia is used in several resource-constrained environments such as embedded devices. For this and other reasons, certain larger controls such as the `ColorPicker` are not included with the main Avalonia UI Nuget packages. This means a bit of extra work is required to add the `ColorPicker` to your app:
Avalonia is used in several resource-constrained environments such as embedded devices. For this and other reasons, certain larger controls such as the `ColorPicker` are not included with the main Avalonia UI NuGet packages. This means a bit of extra work is required to add the `ColorPicker` to your app:

1. Add the `Avalonia.Controls.ColorPicker` nuget to your project. This MUST match your version of Avalonia's other packages.
2. Add control themes and styles for all color picker controls in `App.axaml` by adding:
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/controls/slider.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class MainViewModel : ViewModelBase
- using [ReactiveUI.Fody.Helpers](https://www.reactiveui.net/docs/handbook/view-models/boilerplate-code.html) NOTE: Fody.Helpers is not required (optional).
:::info
On how to add a nuget package, you can follow steps from the Nuget page or [Visual Studio](https://learn.microsoft.com/en-us/nuget/quickstart/install-and-use-a-package-in-visual-studio), [Rider](https://www.jetbrains.com/help/rider/Using_NuGet.html) documentation.
On how to add a nuget package, you can follow steps from the NuGet page or [Visual Studio](https://learn.microsoft.com/en-us/nuget/quickstart/install-and-use-a-package-in-visual-studio), [Rider](https://www.jetbrains.com/help/rider/Using_NuGet.html) documentation.
:::

```cs
Expand Down
6 changes: 3 additions & 3 deletions docs/stay-up-to-date/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,14 @@ https://www.nuget.org/packages/Avalonia/11.0.5
* Fixes font family definitions that mix embedded and system fonts by @Gillibald in https://github.com/AvaloniaUI/Avalonia/pull/12871
* Fix DataGrid' SelectedItems removing wrong item when DataGrid is grou. by @liwuqingxin in https://github.com/AvaloniaUI/Avalonia/pull/12875
* Fix focus loss issue with AutocompleteBox by @emmauss in https://github.com/AvaloniaUI/Avalonia/pull/12883
* MacOS file type filter in native file dialog by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12899
* macOS file type filter in native file dialog by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12899
* Change iOS initialization order by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12915
* Detect recursion and check for cancellation in analyser `while` loops by @TomEdwardsEnscape in https://github.com/AvaloniaUI/Avalonia/pull/12916
* Trimmable runtime xaml loader by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12937
* [X11] Don't convert the current time from long to int by @kekekeks in https://github.com/AvaloniaUI/Avalonia/pull/12941
* [Windows] [IME] Prevent duplicate input for some IMEs by @Gillibald in https://github.com/AvaloniaUI/Avalonia/pull/12942
* Fix - TextPresenter ignores FontStretch property by @VladimirDrobyshev in https://github.com/AvaloniaUI/Avalonia/pull/12947
* Add support for setting tooltip text for TrayIcons on MacOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12948
* Add support for setting tooltip text for TrayIcons on macOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12948
* Fix VirtualizingStackPanel and nth-child for the currently realizing item container by @MrJul in https://github.com/AvaloniaUI/Avalonia/pull/12957
* FluentTheme: settable ListBoxItem.FontWeight/FontSize by @MrJul in https://github.com/AvaloniaUI/Avalonia/pull/12958
* Added guards for compositor reentrancy and exposed batch lifetime events by @kekekeks in https://github.com/AvaloniaUI/Avalonia/pull/12968
Expand Down Expand Up @@ -284,7 +284,7 @@ https://www.nuget.org/packages/Avalonia/11.0.2

### What's Changed
* Use embedded pdb for analyzers and build tasks by @MrJul in https://github.com/AvaloniaUI/Avalonia/pull/12336
* Fix window incorrect positioning with window startup location CenterScreen on MacOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12327
* Fix window incorrect positioning with window startup location CenterScreen on macOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12327
* Fixed issue where RowDetailsTemplate was getting the wrong DataContext by @Gundz in https://github.com/AvaloniaUI/Avalonia/pull/12174
* Catch dbus errors so that WatchAsync can register all names by @ThereGoesMySanity in https://github.com/AvaloniaUI/Avalonia/pull/12377

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Only supported on the OS, with physical file paths, primarily only desktop.
| `TryGetFolderFromPathAsync` ||||||||
| `TryGetWellKnownFolderAsync` ||||||||

\* Bookmarks are not properly supported on desktop platforms and instead return file path instead. MacOS support is planned in order to get it work with Sandboxed Apple Store apps.
\* Bookmarks are not properly supported on desktop platforms and instead return file path instead. macOS support is planned in order to get it work with Sandboxed Apple Store apps.

** Managed file picker works only on desktop platforms where it's possible to open a custom window.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Add other runtime identifiers as necessary. Each one should be separated by a se

This type of icon file can not only be created on Apple devices, but it is also possible on Linux devices.
You can find more information about how you can achieve that in this blog post:
[Creating Mac OS X Icons (icns) on Linux](https://dentrassi.de/2014/02/25/creating-mac-os-x-icons-icns-on-linux/)
[Creating macOS Icons (icns) on Linux](https://dentrassi.de/2014/02/25/creating-mac-os-x-icons-icns-on-linux/)

### Notes on the `.app` executable file

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Developers using this control may:

## Using in Your App

Avalonia is used in several resource-constrained environments such as embedded devices. For this and other reasons, certain larger controls such as the `ColorPicker` are not included with the main Avalonia UI Nuget packages. This means a bit of extra work is required to add the `ColorPicker` to your app:
Avalonia is used in several resource-constrained environments such as embedded devices. For this and other reasons, certain larger controls such as the `ColorPicker` are not included with the main Avalonia UI NuGet packages. This means a bit of extra work is required to add the `ColorPicker` to your app:

1. Add the `Avalonia.Controls.ColorPicker` nuget to your project. This MUST match your version of Avalonia's other packages.
2. Add control themes and styles for all color picker controls in `App.axaml` by adding:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import ColorPaletteSixteen from '/img/reference/controls/colorpicker/color-palet

## 在您的应用程序中使用

Avalonia 在一些资源受限的环境中使用,例如嵌入式设备。因此根据种种原因,像 `ColorPicker` 这样的较大控件没有包含在主要的 Avalonia UI Nuget 包中。这意味着需要额外的步骤将 `ColorPicker` 添加到您的应用中:
Avalonia 在一些资源受限的环境中使用,例如嵌入式设备。因此根据种种原因,像 `ColorPicker` 这样的较大控件没有包含在主要的 Avalonia UI NuGet 包中。这意味着需要额外的步骤将 `ColorPicker` 添加到您的应用中:

1.`Avalonia.Controls.ColorPicker` nuget 添加到您的项目中。这必须与您的 Avalonia 其他包的版本匹配。
2. 通过在 `App.axaml` 中添加控件主题和样式,为所有取色器控件添加:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ https://www.nuget.org/packages/Avalonia/11.0.5
* Fixes font family definitions that mix embedded and system fonts by @Gillibald in https://github.com/AvaloniaUI/Avalonia/pull/12871
* Fix DataGrid' SelectedItems removing wrong item when DataGrid is grou. by @liwuqingxin in https://github.com/AvaloniaUI/Avalonia/pull/12875
* Fix focus loss issue with AutocompleteBox by @emmauss in https://github.com/AvaloniaUI/Avalonia/pull/12883
* MacOS file type filter in native file dialog by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12899
* macOS file type filter in native file dialog by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12899
* Change iOS initialization order by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12915
* Detect recursion and check for cancellation in analyser `while` loops by @TomEdwardsEnscape in https://github.com/AvaloniaUI/Avalonia/pull/12916
* Trimmable runtime xaml loader by @maxkatz6 in https://github.com/AvaloniaUI/Avalonia/pull/12937
* [X11] Don't convert the current time from long to int by @kekekeks in https://github.com/AvaloniaUI/Avalonia/pull/12941
* [Windows] [IME] Prevent duplicate input for some IMEs by @Gillibald in https://github.com/AvaloniaUI/Avalonia/pull/12942
* Fix - TextPresenter ignores FontStretch property by @VladimirDrobyshev in https://github.com/AvaloniaUI/Avalonia/pull/12947
* Add support for setting tooltip text for TrayIcons on MacOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12948
* Add support for setting tooltip text for TrayIcons on macOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12948
* Fix VirtualizingStackPanel and nth-child for the currently realizing item container by @MrJul in https://github.com/AvaloniaUI/Avalonia/pull/12957
* FluentTheme: settable ListBoxItem.FontWeight/FontSize by @MrJul in https://github.com/AvaloniaUI/Avalonia/pull/12958
* Added guards for compositor reentrancy and exposed batch lifetime events by @kekekeks in https://github.com/AvaloniaUI/Avalonia/pull/12968
Expand Down Expand Up @@ -285,7 +285,7 @@ https://www.nuget.org/packages/Avalonia/11.0.2

### What's Changed
* Use embedded pdb for analyzers and build tasks by @MrJul in https://github.com/AvaloniaUI/Avalonia/pull/12336
* Fix window incorrect positioning with window startup location CenterScreen on MacOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12327
* Fix window incorrect positioning with window startup location CenterScreen on macOS by @Takoooooo in https://github.com/AvaloniaUI/Avalonia/pull/12327
* Fixed issue where RowDetailsTemplate was getting the wrong DataContext by @Gundz in https://github.com/AvaloniaUI/Avalonia/pull/12174
* Catch dbus errors so that WatchAsync can register all names by @ThereGoesMySanity in https://github.com/AvaloniaUI/Avalonia/pull/12377

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Add other runtime identifiers as necessary. Each one should be separated by a se

This type of icon file can not only be created on Apple devices, but it is also possible on Linux devices.
You can find more information about how you can achieve that in this blog post:
[Creating Mac OS X Icons (icns) on Linux](https://dentrassi.de/2014/02/25/creating-mac-os-x-icons-icns-on-linux/)
[Creating macOS Icons (icns) on Linux](https://dentrassi.de/2014/02/25/creating-mac-os-x-icons-icns-on-linux/)

### Notes on the `.app` executable file

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title: macOS Development

It's actually really simple. If you're developing in Windows (which is easier for a Windows developer), once your AvaloniaUI application is looking about right and you're ready to try it on macOS, copy your entire project folder to your Mac (don't worry - all the files will be treated as basic flat files). If you have a github for it, commit it and then check it out on your dev Mac machine.

You'll need a development platform for macOS such as Visual Studio for MacOS, JetBrains Rider or you can build from the command line if you have the dotnet SDK installed on you Mac.
You'll need a development platform for macOS such as Visual Studio for macOS, JetBrains Rider or you can build from the command line if you have the dotnet SDK installed on you Mac.
See the Getting Started>>IDE Support for more details.

### Visual Studio for Mac or JetBrains Rider
Expand All @@ -26,7 +26,7 @@ To run either type "dotnet run --project pathToProject/myproject.csproj" where "

Your build platform will recompile the code and since it's target independent, it will build the native (ie: Mac) version and link all the Mac target DLLs for .Net Core 6.0 and AvaloniaUI.

The following instructions are for more advanced builds such as having a proper Mac app bundle or of you need better intergration with native MacOS.
The following instructions are for more advanced builds such as having a proper Mac app bundle or of you need better intergration with native macOS.

## Native code

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ In order for our application to work we are going to need some business logic. T

To add this business logic we need 2 steps.

1. Add the ItunesSearch nuget package to the project. In Rider right click on our project and select `Manage Nuget Packages`
1. Add the ItunesSearch nuget package to the project. In Rider right click on our project and select `Manage NuGet Packages`

This will open the `Packages` tool at the bottom of the IDE, like so.

Expand Down

0 comments on commit fc8e1ce

Please sign in to comment.