diff --git a/Flow.Launcher.Infrastructure/KeyConstant.cs b/Flow.Launcher.Infrastructure/KeyConstant.cs new file mode 100644 index 000000000..317485176 --- /dev/null +++ b/Flow.Launcher.Infrastructure/KeyConstant.cs @@ -0,0 +1,9 @@ +namespace Flow.Launcher.Infrastructure +{ + public static class KeyConstant + { + public const string Ctrl = nameof(Ctrl); + public const string Alt = nameof(Alt); + public const string Space = nameof(Space); + } +} \ No newline at end of file diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 9ea71f683..84b0a7990 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -9,8 +9,9 @@ namespace Flow.Launcher.Infrastructure.UserSettings { public class Settings : BaseModel { - public string Hotkey { get; set; } = "Alt + Space"; - public string OpenResultModifiers { get; set; } = "Alt"; + public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}"; + public string OpenResultModifiers { get; set; } = KeyConstant.Alt; + public bool ShowOpenResultHotkey { get; set; } = true; public string Language { get; set; } = "en"; public string Theme { get; set; } = "Dark"; public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name; diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index 49d3ef37b..e8ec05ef9 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -53,6 +53,7 @@ Flow Launcher genvejstast Åbn resultatmodifikatorer Tilpasset søgegenvejstast + Vis hotkey Slet Rediger Tilføj diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index 67e33cab4..c2e77cc47 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -53,6 +53,7 @@ Flow Launcher Tastenkombination Öffnen Sie die Ergebnismodifikatoren Benutzerdefinierte Abfrage Tastenkombination + Hotkey anzeigen Löschen Bearbeiten Hinzufügen diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 7d5baa424..c33093cab 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -61,6 +61,7 @@ Hotkey Flow Launcher Hotkey Open Result Modifiers + Show Hotkey Custom Query Hotkey Delete Edit diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index 39ee0c74d..753ccfdfa 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -57,6 +57,7 @@ Ouvrir Flow Launcher Modificateurs de résultats ouverts Requêtes personnalisées + Afficher le raccourci clavier Supprimer Modifier Ajouter diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index 18795ed62..f01b96bcc 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -57,6 +57,7 @@ Tasto scelta rapida Flow Launcher Apri modificatori di risultato Tasti scelta rapida per ricerche personalizzate + Mostra tasto di scelta rapida Cancella Modifica Aggiungi diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index eb18ac3fa..c6cabdce9 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -60,6 +60,7 @@ Flow Launcher ホットキー 結果修飾子を開く カスタムクエリ ホットキー + ホットキーを表示 削除 編集 追加 diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 4fca622e4..c52e1cb23 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -57,6 +57,7 @@ Flow Launcher 핫키 결과 수정 자 열기 사용자지정 쿼리 핫키 + 단축키 표시 삭제 편집 추가 diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index dc87a58ec..453203b4d 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -57,6 +57,7 @@ Flow Launcher-hurtigtast Åpne resultatmodifiserere Egendefinerd spørringshurtigtast + Vis hurtigtast Slett Rediger Legg til diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index ed2a52e9d..492ea5a8c 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -53,6 +53,7 @@ Flow Launcher Sneltoets Open resultaatmodificatoren Custom Query Sneltoets + Sneltoets weergeven Verwijder Bewerken Toevoegen diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index d94ff5295..95fa57bd2 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -53,6 +53,7 @@ Skrót klawiszowy Flow Launcher Modyfikatory klawiszów otwierających wyniki Skrót klawiszowy niestandardowych zapytań + Pokaż skrót klawiszowy Usuń Edytuj Dodaj diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index b22ed05ea..d5d2bf76d 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -57,6 +57,7 @@ Atalho do Flow Launcher Modificadores de resultado aberto Atalho de Consulta Personalizada + Mostrar tecla de atalho Apagar Editar Adicionar diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index 93d1f476a..1855a210c 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -53,6 +53,7 @@ Горячая клавиша Flow Launcher Модификаторы открытого результата Задаваемые горячие клавиши для запросов + Показать Hotkey Удалить Изменить Добавить diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index 76450f5d8..deb79cde4 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -58,6 +58,7 @@ Klávesová skratka pre Flow Launcher Otvorte modifikátory výsledkov Vlastná klávesová skratka pre dopyt + Zobraziť klávesovú skratku Odstrániť Upraviť Pridať diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index bfae4917f..1afff3fcf 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -56,6 +56,7 @@ Prečica Flow Launcher prečica Отворите модификаторе резултата + покажи хоткеи prečica za ručno dodat upit Obriši Izmeni diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index da61d1c5d..04256d6b0 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -61,6 +61,7 @@ Flow Launcher Kısayolu Açık Sonuç Değiştiricileri Özel Sorgu Kısayolları + Kısayol Tuşunu Göster Sil Düzenle Ekle diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index baad144a7..af65e0e63 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -53,6 +53,7 @@ Гаряча клавіша Flow Launcher Відкриті модифікатори результатів Задані гарячі клавіші для запитів + Показати клавішу швидкого доступу Видалити Змінити Додати diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index b5d03b858..7367de366 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -59,6 +59,7 @@ 热键 Flow Launcher激活热键 开放结果修饰符 + 显示热键 自定义查询热键 删除 编辑 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 81277ae3e..8cd3bbe8c 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -53,6 +53,7 @@ Flow Launcher 執行熱鍵 開放結果修飾符 自定義熱鍵查詢 + 顯示熱鍵 刪除 編輯 新增 diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml index c79ba40dd..6f1c7e613 100644 --- a/Flow.Launcher/ResultListBox.xaml +++ b/Flow.Launcher/ResultListBox.xaml @@ -47,8 +47,14 @@ - + + + + + + + + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index cd56332d7..c8463f59a 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -305,6 +305,9 @@ + + + diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs index 69040ee25..0a9731f18 100644 --- a/Flow.Launcher/ViewModel/ResultViewModel.cs +++ b/Flow.Launcher/ViewModel/ResultViewModel.cs @@ -1,9 +1,11 @@ using System; +using System.Windows; using System.Windows.Media; using System.Windows.Threading; using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure.Image; using Flow.Launcher.Infrastructure.Logger; +using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin; @@ -11,14 +13,22 @@ namespace Flow.Launcher.ViewModel { public class ResultViewModel : BaseModel { - public ResultViewModel(Result result) + public ResultViewModel(Result result, Settings settings) { if (result != null) { Result = result; } + + Settings = settings; } + public Settings Settings { get; private set; } + + public Visibility ShowOpenResultHotkey => Settings.ShowOpenResultHotkey ? Visibility.Visible : Visibility.Hidden; + + public string OpenResultModifiers => Settings.OpenResultModifiers; + public ImageSource Image { get diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs index 911cd5807..d30854180 100644 --- a/Flow.Launcher/ViewModel/ResultsViewModel.cs +++ b/Flow.Launcher/ViewModel/ResultsViewModel.cs @@ -156,7 +156,7 @@ namespace Flow.Launcher.ViewModel private List NewResults(List newRawResults, string resultId) { var results = Results.ToList(); - var newResults = newRawResults.Select(r => new ResultViewModel(r)).ToList(); + var newResults = newRawResults.Select(r => new ResultViewModel(r, _settings)).ToList(); var oldResults = results.Where(r => r.Result.PluginID == resultId).ToList(); // Find the same results in A (old results) and B (new newResults) diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index bafbdf0cc..3899e7fbd 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -139,7 +139,7 @@ namespace Flow.Launcher.ViewModel } } - public List OpenResultModifiersList => new List { "Alt", "Ctrl", "Ctrl+Alt" }; + public List OpenResultModifiersList => new List { KeyConstant.Alt, KeyConstant.Ctrl, $"{KeyConstant.Ctrl}+{KeyConstant.Alt}" }; private Internationalization _translater => InternationalizationManager.Instance; public List Languages => _translater.LoadAvailableLanguages(); public IEnumerable MaxResultsRange => Enumerable.Range(2, 16);