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

fix(i18n): fix previous commit by using lazy to delay fetching translation

Browse source
This commit is contained in:
Hongtao Zhang 2024-04-13 01:11:26 -05:00
parent 1a672878a9
commit 690def1efa
3 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Flow.Launcher/SettingWindow.xaml
View file

@ -2665,6 +2665,7 @@
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource previewHotkeyToolTip}" />
</StackPanel>
<flowlauncher:HotkeyControl
DataContext="{Binding PreviewHotkeyViewModel}"
x:Name="PreviewHotkeyControl"
Grid.Row="0"
Grid.Column="2"

48
Flow.Launcher/ViewModel/HotkeyControlViewModel.cs
View file

@ -50,22 +50,29 @@ namespace Flow.Launcher.ViewModel
DefaultHotkey = defaultHotkey;
ValidateKeyGesture = validateKeyGesture;
HotkeyDelegate = hotkeyDelegate;
EmptyKeyValue = InternationalizationManager.Instance.GetTranslation("empty");
KeysToDisplay = new ObservableCollection<string> { EmptyKeyValue };
if (string.IsNullOrEmpty(Hotkey))
keysToDisplay = new(() =>
{
Hotkey = DefaultHotkey;
}
var collection = new ObservableCollection<string>();
SetKeysToDisplay(Hotkey?.Split(KeySeparator));
if (string.IsNullOrEmpty(Hotkey))
{
Hotkey = DefaultHotkey;
}
SetKeysToDisplay(collection, Hotkey?.Split(KeySeparator));
return collection;
});
}
private string EmptyKeyValue = "<empty>";
private string EmptyHotkeyKey = "emptyHotkey";
public string EmptyHotkey => InternationalizationManager.Instance.GetTranslation(EmptyHotkeyKey);
private const string KeySeparator = " + ";
public ObservableCollection<string> KeysToDisplay { get; }
private Lazy<ObservableCollection<string>> keysToDisplay;
public ObservableCollection<string> KeysToDisplay => keysToDisplay.Value;
public HotkeyModel CurrentHotkey { get; private set; }
@ -97,7 +104,7 @@ namespace Flow.Launcher.ViewModel
{
Recording = false;
if (KeysToDisplay.Count == 0 || (KeysToDisplay.Count == 1 && KeysToDisplay[0] == EmptyKeyValue))
if (string.IsNullOrEmpty(Hotkey))
{
return;
}
@ -114,18 +121,13 @@ namespace Flow.Launcher.ViewModel
HotKeyMapper.RemoveHotkey(Hotkey);
Hotkey = DefaultHotkey;
KeysToDisplay.Clear();
foreach (var key in Hotkey.Split(KeySeparator))
{
KeysToDisplay.Add(key);
}
SetKeysToDisplay(KeysToDisplay, Hotkey.Split(KeySeparator));
await SetHotkeyAsync(Hotkey);
}
public bool ValidateKeyGesture { get; set; }
public Action<HotkeyModel> HotkeyDelegate { get; set; }
public Action<HotkeyModel>? HotkeyDelegate { get; set; }
private async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = true)
{
@ -143,7 +145,7 @@ namespace Flow.Launcher.ViewModel
{
CurrentHotkey = keyModel;
Hotkey = keyModel.ToString();
SetKeysToDisplay(Hotkey.Split(KeySeparator));
SetKeysToDisplay(KeysToDisplay, Hotkey.Split(KeySeparator));
}
}
else
@ -160,7 +162,7 @@ namespace Flow.Launcher.ViewModel
if (!string.IsNullOrEmpty(Hotkey))
HotKeyMapper.RemoveHotkey(Hotkey);
Hotkey = "";
SetKeysToDisplay(new List<string>());
SetKeysToDisplay(KeysToDisplay, new List<string>());
}
private void SetKeysToDisplay(HotkeyModel hotkey)
@ -192,9 +194,9 @@ namespace Flow.Launcher.ViewModel
}
}
private void SetKeysToDisplay(ICollection<string>? keys)
private void SetKeysToDisplay(ICollection<string> container, ICollection<string>? keys)
{
KeysToDisplay.Clear();
container.Clear();
if (keys == null)
{
@ -203,12 +205,12 @@ namespace Flow.Launcher.ViewModel
foreach (var key in keys)
{
KeysToDisplay.Add(key);
container.Add(key);
}
if (!keys.Any())
{
KeysToDisplay.Add(EmptyKeyValue);
container.Add(EmptyHotkey);
}
}
@ -220,7 +222,7 @@ namespace Flow.Launcher.ViewModel
public void KeyDown(HotkeyModel hotkeyModel)
{
CurrentHotkey = hotkeyModel;
SetKeysToDisplay(hotkeyModel.ToString().Split(KeySeparator));
SetKeysToDisplay(KeysToDisplay, hotkeyModel.ToString().Split(KeySeparator));
}
}
}

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

@ -76,6 +76,12 @@ namespace Flow.Launcher.ViewModel
Settings.Hotkey = hotkey.ToString();
HotKeyMapper.SetHotkey(hotkey, HotKeyMapper.OnToggleHotkey);
});
PreviewHotkeyViewModel =
new HotkeyControlViewModel(Settings.PreviewHotkey, "F1", false, hotkey =>
{
Settings.PreviewHotkey = hotkey.ToString();
});
}
public Settings Settings { get; set; }
@ -955,6 +961,7 @@ namespace Flow.Launcher.ViewModel
}
public HotkeyControlViewModel ToggleHotkeyViewModel { get; set; }
public HotkeyControlViewModel PreviewHotkeyViewModel { get; set; }
private static DirectoryInfo GetLogDir(string version = "")
{