Fix spelling

taooceros · taooceros · commit 48d319387690 · 2023-01-09T09:56:48.000-06:00
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -62,3 +62,25 @@ TobiasSekan
 Img
 img
 resx
+directx
+mvvm
+dlg
+ddd
+dddd
+clearlogfolder
+ACCENT_ENABLE_TRANSPARENTGRADIENT
+ACCENT_ENABLE_BLURBEHIND
+WCA_ACCENT_POLICY
+HGlobal
+dopusrt
+firefox
+msedge
+svgc
+ime
+zindex
+txb
+btn
+otf
+searchplugin
+Noresult
+wpftk
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -36,7 +36,7 @@ public Theme()
         {
             _themeDirectories.Add(DirectoryPath);
             _themeDirectories.Add(UserDirectoryPath);
-            MakesureThemeDirectoriesExist();
+            MakeSureThemeDirectoriesExist();
 
             var dicts = Application.Current.Resources.MergedDictionaries;
             _oldResource = dicts.First(d =>
@@ -55,20 +55,17 @@ public Theme()
             _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
         }
 
-        private void MakesureThemeDirectoriesExist()
+        private void MakeSureThemeDirectoriesExist()
         {
-            foreach (string dir in _themeDirectories)
+            foreach (var dir in _themeDirectories.Where(dir => !Directory.Exists(dir)))
             {
-                if (!Directory.Exists(dir))
+                try
                 {
-                    try
-                    {
-                        Directory.CreateDirectory(dir);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Exception($"|Theme.MakesureThemeDirectoriesExist|Exception when create directory <{dir}>", e);
-                    }
+                    Directory.CreateDirectory(dir);
+                }
+                catch (Exception e)
+                {
+                    Log.Exception($"|Theme.MakesureThemeDirectoriesExist|Exception when create directory <{dir}>", e);
                 }
             }
         }
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -226,7 +226,7 @@ public bool HideNotifyIcon
             }
         }
         public bool LeaveCmdOpen { get; set; }
-        public bool HideWhenDeactive { get; set; } = true;
+        public bool HideWhenDeactivated { get; set; } = true;
         public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
@@ -485,7 +485,7 @@ private async void OnDeactivated(object sender, EventArgs e)
                 if (_settings.UseAnimation)
                     await Task.Delay(100);
 
-                if (_settings.HideWhenDeactive)
+                if (_settings.HideWhenDeactivated)
                 {
                     _viewModel.Hide();
                 }
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
@@ -27,7 +27,7 @@
     Style="{DynamicResource BaseListboxStyle}"
     VirtualizingStackPanel.IsVirtualizing="True"
     VirtualizingStackPanel.VirtualizationMode="Standard"
-    Visibility="{Binding Visbility}"
+    Visibility="{Binding Visibility}"
     mc:Ignorable="d">
     <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -673,7 +673,7 @@
                                     <ui:ToggleSwitch
                                         Grid.Column="2"
                                         FocusVisualMargin="5"
-                                        IsOn="{Binding Settings.HideWhenDeactive}"
+                                        IsOn="{Binding Settings.HideWhenDeactivated}"
                                         Style="{DynamicResource SideToggleSwitch}" />
                                 </ItemsControl>
                             </Border>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
@@ -6,7 +6,7 @@
     <CornerRadius x:Key="ItemRadius">0</CornerRadius>
     <Thickness x:Key="ItemMargin">0</Thickness>
     <Thickness x:Key="ResultMargin">0</Thickness>
-    <!--  Further font customisations are dynamically loaded in Theme.cs  -->
+    <!--  Further font customizations are dynamically loaded in Theme.cs  -->
 
     <system:Double x:Key="ResultItemHeight">52</system:Double>
 
@@ -307,7 +307,7 @@
                 Content="{TemplateBinding Content}"
                 ContentTemplate="{TemplateBinding ContentTemplate}" />
 
-            <!--  Scrollbar in thr rigth of ScrollViewer  -->
+            <!--  Scrollbar in the right of ScrollViewer  -->
             <ScrollBar
                 x:Name="PART_VerticalScrollBar"
                 Grid.Row="0"
@@ -391,7 +391,7 @@
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
-    <Style x:Key="BaseItemHotkeySelecetedStyle" TargetType="{x:Type TextBlock}">
+    <Style x:Key="BaseItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
@@ -509,7 +509,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml
@@ -106,7 +106,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="#ff79c6" />
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
@@ -120,7 +120,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="#acacac" />
diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml
@@ -113,7 +113,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -535,13 +535,13 @@ private ResultsViewModel SelectedResults
                 _selectedResults = value;
                 if (SelectedIsFromQueryResults())
                 {
-                    ContextMenu.Visbility = Visibility.Collapsed;
-                    History.Visbility = Visibility.Collapsed;
+                    ContextMenu.Visibility = Visibility.Collapsed;
+                    History.Visibility = Visibility.Collapsed;
                     ChangeQueryText(_queryTextBeforeLeaveResults);
                 }
                 else
                 {
-                    Results.Visbility = Visibility.Collapsed;
+                    Results.Visibility = Visibility.Collapsed;
                     _queryTextBeforeLeaveResults = QueryText;
 
 
@@ -559,7 +559,7 @@ private ResultsViewModel SelectedResults
                     }
                 }
 
-                _selectedResults.Visbility = Visibility.Visible;
+                _selectedResults.Visibility = Visibility.Visible;
             }
         }
 
