update variable names to SearchWindowPosition

jjw24 · jjw24 · commit bcaa25ae03e3 · 2022-10-20T21:34:05.000+11:00
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -199,7 +199,7 @@ public bool HideNotifyIcon
         }
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactive { get; set; } = true;
-        public LauncherPositions LauncherPosition { get; set; } = LauncherPositions.MouseScreenCenter;
+        public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
         public HttpProxy Proxy { get; set; } = new HttpProxy();
@@ -225,7 +225,7 @@ public enum ColorSchemes
         Light,
         Dark
     }
-    public enum LauncherPositions
+    public enum SearchWindowPositions
     {
         RememberLastLaunchLocation,
         MouseScreenCenter,
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -35,13 +35,13 @@
     <system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
-    <system:String x:Key="LauncherPosition">Launcher Position</system:String>
+    <system:String x:Key="SearchWindowPosition">Search Window Position</system:String>
     <system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
-    <system:String x:Key="LauncherPositionRememberLastLaunchLocation">Remember Last Location</system:String>
-    <system:String x:Key="LauncherPositionMouseScreenCenter">Mouse Focused Screen - Center</system:String>
-    <system:String x:Key="LauncherPositionMouseScreenCenterTop">Mouse Focused Screen - Center Top</system:String>
-    <system:String x:Key="LauncherPositionMouseScreenLeftTop">Mouse Focused Screen - Left Top</system:String>
-    <system:String x:Key="LauncherPositionMouseScreenRightTop">Mouse Focused Screen - Right Top</system:String>
+    <system:String x:Key="SearchWindowPositionRememberLastLaunchLocation">Remember Last Location</system:String>
+    <system:String x:Key="SearchWindowPositionMouseScreenCenter">Mouse Focused Screen - Center</system:String>
+    <system:String x:Key="SearchWindowPositionMouseScreenCenterTop">Mouse Focused Screen - Center Top</system:String>
+    <system:String x:Key="SearchWindowPositionMouseScreenLeftTop">Mouse Focused Screen - Left Top</system:String>
+    <system:String x:Key="SearchWindowPositionMouseScreenRightTop">Mouse Focused Screen - Right Top</system:String>
     <system:String x:Key="language">Language</system:String>
     <system:String x:Key="lastQueryMode">Last Query Style</system:String>
     <system:String x:Key="lastQueryModeToolTip">Show/Hide previous results when Flow Launcher is reactivated.</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
@@ -189,25 +189,25 @@ private void OnLoaded(object sender, RoutedEventArgs _)
 
         private void InitializePosition()
         {
-            switch (_settings.LauncherPosition)
+            switch (_settings.SearchWindowPosition)
             {
-                case LauncherPositions.RememberLastLaunchLocation:
+                case SearchWindowPositions.RememberLastLaunchLocation:
                     Top = _settings.WindowTop;
                     Left = _settings.WindowLeft;
                     break;
-                case LauncherPositions.MouseScreenCenter:
+                case SearchWindowPositions.MouseScreenCenter:
                     Left = HorizonCenter();
                     Top = VerticalCenter();
                     break;
-                case LauncherPositions.MouseScreenCenterTop:
+                case SearchWindowPositions.MouseScreenCenterTop:
                     Left = HorizonCenter();
                     Top = 10;
                     break;
-                case LauncherPositions.MouseScreenLeftTop:
+                case SearchWindowPositions.MouseScreenLeftTop:
                     Left = 10;
                     Top = 10;
                     break;
-                case LauncherPositions.MouseScreenRightTop:
+                case SearchWindowPositions.MouseScreenRightTop:
                     Left = HorizonRight();
                     Top = 10;
                     break;
@@ -461,7 +461,7 @@ private void OnLocationChanged(object sender, EventArgs e)
         {
             if (_animating)
                 return;
-            if (_settings.LauncherPosition == LauncherPositions.RememberLastLaunchLocation)
+            if (_settings.SearchWindowPosition == SearchWindowPositions.RememberLastLaunchLocation)
             {
                 _settings.WindowLeft = Left;
                 _settings.WindowTop = Top;
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -688,20 +688,20 @@
                             <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource LauncherPosition}" />
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SearchWindowPosition}" />
                                     </StackPanel>
                                     <ComboBox
-                                        x:Name="LauncherPosition"
+                                        x:Name="SearchWindowPosition"
                                         Grid.Column="2"
                                         MinWidth="220"
                                         Margin="0,0,18,0"
                                         VerticalAlignment="Center"
                                         DisplayMemberPath="Display"
                                         FontSize="14"
-                                        ItemsSource="{Binding LauncherPositions}"
-                                        SelectedValue="{Binding Settings.LauncherPosition}"
+                                        ItemsSource="{Binding SearchWindowPositions}"
+                                        SelectedValue="{Binding Settings.SearchWindowPosition}"
                                         SelectedValuePath="Value"
-                                        SelectionChanged="LauncherPositionSelectedIndexChanged" />
+                                        SelectionChanged="SearchWindowPositionSelectedIndexChanged" />
                                     <TextBlock Style="{StaticResource Glyph}">
                                         &#xe7f4;
                                     </TextBlock>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -435,7 +435,7 @@ private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
                 pluginFilterTxb.Focus();
         }
 
-        private void LauncherPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e)
+        private void SearchWindowPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e)
         {
 
         }
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -387,23 +387,23 @@ public List<ColorScheme> ColorSchemes
 
 
 
