prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update variable names to SearchWindowPosition

Browse source
This commit is contained in:
Jeremy 2022-10-20 21:34:05 +11:00
parent 2f1dba8345
commit bcaa25ae03
6 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file

@ -199,7 +199,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
} }
public bool LeaveCmdOpen { get; set; } public bool LeaveCmdOpen { get; set; }
public bool HideWhenDeactive { get; set; } = true; 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 bool IgnoreHotkeysOnFullscreen { get; set; }
public HttpProxy Proxy { get; set; } = new HttpProxy(); public HttpProxy Proxy { get; set; } = new HttpProxy();
@ -225,7 +225,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
Light, Light,
Dark Dark
} }
public enum LauncherPositions public enum SearchWindowPositions
{ {
RememberLastLaunchLocation, RememberLastLaunchLocation,
MouseScreenCenter, MouseScreenCenter,

12
Flow.Launcher/Languages/en.xaml
View file

@ -35,13 +35,13 @@
<system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String> <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="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="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="rememberLastLocation">Remember last launch location</system:String>
<system:String x:Key="LauncherPositionRememberLastLaunchLocation">Remember Last Location</system:String> <system:String x:Key="SearchWindowPositionRememberLastLaunchLocation">Remember Last Location</system:String>
<system:String x:Key="LauncherPositionMouseScreenCenter">Mouse Focused Screen - Center</system:String> <system:String x:Key="SearchWindowPositionMouseScreenCenter">Mouse Focused Screen - Center</system:String>
<system:String x:Key="LauncherPositionMouseScreenCenterTop">Mouse Focused Screen - Center Top</system:String> <system:String x:Key="SearchWindowPositionMouseScreenCenterTop">Mouse Focused Screen - Center Top</system:String>
<system:String x:Key="LauncherPositionMouseScreenLeftTop">Mouse Focused Screen - Left Top</system:String> <system:String x:Key="SearchWindowPositionMouseScreenLeftTop">Mouse Focused Screen - Left Top</system:String>
<system:String x:Key="LauncherPositionMouseScreenRightTop">Mouse Focused Screen - Right 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="language">Language</system:String>
<system:String x:Key="lastQueryMode">Last Query Style</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> <system:String x:Key="lastQueryModeToolTip">Show/Hide previous results when Flow Launcher is reactivated.</system:String>

14
Flow.Launcher/MainWindow.xaml.cs
View file

@ -189,25 +189,25 @@ namespace Flow.Launcher
private void InitializePosition() private void InitializePosition()
{ {
switch (_settings.LauncherPosition) switch (_settings.SearchWindowPosition)
{ {
case LauncherPositions.RememberLastLaunchLocation: case SearchWindowPositions.RememberLastLaunchLocation:
Top = _settings.WindowTop; Top = _settings.WindowTop;
Left = _settings.WindowLeft; Left = _settings.WindowLeft;
break; break;
case LauncherPositions.MouseScreenCenter: case SearchWindowPositions.MouseScreenCenter:
Left = HorizonCenter(); Left = HorizonCenter();
Top = VerticalCenter(); Top = VerticalCenter();
break; break;
case LauncherPositions.MouseScreenCenterTop: case SearchWindowPositions.MouseScreenCenterTop:
Left = HorizonCenter(); Left = HorizonCenter();
Top = 10; Top = 10;
break; break;
case LauncherPositions.MouseScreenLeftTop: case SearchWindowPositions.MouseScreenLeftTop:
Left = 10; Left = 10;
Top = 10; Top = 10;
break; break;
case LauncherPositions.MouseScreenRightTop: case SearchWindowPositions.MouseScreenRightTop:
Left = HorizonRight(); Left = HorizonRight();
Top = 10; Top = 10;
break; break;
@ -461,7 +461,7 @@ namespace Flow.Launcher
{ {
if (_animating) if (_animating)
return; return;
if (_settings.LauncherPosition == LauncherPositions.RememberLastLaunchLocation) if (_settings.SearchWindowPosition == SearchWindowPositions.RememberLastLaunchLocation)
{ {
_settings.WindowLeft = Left; _settings.WindowLeft = Left;
_settings.WindowTop = Top; _settings.WindowTop = Top;

10
Flow.Launcher/SettingWindow.xaml
View file

@ -688,20 +688,20 @@
<Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}"> <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}"> <ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}"> <StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource LauncherPosition}" /> <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SearchWindowPosition}" />
</StackPanel> </StackPanel>
<ComboBox <ComboBox
x:Name="LauncherPosition" x:Name="SearchWindowPosition"
Grid.Column="2" Grid.Column="2"
MinWidth="220" MinWidth="220"
Margin="0,0,18,0" Margin="0,0,18,0"
VerticalAlignment="Center" VerticalAlignment="Center"
DisplayMemberPath="Display" DisplayMemberPath="Display"
FontSize="14" FontSize="14"
ItemsSource="{Binding LauncherPositions}" ItemsSource="{Binding SearchWindowPositions}"
SelectedValue="{Binding Settings.LauncherPosition}" SelectedValue="{Binding Settings.SearchWindowPosition}"
SelectedValuePath="Value" SelectedValuePath="Value"
SelectionChanged="LauncherPositionSelectedIndexChanged" /> SelectionChanged="SearchWindowPositionSelectedIndexChanged" />
<TextBlock Style="{StaticResource Glyph}"> <TextBlock Style="{StaticResource Glyph}">
&#xe7f4; &#xe7f4;
</TextBlock> </TextBlock>

2
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -435,7 +435,7 @@ namespace Flow.Launcher
pluginFilterTxb.Focus(); pluginFilterTxb.Focus();
} }
private void LauncherPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e) private void SearchWindowPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e)
{ {
} }

14
Flow.Launcher/ViewModel/SettingWindowViewModel.cs
View file

@ -387,23 +387,23 @@ namespace Flow.Launcher.ViewModel
public class LauncherPosition public class SearchWindowPosition
{ {
public string Display { get; set; } public string Display { get; set; }
public LauncherPositions Value { get; set; } public SearchWindowPositions Value { get; set; }
} }
public List<LauncherPosition> LauncherPositions public List<SearchWindowPosition> SearchWindowPositions
{ {
get get
{ {
List<LauncherPosition> modes = new List<LauncherPosition>(); List<SearchWindowPosition> modes = new List<SearchWindowPosition>();
var enums = (LauncherPositions[])Enum.GetValues(typeof(LauncherPositions)); var enums = (SearchWindowPositions[])Enum.GetValues(typeof(SearchWindowPositions));
foreach (var e in enums) foreach (var e in enums)
{ {
var key = $"LauncherPosition{e}"; var key = $"SearchWindowPosition{e}";
var display = _translater.GetTranslation(key); var display = _translater.GetTranslation(key);
var m = new LauncherPosition { Display = display, Value = e, }; var m = new SearchWindowPosition { Display = display, Value = e, };
modes.Add(m); modes.Add(m);
} }
return modes; return modes;