Skip to content

Commit

Permalink
Merge pull request #3480 from MahApps/feature/Typo_Behaviours_Behaviors
Browse files Browse the repository at this point in the history
Fix for typo behaviours (which should be behaviors)
  • Loading branch information
punker76 authored Apr 3, 2019
2 parents f633e82 + 898ba9c commit 5996152
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:MetroDemo="clr-namespace:MetroDemo"
xmlns:behaviours="http://metro.mahapps.com/winfx/xaml/shared"
xmlns:behaviors="http://metro.mahapps.com/winfx/xaml/shared"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -31,7 +31,7 @@
Height="30"
Stroke="{DynamicResource GrayBrush2}">
<i:Interaction.Behaviors>
<behaviours:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
<behaviors:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
</i:Interaction.Behaviors>
</Ellipse>
<TextBlock Grid.Column="1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Windows.Shapes;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
public class BindableResourceBehavior : Behavior<Shape>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
using System.Windows;
using System.Windows.Data;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using MahApps.Metro.Controls;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{

public class DatePickerTextBoxBehavior : Behavior<DatePickerTextBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using MahApps.Metro.Controls;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
public class PasswordBoxBindingBehavior : Behavior<PasswordBox>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Windows.Controls;
using MahApps.Metro.Controls;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
public static class ReloadBehavior
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Windows;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
public class StylizedBehaviorCollection : FreezableCollection<Behavior>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Windows;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
using System.ComponentModel;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Windows.Controls;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
/// <summary>
/// <para>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using MahApps.Metro.Controls;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
public class TiltBehavior : Behavior<FrameworkElement>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
using MahApps.Metro.Controls;
using Microsoft.Xaml.Behaviors;

namespace MahApps.Metro.Behaviours
namespace MahApps.Metro.Behaviors
{
public class WindowsSettingBehaviour : Behavior<MetroWindow>
public class WindowsSettingBehavior : Behavior<MetroWindow>
{
/// <inheritdoc />
protected override void OnAttached()
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.LoginDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
xmlns:Dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs">
<Grid Margin="0 10 0 0">
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using System.Reflection;
using System.Windows.Data;
using JetBrains.Annotations;
using MahApps.Metro.Behaviours;
using MahApps.Metro.Behaviors;

namespace MahApps.Metro.Controls
{
Expand Down
12 changes: 6 additions & 6 deletions src/MahApps.Metro/Controls/MetroWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using ControlzEx.Native;
using ControlzEx.Standard;
using JetBrains.Annotations;
using MahApps.Metro.Behaviours;
using MahApps.Metro.Behaviors;
using MahApps.Metro.Controls.Dialogs;
using Microsoft.Xaml.Behaviors;

Expand Down Expand Up @@ -957,19 +957,19 @@ private void InitializeGlowWindowBehavior()

private void InitializeSettingsBehavior()
{
var behaviour = new WindowsSettingBehaviour();
Interaction.GetBehaviors(this).Add(behaviour);
var behavior = new WindowsSettingBehavior();
Interaction.GetBehaviors(this).Add(behavior);
}

/// <summary>
/// Initializes various behaviors for the window.
/// For example <see cref="BorderlessWindowBehavior"/>, <see cref="WindowsSettingBehaviour"/> and <see cref="GlowWindowBehavior"/>.
/// For example <see cref="BorderlessWindowBehavior"/>, <see cref="WindowsSettingBehavior"/> and <see cref="GlowWindowBehavior"/>.
/// </summary>
private void InitializeBehaviors()
{
// var borderlessWindowBehavior = new BorderlessWindowBehavior();
//
// var windowsSettingBehaviour = new WindowsSettingBehaviour();
// var windowsSettingBehavior = new WindowsSettingBehavior();
//
// var glowWindowBehavior = new GlowWindowBehavior();
// BindingOperations.SetBinding(glowWindowBehavior, GlowWindowBehavior.ResizeBorderThicknessProperty, new Binding { Path = new PropertyPath(ResizeBorderThicknessProperty), Source = this });
Expand All @@ -979,7 +979,7 @@ private void InitializeBehaviors()
// var collection = new StylizedBehaviorCollection
// {
// borderlessWindowBehavior,
// windowsSettingBehaviour,
// windowsSettingBehavior,
// glowWindowBehavior
// };
//
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[assembly: XmlnsPrefix(@"http://metro.mahapps.com/winfx/xaml/controls", "mah")]
[assembly: XmlnsPrefix(@"http://metro.mahapps.com/winfx/xaml/shared", "mah")]

[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Behaviours")]
[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Behaviors")]
[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Actions")]
[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Converters")]
[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls">

<ResourceDictionary.MergedDictionaries>
Expand Down Expand Up @@ -178,7 +178,7 @@
</ScrollViewer>
<Controls:TransitioningContentControl x:Name="ContentPanel"
Grid.Row="1"
Behaviours:ReloadBehavior.OnSelectedTabChanged="True"
Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
RestartTransitionOnContentChange="True"
Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
UseLayoutRounding="True">
Expand Down Expand Up @@ -239,7 +239,7 @@
</ScrollViewer>
<Controls:TransitioningContentControl x:Name="ContentPanel"
Grid.Column="0"
Behaviours:ReloadBehavior.OnSelectedTabChanged="True"
Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
RestartTransitionOnContentChange="True"
Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
UseLayoutRounding="True">
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls">

<ResourceDictionary.MergedDictionaries>
Expand Down Expand Up @@ -47,7 +47,7 @@
KeyboardNavigation.TabIndex="2"
KeyboardNavigation.TabNavigation="Local"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<Controls:TransitioningContentControl Behaviours:ReloadBehavior.OnSelectedTabChanged="True"
<Controls:TransitioningContentControl Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
RestartTransitionOnContentChange="True"
Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
UseLayoutRounding="True">
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Styles/Controls.DatePicker.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
xmlns:behaviours="clr-namespace:MahApps.Metro.Behaviours"
xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors">

<ResourceDictionary.MergedDictionaries>
Expand Down Expand Up @@ -75,7 +75,7 @@
Foreground="{TemplateBinding Foreground}"
SelectionBrush="{DynamicResource HighlightBrush}">
<i:Interaction.Behaviors>
<behaviours:DatePickerTextBoxBehavior />
<behaviors:DatePickerTextBoxBehavior />
</i:Interaction.Behaviors>
</DatePickerTextBox>

Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
xmlns:Converters="clr-namespace:MahApps.Metro.Converters">

Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Themes/DateTimePicker.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
Expand Down Expand Up @@ -160,7 +160,7 @@
IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
SelectionBrush="{DynamicResource HighlightBrush}">
<i:Interaction.Behaviors>
<Behaviours:DatePickerTextBoxBehavior />
<Behaviors:DatePickerTextBoxBehavior />
</i:Interaction.Behaviors>
</DatePickerTextBox>
<ContentControl x:Name="PART_FloatingMessageContainer"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls">

<ResourceDictionary.MergedDictionaries>
Expand Down Expand Up @@ -38,7 +38,7 @@
</ScrollViewer>
<Controls:TransitioningContentControl x:Name="ContentPanel"
Grid.Row="1"
Behaviours:ReloadBehavior.OnSelectedTabChanged="True"
Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
RestartTransitionOnContentChange="True"
Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
UseLayoutRounding="True">
Expand Down Expand Up @@ -98,7 +98,7 @@
</ScrollViewer>
<Controls:TransitioningContentControl x:Name="ContentPanel"
Grid.Column="0"
Behaviours:ReloadBehavior.OnSelectedTabChanged="True"
Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
RestartTransitionOnContentChange="True"
Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
UseLayoutRounding="True">
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours"
xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls">

<ResourceDictionary.MergedDictionaries>
Expand Down Expand Up @@ -48,7 +48,7 @@
KeyboardNavigation.TabIndex="2"
KeyboardNavigation.TabNavigation="Local"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<Controls:TransitioningContentControl Behaviours:ReloadBehavior.OnSelectedTabChanged="True"
<Controls:TransitioningContentControl Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
RestartTransitionOnContentChange="True"
Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
UseLayoutRounding="True">
Expand Down

0 comments on commit 5996152

Please sign in to comment.