-        public class LauncherPosition
+        public class SearchWindowPosition
         {
             public string Display { get; set; }
-            public LauncherPositions Value { get; set; }
+            public SearchWindowPositions Value { get; set; }
         }
 
-        public List<LauncherPosition> LauncherPositions
+        public List<SearchWindowPosition> SearchWindowPositions
         {
             get
             {
-                List<LauncherPosition> modes = new List<LauncherPosition>();
-                var enums = (LauncherPositions[])Enum.GetValues(typeof(LauncherPositions));
+                List<SearchWindowPosition> modes = new List<SearchWindowPosition>();
+                var enums = (SearchWindowPositions[])Enum.GetValues(typeof(SearchWindowPositions));
                 foreach (var e in enums)
                 {
-                    var key = $"LauncherPosition{e}";
+                    var key = $"SearchWindowPosition{e}";
                     var display = _translater.GetTranslation(key);
-                    var m = new LauncherPosition { Display = display, Value = e, };
+                    var m = new SearchWindowPosition { Display = display, Value = e, };
                     modes.Add(m);
                 }
                 return modes;

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public bool HideNotifyIcon`
`199`	`199`	`}`
`200`	`200`	`public bool LeaveCmdOpen { get; set; }`
`201`	`201`	`public bool HideWhenDeactive { get; set; } = true;`
`202`		`- public LauncherPositions LauncherPosition { get; set; } = LauncherPositions.MouseScreenCenter;`
	`202`	`+ public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;`
`203`	`203`	`public bool IgnoreHotkeysOnFullscreen { get; set; }`
`204`	`204`
`205`	`205`	`public HttpProxy Proxy { get; set; } = new HttpProxy();`
`@@ -225,7 +225,7 @@ public enum ColorSchemes`
`225`	`225`	`Light,`
`226`	`226`	`Dark`
`227`	`227`	`}`
`228`		`- public enum LauncherPositions`
	`228`	`+ public enum SearchWindowPositions`
`229`	`229`	`{`
`230`	`230`	`RememberLastLaunchLocation,`
`231`	`231`	`MouseScreenCenter,`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ private void OnPluginSettingKeydown(object sender, KeyEventArgs e)`
`435`	`435`	`pluginFilterTxb.Focus();`
`436`	`436`	`}`
`437`	`437`
`438`		`- private void LauncherPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e)`
	`438`	`+ private void SearchWindowPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e)`
`439`	`439`	`{`
`440`	`440`
`441`	`441`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,23 +387,23 @@ public List<ColorScheme> ColorSchemes`
`387`	`387`
`388`	`388`
`389`	`389`
`390`		`- public class LauncherPosition`
	`390`	`+ public class SearchWindowPosition`
`391`	`391`	`{`
`392`	`392`	`public string Display { get; set; }`
`393`		`- public LauncherPositions Value { get; set; }`
	`393`	`+ public SearchWindowPositions Value { get; set; }`
`394`	`394`	`}`
`395`	`395`
`396`		`- public List<LauncherPosition> LauncherPositions`
	`396`	`+ public List<SearchWindowPosition> SearchWindowPositions`
`397`	`397`	`{`
`398`	`398`	`get`
`399`	`399`	`{`
`400`		`- List<LauncherPosition> modes = new List<LauncherPosition>();`
`401`		`- var enums = (LauncherPositions[])Enum.GetValues(typeof(LauncherPositions));`
	`400`	`+ List<SearchWindowPosition> modes = new List<SearchWindowPosition>();`
	`401`	`+ var enums = (SearchWindowPositions[])Enum.GetValues(typeof(SearchWindowPositions));`
`402`	`402`	`foreach (var e in enums)`
`403`	`403`	`{`
`404`		`- var key = $"LauncherPosition{e}";`
	`404`	`+ var key = $"SearchWindowPosition{e}";`
`405`	`405`	`var display = _translater.GetTranslation(key);`
`406`		`- var m = new LauncherPosition { Display = display, Value = e, };`
	`406`	`+ var m = new SearchWindowPosition { Display = display, Value = e, };`
`407`	`407`	`modes.Add(m);`
`408`	`408`	`}`
`409`	`409`	`return modes;`