@@ -710,7 +710,7 @@ private async void QueryResults()
             if (query == null) // shortcut expanded
             {
                 Results.Clear();
-                Results.Visbility = Visibility.Collapsed;
+                Results.Visibility = Visibility.Collapsed;
                 PluginIconPath = null;
                 SearchIconVisibility = Visibility.Visible;
                 return;
diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs
@@ -49,7 +49,7 @@ public ResultsViewModel(Settings settings) : this()
 
         public ResultViewModel SelectedItem { get; set; }
         public Thickness Margin { get; set; }
-        public Visibility Visbility { get; set; } = Visibility.Collapsed;
+        public Visibility Visibility { get; set; } = Visibility.Collapsed;
         
         public ICommand RightClickResultCommand { get; init; }
         public ICommand LeftClickResultCommand { get; init; }
@@ -167,14 +167,14 @@ private void UpdateResults(List<ResultViewModel> newResults, CancellationToken t
                     SelectedItem = Results[0];
             }
 
-            switch (Visbility)
+            switch (Visibility)
             {
                 case Visibility.Collapsed when Results.Count > 0:
                     SelectedIndex = 0;
-                    Visbility = Visibility.Visible;
+                    Visibility = Visibility.Visible;
                     break;
                 case Visibility.Visible when Results.Count == 0:
-                    Visbility = Visibility.Collapsed;
+                    Visibility = Visibility.Collapsed;
                     break;
             }
         }
@@ -259,7 +259,7 @@ public void BulkAddAll(List<ResultViewModel> resultViews)
                     return;
 
                 // manually update event
-                // wpf use directx / double buffered already, so just reset all won't cause ui flickering
+                // wpf use DirectX / double buffered already, so just reset all won't cause ui flickering
                 OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
             }
             private void AddAll(List<ResultViewModel> Items)
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -325,18 +325,14 @@ public string TestProxy()
 
         public IList<PluginViewModel> PluginViewModels
         {
-            get
-            {
-                var metadatas = PluginManager.AllPlugins
-                    .OrderBy(x => x.Metadata.Disabled)
-                    .ThenBy(y => y.Metadata.Name)
-                    .Select(p => new PluginViewModel
-                    {
-                        PluginPair = p
-                    })
-                    .ToList();
-                return metadatas;
-            }
+            get => PluginManager.AllPlugins
+                .OrderBy(x => x.Metadata.Disabled)
+                .ThenBy(y => y.Metadata.Name)
+                .Select(p => new PluginViewModel
+                {
+                    PluginPair = p
+                })
+                .ToList();
         }
 
         public IList<PluginStoreItemViewModel> ExternalPlugins

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public Theme()`
`36`	`36`	`{`
`37`	`37`	`_themeDirectories.Add(DirectoryPath);`
`38`	`38`	`_themeDirectories.Add(UserDirectoryPath);`
`39`		`- MakesureThemeDirectoriesExist();`
	`39`	`+ MakeSureThemeDirectoriesExist();`
`40`	`40`
`41`	`41`	`var dicts = Application.Current.Resources.MergedDictionaries;`
`42`	`42`	`_oldResource = dicts.First(d =>`
`@@ -55,20 +55,17 @@ public Theme()`
`55`	`55`	`_oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);`
`56`	`56`	`}`
`57`	`57`
`58`		`- private void MakesureThemeDirectoriesExist()`
	`58`	`+ private void MakeSureThemeDirectoriesExist()`
`59`	`59`	`{`
`60`		`- foreach (string dir in _themeDirectories)`
	`60`	`+ foreach (var dir in _themeDirectories.Where(dir => !Directory.Exists(dir)))`
`61`	`61`	`{`
`62`		`- if (!Directory.Exists(dir))`
	`62`	`+ try`
`63`	`63`	`{`
`64`		`- try`
`65`		`- {`
`66`		`- Directory.CreateDirectory(dir);`
`67`		`- }`
`68`		`- catch (Exception e)`
`69`		`- {`
`70`		`- Log.Exception($"\|Theme.MakesureThemeDirectoriesExist\|Exception when create directory <{dir}>", e);`
`71`		`- }`
	`64`	`+ Directory.CreateDirectory(dir);`
	`65`	`+ }`
	`66`	`+ catch (Exception e)`
	`67`	`+ {`
	`68`	`+ Log.Exception($"\|Theme.MakesureThemeDirectoriesExist\|Exception when create directory <{dir}>", e);`
`72`	`69`	`}`
`73`	`70`	`}`
`74`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public bool HideNotifyIcon`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`public bool LeaveCmdOpen { get; set; }`
`229`		`- public bool HideWhenDeactive { get; set; } = true;`
	`229`	`+ public bool HideWhenDeactivated { get; set; } = true;`
`230`	`230`	`public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;`
`231`	`231`	`public bool IgnoreHotkeysOnFullscreen { get; set; }`
`232`	`232`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ private async void OnDeactivated(object sender, EventArgs e)`
`485`	`485`	`if (_settings.UseAnimation)`
`486`	`486`	`await Task.Delay(100);`
`487`	`487`
`488`		`- if (_settings.HideWhenDeactive)`
	`488`	`+ if (_settings.HideWhenDeactivated)`
`489`	`489`	`{`
`490`	`490`	`_viewModel.Hide();`
`491`	`491`	`}`