Merge branch 'Keboo-spellCheck'

Author: ButchersBoy

MaterialDesignThemes.Wpf/Spelling.cs

@@ -4,10 +4,10 @@ namespace MaterialDesignThemes.Wpf
 {
     public static class Spelling
     {
-        public static ResourceKey SpellingSuggestionMenuItemStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingSuggestionMenuItemStyle);
-        public static ResourceKey SpellingIgnoreAllMenuItemStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingIgnoreAllMenuItemStyle);
-        public static ResourceKey SpellingNoSuggestionsMenuItemStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingNoSuggestionsMenuItemStyle);
-        public static ResourceKey SpellingSeparatorStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingSeparatorStyle);
+        public static ResourceKey SuggestionMenuItemStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingSuggestionMenuItemStyle);
+        public static ResourceKey IgnoreAllMenuItemStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingIgnoreAllMenuItemStyle);
+        public static ResourceKey NoSuggestionsMenuItemStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingNoSuggestionsMenuItemStyle);
+        public static ResourceKey SeparatorStyleKey { get; } = new ComponentResourceKey(typeof(Spelling), ResourceKeyId.SpellingSeparatorStyle);
     }
 
     internal enum ResourceKeyId

MaterialDesignThemes.Wpf/TextFieldAssist.cs

@@ -116,7 +116,7 @@ private static void TextBoxOnContextMenuOpening(object sender, ContextMenuEventA
             if (spellingError != null)
             {
                 Style spellingSuggestionStyle =
-                    contextMenu.TryFindResource(Spelling.SpellingSuggestionMenuItemStyleKey) as Style;
+                    contextMenu.TryFindResource(Spelling.SuggestionMenuItemStyleKey) as Style;
 
                 int insertionIndex = 0;
                 bool hasSuggestion = false;
@@ -137,28 +137,28 @@ private static void TextBoxOnContextMenuOpening(object sender, ContextMenuEventA
                 {
                     contextMenu.Items.Insert(insertionIndex++, new MenuItem
                     {
-                        Style = contextMenu.TryFindResource(Spelling.SpellingNoSuggestionsMenuItemStyleKey) as Style,
+                        Style = contextMenu.TryFindResource(Spelling.NoSuggestionsMenuItemStyleKey) as Style,
                         Tag = typeof(Spelling)
                     });
                 }
 
                 contextMenu.Items.Insert(insertionIndex++, new Separator
                 {
-                    Style = contextMenu.TryFindResource(Spelling.SpellingSeparatorStyleKey) as Style,
+                    Style = contextMenu.TryFindResource(Spelling.SeparatorStyleKey) as Style,
                     Tag = typeof(Spelling)
                 });
 
                 contextMenu.Items.Insert(insertionIndex++, new MenuItem
                 {
                     Command = EditingCommands.IgnoreSpellingError,
                     CommandTarget = textBoxBase,
-                    Style = contextMenu.TryFindResource(Spelling.SpellingIgnoreAllMenuItemStyleKey) as Style,
+                    Style = contextMenu.TryFindResource(Spelling.IgnoreAllMenuItemStyleKey) as Style,
                     Tag = typeof(Spelling)
                 });
 
                 contextMenu.Items.Insert(insertionIndex, new Separator
                 {
-                    Style = contextMenu.TryFindResource(Spelling.SpellingSeparatorStyleKey) as Style,
+                    Style = contextMenu.TryFindResource(Spelling.SeparatorStyleKey) as Style,
                     Tag = typeof(Spelling)
                 });
             }

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml

@@ -275,16 +275,16 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static wpf:Spelling.SpellingSuggestionMenuItemStyleKey}"  TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
+    <Style x:Key="{x:Static wpf:Spelling.SuggestionMenuItemStyleKey}"  TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Header" Value="{Binding RelativeSource={RelativeSource Self}, Path=CommandParameter}" />
     </Style>
 
-    <Style x:Key="{x:Static wpf:Spelling.SpellingIgnoreAllMenuItemStyleKey}"  TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
+    <Style x:Key="{x:Static wpf:Spelling.IgnoreAllMenuItemStyleKey}"  TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
         <Setter Property="Header" Value="Ignore All" />
     </Style>
 
-    <Style x:Key="{x:Static wpf:Spelling.SpellingNoSuggestionsMenuItemStyleKey}" TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
+    <Style x:Key="{x:Static wpf:Spelling.NoSuggestionsMenuItemStyleKey}" TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
         <Setter Property="Header" Value="(no spelling suggestions)" />
         <Setter Property="IsEnabled" Value="False" />
     </Style>