From acdca571fa4d65a7a4e67e2e31edbf7564f0e162 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Sat, 23 May 2020 14:58:57 +1000 Subject: [PATCH 01/13] Update ActionKeyword window --- Flow.Launcher/ActionKeywords.xaml | 32 +++++++++++++++---------------- Flow.Launcher/Languages/en.xaml | 3 ++- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml index 39574964b..38b987a5e 100644 --- a/Flow.Launcher/ActionKeywords.xaml +++ b/Flow.Launcher/ActionKeywords.xaml @@ -1,4 +1,4 @@ - + Height="250" Width="500"> - + - + - - - Old ActionKeywords: - - - + + + + - + - - diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 1b69c1b90..4eaed2396 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -40,7 +40,8 @@ Plugin Find more plugins Disable - Action keywords + Current action keyword: + New action keyword: Plugin Directory Author Init time: {0}ms From 7cd8fc263b6ccc0c69cad5e995dce32457492f81 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 17 Jun 2020 18:51:49 +1000 Subject: [PATCH 02/13] remove 'success' prompt after completing keyword change --- Flow.Launcher/ActionKeywords.xaml.cs | 1 - Flow.Launcher/Languages/da.xaml | 1 - Flow.Launcher/Languages/de.xaml | 1 - Flow.Launcher/Languages/en.xaml | 1 - Flow.Launcher/Languages/fr.xaml | 1 - Flow.Launcher/Languages/it.xaml | 1 - Flow.Launcher/Languages/ja.xaml | 1 - Flow.Launcher/Languages/ko.xaml | 1 - Flow.Launcher/Languages/nb-NO.xaml | 1 - Flow.Launcher/Languages/nl.xaml | 1 - Flow.Launcher/Languages/pl.xaml | 1 - Flow.Launcher/Languages/pt-br.xaml | 1 - Flow.Launcher/Languages/ru.xaml | 1 - Flow.Launcher/Languages/sk.xaml | 1 - Flow.Launcher/Languages/sr.xaml | 1 - Flow.Launcher/Languages/tr.xaml | 1 - Flow.Launcher/Languages/uk-UA.xaml | 1 - Flow.Launcher/Languages/zh-cn.xaml | 1 - Flow.Launcher/Languages/zh-tw.xaml | 1 - 19 files changed, 19 deletions(-) diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs index d90273147..0f8690cca 100644 --- a/Flow.Launcher/ActionKeywords.xaml.cs +++ b/Flow.Launcher/ActionKeywords.xaml.cs @@ -45,7 +45,6 @@ namespace Flow.Launcher { var id = _plugin.Metadata.ID; PluginManager.ReplaceActionKeyword(id, oldActionKeyword, newActionKeyword); - MessageBox.Show(_translater.GetTranslation("success")); Close(); } else diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index 296f6aa8b..7c1e10c8c 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -92,7 +92,6 @@ Kan ikke finde det valgte plugin Nyt nøgleord må ikke være tomt Nyt nøgleord er tilknyttet et andet plugin, tilknyt venligst et andet nyt nøgeleord - Fortsæt Brug * hvis du ikke vil angive et nøgleord diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index 91b7c7982..5ad8a8092 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -92,7 +92,6 @@ Kann das angegebene Plugin nicht finden Neues Aktionsschlüsselwort darf nicht leer sein Aktionsschlüsselwort ist schon bei einem anderen Plugin in verwendung. Bitte stellen Sie ein anderes Aktionsschlüsselwort ein. - Erfolgreich Benutzen Sie * wenn Sie ein Aktionsschlüsselwort definieren wollen. diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 4eaed2396..5b37c3fdc 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -111,7 +111,6 @@ Can't find specified plugin New Action Keyword can't be empty New Action Keywords have been assigned to another plugin, please assign other new action keyword - Success Use * if you don't want to specify an action keyword diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index f43cbb498..7e8e4533f 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -98,7 +98,6 @@ Impossible de trouver le module spécifié Le nouveau mot-clé d'action doit être spécifié Le nouveau mot-clé d'action a été assigné à un autre module, veuillez en choisir un autre - Ajouté Saisissez * si vous ne souhaitez pas utiliser de mot-clé spécifique diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index aa29a8891..0120e7299 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -101,7 +101,6 @@ Impossibile trovare il plugin specificato La nuova parola chiave d'azione non può essere vuota La nuova parola chiave d'azione è stata assegnata ad un altro plugin, per favore sceglierne una differente - Successo Usa * se non vuoi specificare una parola chiave d'azione diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index 34c38edf4..9ef340b43 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -104,7 +104,6 @@ プラグインが見つかりません 新しいアクションキーボードを空にすることはできません 新しいアクションキーボードは他のプラグインに割り当てられています。他のアクションキーボードを指定してください - 成功しました アクションキーボードを指定しない場合、* を使用してください diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 21f1f0273..e4ae6afa5 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -96,7 +96,6 @@ 플러그인을 찾을 수 없습니다. 새 액션 키워드를 입력하세요. 새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요. - 성공 액션 키워드를 지정하지 않으려면 *를 사용하세요. diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index 1dbfcf5d4..45374eb71 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -101,7 +101,6 @@ Kan ikke finne den angitte utvidelsen Nytt handlingsnøkkelord kan ikke være tomt De nye handlingsnøkkelordene er tildelt en annen utvidelse, vennligst velg et annet nøkkelord - Vellykket Bruk * hvis du ikke ønsker å angi et handlingsnøkkelord diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index 7d24d9067..660b6a676 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -92,7 +92,6 @@ Kan plugin niet vinden Nieuwe actie sneltoets moet ingevuld worden Nieuwe actie sneltoets is toegewezen aan een andere plugin, wijs een nieuwe actie sneltoets aan - Succesvol Gebruik * wanneer je geen nieuwe actie sneltoets wilt specificeren diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index 4f26cfaaf..cb2c499b3 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -92,7 +92,6 @@ Nie można odnaleźć podanej wtyczki Nowy wyzwalacz nie może być pusty Ten wyzwalacz został już przypisany do innej wtyczki, musisz podać inny wyzwalacz. - Sukces Użyj * jeżeli nie chcesz podawać wyzwalacza diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index 11d8b839e..3443b33b6 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -101,7 +101,6 @@ Não foi possível encontrar o plugin especificado A nova palavra-chave da ação não pode ser vazia A nova palavra-chave da ação já foi atribuída a outro plugin, por favor tente outra - Sucesso Use * se não quiser especificar uma palavra-chave de ação diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index b86fcf377..0aee118c9 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -92,7 +92,6 @@ Не удалось найти заданный плагин Новая горячая клавиша не может быть пустой Новая горячая клавиша уже используется другим плагином. Пожалуйста, задайте новую - Сохранено Используйте * в случае, если вы не хотите задавать конкретную горячую клавишу diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index 4ddbd839d..f417e38a8 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -102,7 +102,6 @@ Nepodarilo sa nájsť zadaný plugin Nová skratka pre akciu nemôže byť prázdna Nová skratka pre akciu bola priradená pre iný plugin, prosím, zvoľte inú skratku - Úspešné Použite * ak nechcete určiť skratku pre akciu diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index 41f112af6..ea2da0b00 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -101,7 +101,6 @@ Navedeni plugin nije moguće pronaći Prečica za novu radnju ne može da bude prazna Prečica za novu radnju je dodeljena drugom plugin-u, molim Vas dodelite drugu prečicu - Uspešno Koristite * ako ne želite da navedete prečicu za radnju diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index 9e2624cc2..72dba5771 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -105,7 +105,6 @@ Belirtilen eklenti bulunamadı Yeni anahtar kelime boş olamaz Yeni anahtar kelime başka bir eklentiye atanmış durumda. Lütfen başka bir anahtar kelime seçin - Başarılı Anahtar kelime belirlemek istemiyorsanız * kullanın diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index 0343f9d0f..273c726e6 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -92,7 +92,6 @@ Не вдалося знайти вказаний плагін Нова гаряча клавіша не може бути порожньою Нова гаряча клавіша вже використовується іншим плагіном. Будь ласка, вкажіть нову - Збережено Використовуйте * у разі, якщо ви не хочете ставити конкретну гарячу клавішу diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index c8bdc6890..07202c9f1 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -99,7 +99,6 @@ 找不到指定的插件 新触发关键字不能为空 新触发关键字已经被指派给其他插件了，请重新选择一个关键字 - 成功 如果你不想设置触发关键字，可以使用*代替 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 322eaf32f..430cf0fc0 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -92,7 +92,6 @@ 找不到指定的外掛 新觸發關鍵字不能為空白 新觸發關鍵字已經被指派給另一外掛，請設定其他關鍵字。 - 成功 如果不想設定觸發關鍵字，可以使用*代替 From 34622d6bbffed8841e5f05a6273868a01563846c Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 17 Jun 2020 20:22:18 +1000 Subject: [PATCH 03/13] Update action keyword label text --- Flow.Launcher/Languages/en.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 5b37c3fdc..60cd4f2ad 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -40,7 +40,7 @@ Plugin Find more plugins Disable - Current action keyword: + Action keyword: New action keyword: Plugin Directory Author From 651e2a95b2a151e7650dd7be11547bf9d19f1686 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 17 Jun 2020 21:56:46 +1000 Subject: [PATCH 04/13] add refresh plugin action keyword display when changed --- Flow.Launcher/ActionKeywords.xaml.cs | 13 +++++++------ Flow.Launcher/SettingWindow.xaml.cs | 4 ++-- Flow.Launcher/ViewModel/PluginViewModel.cs | 12 +++++++++++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs index 0f8690cca..c58cc3ea7 100644 --- a/Flow.Launcher/ActionKeywords.xaml.cs +++ b/Flow.Launcher/ActionKeywords.xaml.cs @@ -1,9 +1,10 @@ -using System.Windows; +using System.Windows; using Flow.Launcher.Core.Plugin; using Flow.Launcher.Core.Resource; using Flow.Launcher.Infrastructure.Exception; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin; +using Flow.Launcher.ViewModel; namespace Flow.Launcher { @@ -12,13 +13,14 @@ namespace Flow.Launcher private PluginPair _plugin; private Settings _settings; private readonly Internationalization _translater = InternationalizationManager.Instance; + private readonly PluginViewModel pluginViewModel; - public ActionKeywords(string pluginId, Settings settings) + public ActionKeywords(string pluginId, Settings settings, PluginViewModel pluginViewModel) { InitializeComponent(); _plugin = PluginManager.GetPluginForId(pluginId); _settings = settings; - if (_plugin == null) + this.pluginViewModel = pluginViewModel; { MessageBox.Show(_translater.GetTranslation("cannotFindSpecifiedPlugin")); Close(); @@ -41,10 +43,9 @@ namespace Flow.Launcher var oldActionKeyword = _plugin.Metadata.ActionKeywords[0]; var newActionKeyword = tbAction.Text.Trim(); newActionKeyword = newActionKeyword.Length > 0 ? newActionKeyword : "*"; - if (!PluginManager.ActionKeywordRegistered(newActionKeyword)) + if (!pluginViewModel.IsActionKeywordRegistered(newActionKeyword)) { - var id = _plugin.Metadata.ID; - PluginManager.ReplaceActionKeyword(id, oldActionKeyword, newActionKeyword); + pluginViewModel.ChangeActionKeyword(newActionKeyword, oldActionKeyword); Close(); } else diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index aa54bb7c5..1f37c8990 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Diagnostics; using System.IO; using System.Windows; @@ -214,7 +214,7 @@ namespace Flow.Launcher if (e.ChangedButton == MouseButton.Left) { var id = _viewModel.SelectedPlugin.PluginPair.Metadata.ID; - ActionKeywords changeKeywordsWindow = new ActionKeywords(id, _settings); + ActionKeywords changeKeywordsWindow = new ActionKeywords(id, _settings, _viewModel.SelectedPlugin); changeKeywordsWindow.ShowDialog(); } } diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs index e79636771..a2accceb1 100644 --- a/Flow.Launcher/ViewModel/PluginViewModel.cs +++ b/Flow.Launcher/ViewModel/PluginViewModel.cs @@ -1,8 +1,9 @@ -using System.Windows; +using System.Windows; using System.Windows.Media; using Flow.Launcher.Plugin; using Flow.Launcher.Core.Resource; using Flow.Launcher.Infrastructure.Image; +using Flow.Launcher.Core.Plugin; namespace Flow.Launcher.ViewModel { @@ -25,5 +26,14 @@ namespace Flow.Launcher.ViewModel public string InitilizaTime => string.Format(_translator.GetTranslation("plugin_init_time"), PluginPair.Metadata.InitTime); public string QueryTime => string.Format(_translator.GetTranslation("plugin_query_time"), PluginPair.Metadata.AvgQueryTime); public string ActionKeywordsText => string.Join(Query.ActionKeywordSeperater, PluginPair.Metadata.ActionKeywords); + + public void ChangeActionKeyword(string newActionKeyword, string oldActionKeyword) + { + PluginManager.ReplaceActionKeyword(PluginPair.Metadata.ID, oldActionKeyword, newActionKeyword); + + OnPropertyChanged(nameof(ActionKeywordsText)); + } + + public bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword); } } From 8f012f26f4d2ff8d603d4b31f987244b482629ca Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 17 Jun 2020 22:16:21 +1000 Subject: [PATCH 05/13] fix variable naming convention --- Flow.Launcher/ActionKeywords.xaml.cs | 21 ++++++------ Flow.Launcher/SettingWindow.xaml.cs | 49 ++++++++++++++-------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs index c58cc3ea7..4a2368347 100644 --- a/Flow.Launcher/ActionKeywords.xaml.cs +++ b/Flow.Launcher/ActionKeywords.xaml.cs @@ -1,4 +1,4 @@ -using System.Windows; +using System.Windows; using Flow.Launcher.Core.Plugin; using Flow.Launcher.Core.Resource; using Flow.Launcher.Infrastructure.Exception; @@ -10,26 +10,27 @@ namespace Flow.Launcher { public partial class ActionKeywords : Window { - private PluginPair _plugin; - private Settings _settings; - private readonly Internationalization _translater = InternationalizationManager.Instance; + private readonly PluginPair plugin; + private Settings settings; + private readonly Internationalization translater = InternationalizationManager.Instance; private readonly PluginViewModel pluginViewModel; public ActionKeywords(string pluginId, Settings settings, PluginViewModel pluginViewModel) { InitializeComponent(); - _plugin = PluginManager.GetPluginForId(pluginId); - _settings = settings; + plugin = PluginManager.GetPluginForId(pluginId); + this.settings = settings; this.pluginViewModel = pluginViewModel; + if (plugin == null) { - MessageBox.Show(_translater.GetTranslation("cannotFindSpecifiedPlugin")); + MessageBox.Show(translater.GetTranslation("cannotFindSpecifiedPlugin")); Close(); } } private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e) { - tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, _plugin.Metadata.ActionKeywords.ToArray()); + tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, plugin.Metadata.ActionKeywords.ToArray()); tbAction.Focus(); } @@ -40,7 +41,7 @@ namespace Flow.Launcher private void btnDone_OnClick(object sender, RoutedEventArgs _) { - var oldActionKeyword = _plugin.Metadata.ActionKeywords[0]; + var oldActionKeyword = plugin.Metadata.ActionKeywords[0]; var newActionKeyword = tbAction.Text.Trim(); newActionKeyword = newActionKeyword.Length > 0 ? newActionKeyword : "*"; if (!pluginViewModel.IsActionKeywordRegistered(newActionKeyword)) @@ -50,7 +51,7 @@ namespace Flow.Launcher } else { - string msg = _translater.GetTranslation("newActionKeywordsHasBeenAssigned"); + string msg = translater.GetTranslation("newActionKeywordsHasBeenAssigned"); MessageBox.Show(msg); } } diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index 1f37c8990..eb5fd7de0 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.IO; using System.Windows; using System.Windows.Input; @@ -21,17 +20,17 @@ namespace Flow.Launcher { private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"; - public readonly IPublicAPI _api; - private Settings _settings; - private SettingWindowViewModel _viewModel; + public readonly IPublicAPI API; + private Settings settings; + private SettingWindowViewModel viewModel; public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel) { InitializeComponent(); - _settings = viewModel.Settings; + settings = viewModel.Settings; DataContext = viewModel; - _viewModel = viewModel; - _api = api; + this.viewModel = viewModel; + API = api; } #region General @@ -94,7 +93,7 @@ namespace Flow.Launcher var pythonPath = Path.Combine(pythonDirectory, PluginsLoader.PythonExecutable); if (File.Exists(pythonPath)) { - _settings.PluginSettings.PythonDirectory = pythonDirectory; + settings.PluginSettings.PythonDirectory = pythonDirectory; MessageBox.Show("Remember to restart Flow Launcher use new Python path"); } else @@ -111,7 +110,7 @@ namespace Flow.Launcher private void OnHotkeyControlLoaded(object sender, RoutedEventArgs e) { - HotkeyControl.SetHotkey(_viewModel.Settings.Hotkey, false); + HotkeyControl.SetHotkey(viewModel.Settings.Hotkey, false); } void OnHotkeyChanged(object sender, EventArgs e) @@ -129,8 +128,8 @@ namespace Flow.Launcher Application.Current.MainWindow.Visibility = Visibility.Hidden; } }); - RemoveHotkey(_settings.Hotkey); - _settings.Hotkey = HotkeyControl.CurrentHotkey.ToString(); + RemoveHotkey(settings.Hotkey); + settings.Hotkey = HotkeyControl.CurrentHotkey.ToString(); } } @@ -159,7 +158,7 @@ namespace Flow.Launcher private void OnDeleteCustomHotkeyClick(object sender, RoutedEventArgs e) { - var item = _viewModel.SelectedCustomPluginHotkey; + var item = viewModel.SelectedCustomPluginHotkey; if (item == null) { MessageBox.Show(InternationalizationManager.Instance.GetTranslation("pleaseSelectAnItem")); @@ -173,17 +172,17 @@ namespace Flow.Launcher MessageBox.Show(deleteWarning, InternationalizationManager.Instance.GetTranslation("delete"), MessageBoxButton.YesNo) == MessageBoxResult.Yes) { - _settings.CustomPluginHotkeys.Remove(item); + settings.CustomPluginHotkeys.Remove(item); RemoveHotkey(item.Hotkey); } } private void OnnEditCustomHotkeyClick(object sender, RoutedEventArgs e) { - var item = _viewModel.SelectedCustomPluginHotkey; + var item = viewModel.SelectedCustomPluginHotkey; if (item != null) { - CustomQueryHotkeySetting window = new CustomQueryHotkeySetting(this, _settings); + CustomQueryHotkeySetting window = new CustomQueryHotkeySetting(this, settings); window.UpdateItem(item); window.ShowDialog(); } @@ -195,7 +194,7 @@ namespace Flow.Launcher private void OnAddCustomeHotkeyClick(object sender, RoutedEventArgs e) { - new CustomQueryHotkeySetting(this, _settings).ShowDialog(); + new CustomQueryHotkeySetting(this, settings).ShowDialog(); } #endregion @@ -204,17 +203,17 @@ namespace Flow.Launcher private void OnPluginToggled(object sender, RoutedEventArgs e) { - var id = _viewModel.SelectedPlugin.PluginPair.Metadata.ID; + var id = viewModel.SelectedPlugin.PluginPair.Metadata.ID; // used to sync the current status from the plugin manager into the setting to keep consistency after save - _settings.PluginSettings.Plugins[id].Disabled = _viewModel.SelectedPlugin.PluginPair.Metadata.Disabled; + settings.PluginSettings.Plugins[id].Disabled = viewModel.SelectedPlugin.PluginPair.Metadata.Disabled; } private void OnPluginActionKeywordsClick(object sender, MouseButtonEventArgs e) { if (e.ChangedButton == MouseButton.Left) { - var id = _viewModel.SelectedPlugin.PluginPair.Metadata.ID; - ActionKeywords changeKeywordsWindow = new ActionKeywords(id, _settings, _viewModel.SelectedPlugin); + var id = viewModel.SelectedPlugin.PluginPair.Metadata.ID; + ActionKeywords changeKeywordsWindow = new ActionKeywords(id, settings, viewModel.SelectedPlugin); changeKeywordsWindow.ShowDialog(); } } @@ -223,7 +222,7 @@ namespace Flow.Launcher { if (e.ChangedButton == MouseButton.Left) { - var website = _viewModel.SelectedPlugin.PluginPair.Metadata.Website; + var website = viewModel.SelectedPlugin.PluginPair.Metadata.Website; if (!string.IsNullOrEmpty(website)) { var uri = new Uri(website); @@ -239,7 +238,7 @@ namespace Flow.Launcher { if (e.ChangedButton == MouseButton.Left) { - var directory = _viewModel.SelectedPlugin.PluginPair.Metadata.PluginDirectory; + var directory = viewModel.SelectedPlugin.PluginPair.Metadata.PluginDirectory; if (!string.IsNullOrEmpty(directory)) FilesFolders.OpenPath(directory); } @@ -250,7 +249,7 @@ namespace Flow.Launcher private void OnTestProxyClick(object sender, RoutedEventArgs e) { // TODO: change to command - var msg = _viewModel.TestProxy(); + var msg = viewModel.TestProxy(); MessageBox.Show(msg); // TODO: add message box service } @@ -258,7 +257,7 @@ namespace Flow.Launcher private async void OnCheckUpdates(object sender, RoutedEventArgs e) { - _viewModel.UpdateApp(); // TODO: change to command + viewModel.UpdateApp(); // TODO: change to command } private void OnRequestNavigate(object sender, RequestNavigateEventArgs e) @@ -269,7 +268,7 @@ namespace Flow.Launcher private void OnClosed(object sender, EventArgs e) { - _viewModel.Save(); + viewModel.Save(); } private void OnCloseExecuted(object sender, ExecutedRoutedEventArgs e) From 9c0dbda579dbdf23101cc3c1f7a38a7eaf26a111 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 17 Jun 2020 22:22:55 +1000 Subject: [PATCH 06/13] fix action keyword window textbox placement --- Flow.Launcher/ActionKeywords.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml index 38b987a5e..d0ab9a433 100644 --- a/Flow.Launcher/ActionKeywords.xaml +++ b/Flow.Launcher/ActionKeywords.xaml @@ -26,7 +26,7 @@ - + Date: Fri, 19 Jun 2020 18:51:11 +1000 Subject: [PATCH 07/13] update hotkey tab window ui layout --- Flow.Launcher/CustomQueryHotkeySetting.xaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml index 0eb0da1da..61b36c2d9 100644 --- a/Flow.Launcher/CustomQueryHotkeySetting.xaml +++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml @@ -1,4 +1,4 @@ - - + @@ -29,9 +29,9 @@ - From 2209bb269d1464f20d9ea892b884140b11ea49e3 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 19 Jun 2020 18:52:11 +1000 Subject: [PATCH 08/13] Hotkey tab window add close window on Esc key press --- Flow.Launcher/CustomQueryHotkeySetting.xaml | 6 ++++++ .../CustomQueryHotkeySetting.xaml.cs | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml index 61b36c2d9..5f4cdff19 100644 --- a/Flow.Launcher/CustomQueryHotkeySetting.xaml +++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml @@ -6,6 +6,12 @@ ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Title="Custom Plugin Hotkey" Height="200" Width="674.766"> + + + + + + diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs index 441bba509..bf5c7d769 100644 --- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs +++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs @@ -1,13 +1,13 @@ -using System; -using System.Collections.Generic; +using Flow.Launcher.Core.Resource; +using Flow.Launcher.Infrastructure.Hotkey; +using Flow.Launcher.Infrastructure.UserSettings; +using NHotkey; +using NHotkey.Wpf; +using System; using System.Collections.ObjectModel; using System.Linq; using System.Windows; -using NHotkey; -using NHotkey.Wpf; -using Flow.Launcher.Core.Resource; -using Flow.Launcher.Infrastructure.Hotkey; -using Flow.Launcher.Infrastructure.UserSettings; +using System.Windows.Input; namespace Flow.Launcher { @@ -125,5 +125,10 @@ namespace Flow.Launcher MessageBox.Show(errorMsg); } } + + private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e) + { + Close(); + } } } From 1a6b056ad0b5a4eb2e479401869468910cd3132b Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 19 Jun 2020 18:57:10 +1000 Subject: [PATCH 09/13] Add text for current action keyword --- Flow.Launcher/ActionKeywords.xaml | 2 +- Flow.Launcher/Languages/en.xaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml index d0ab9a433..9d032efd9 100644 --- a/Flow.Launcher/ActionKeywords.xaml +++ b/Flow.Launcher/ActionKeywords.xaml @@ -19,7 +19,7 @@ + HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" /> diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 60cd4f2ad..70079095e 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -41,6 +41,7 @@ Find more plugins Disable Action keyword: + Current action keyword: New action keyword: Plugin Directory Author From 10d45cc9cd8215ce83f0960ce1eaf99e4aa761b2 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 22 Jun 2020 05:16:22 +1000 Subject: [PATCH 10/13] remove maxwidth on action keyword display in Settings' plugin tab --- Flow.Launcher/SettingWindow.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 1708a5172..b58f5457d 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -175,7 +175,7 @@ + Margin="20 0 0 0"/> Date: Mon, 22 Jun 2020 05:55:55 +1000 Subject: [PATCH 11/13] settings window- update init time translation on language change --- Flow.Launcher/Languages/da.xaml | 2 +- Flow.Launcher/Languages/de.xaml | 2 +- Flow.Launcher/Languages/en.xaml | 2 +- Flow.Launcher/Languages/fr.xaml | 2 +- Flow.Launcher/Languages/it.xaml | 2 +- Flow.Launcher/Languages/ja.xaml | 2 +- Flow.Launcher/Languages/ko.xaml | 2 +- Flow.Launcher/Languages/nb-NO.xaml | 2 +- Flow.Launcher/Languages/nl.xaml | 2 +- Flow.Launcher/Languages/pl.xaml | 2 +- Flow.Launcher/Languages/pt-br.xaml | 2 +- Flow.Launcher/Languages/ru.xaml | 2 +- Flow.Launcher/Languages/sk.xaml | 2 +- Flow.Launcher/Languages/sr.xaml | 2 +- Flow.Launcher/Languages/tr.xaml | 2 +- Flow.Launcher/Languages/uk-UA.xaml | 2 +- Flow.Launcher/Languages/zh-cn.xaml | 2 +- Flow.Launcher/Languages/zh-tw.xaml | 2 +- Flow.Launcher/SettingWindow.xaml | 3 ++- Flow.Launcher/ViewModel/PluginViewModel.cs | 2 +- 20 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index 7c1e10c8c..6b9151cd0 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -36,7 +36,7 @@ Nøgleord Plugin bibliotek Forfatter - Initaliseringstid: {0}ms + Initaliseringstid: Søgetid: {0}ms diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index 5ad8a8092..bddd9c8c9 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -36,7 +36,7 @@ Aktionsschlüsselwörter Pluginordner Autor - Initialisierungszeit: {0}ms + Initialisierungszeit: Abfragezeit: {0}ms diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 70079095e..6807983df 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -45,7 +45,7 @@ New action keyword: Plugin Directory Author - Init time: {0}ms + Init time: Query time: {0}ms diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index 7e8e4533f..749cf24ff 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -40,7 +40,7 @@ Mot-clé d'action : Répertoire Auteur - Chargement : {0}ms + Chargement : Utilisation : {0}ms diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index 0120e7299..77c16fafa 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -40,7 +40,7 @@ Parole chiave Cartella Plugin Autore - Tempo di avvio: {0}ms + Tempo di avvio: Tempo ricerca: {0}ms diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index 9ef340b43..36d3d1184 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -41,7 +41,7 @@ キーワード プラグイン・ディレクトリ 作者 - 初期化時間: {0}ms + 初期化時間: クエリ時間: {0}ms diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index e4ae6afa5..9bd6de201 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -40,7 +40,7 @@ 액션 키워드 플러그인 디렉토리 저자 - 초기화 시간: {0}ms + 초기화 시간: 쿼리 시간: {0}ms diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index 45374eb71..4a41d540e 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -40,7 +40,7 @@ Handlingsnøkkelord Utvidelseskatalog Forfatter - Oppstartstid: {0}ms + Oppstartstid: Spørringstid: {0}ms diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index 660b6a676..9df08631f 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -36,7 +36,7 @@ Action terfwoorden Plugin map Auteur - Init tijd: {0}ms + Init tijd: Query tijd: {0}ms diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index cb2c499b3..ae17c14c0 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -36,7 +36,7 @@ Wyzwalacze Folder wtyczki Autor - Czas ładowania: {0}ms + Czas ładowania: Czas zapytania: {0}ms diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index 3443b33b6..dc63abe44 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -40,7 +40,7 @@ Palavras-chave de ação Diretório de Plugins Autor - Tempo de inicialização: {0}ms + Tempo de inicialização: Tempo de consulta: {0}ms diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index 0aee118c9..f0c837bbf 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -36,7 +36,7 @@ Ключевое слово Папка Автор - Инициализация: {0}ms + Инициализация: Запрос: {0}ms diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index f417e38a8..3b2e45693 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -41,7 +41,7 @@ Skratka akcie Priečinok s pluginmy Autor - Čas inic.: {0}ms + Čas inic.: Čas dopytu: {0}ms diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index ea2da0b00..48dfc5ec7 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -40,7 +40,7 @@ Ključne reči Plugin direktorijum Autor - Vreme inicijalizacije: {0}ms + Vreme inicijalizacije: Vreme upita: {0}ms diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index 72dba5771..aaf09394a 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -42,7 +42,7 @@ Anahtar Kelimeler Eklenti Klasörü Yapımcı - Açılış Süresi: {0}ms + Açılış Süresi: Sorgu Süresi: {0}ms diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index 273c726e6..fb9ad5cc3 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -36,7 +36,7 @@ Ключове слово Директорія плагіну Автор - Ініціалізація: {0}ms + Ініціалізація: Запит: {0}ms diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index 07202c9f1..bab84caeb 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -41,7 +41,7 @@ 触发关键字 插件目录 作者 - 加载耗时 {0}ms + 加载耗时 查询耗时 {0}ms diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 430cf0fc0..a8fd76a56 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -36,7 +36,7 @@ 觸發關鍵字 外掛資料夾 作者 - 載入耗時：{0}ms + 載入耗時： 查詢耗時：{0}ms diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index b58f5457d..b5839bac4 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -181,7 +181,8 @@ ToolTip="Change Action Keywords" Margin="5 0 0 0" Cursor="Hand" Foreground="Blue" MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" /> - + + PluginPair.Metadata.ActionKeywords.Count > 1 ? Visibility.Collapsed : Visibility.Visible; - public string InitilizaTime => string.Format(_translator.GetTranslation("plugin_init_time"), PluginPair.Metadata.InitTime); + public string InitilizaTime => PluginPair.Metadata.InitTime.ToString() + "ms"; public string QueryTime => string.Format(_translator.GetTranslation("plugin_query_time"), PluginPair.Metadata.AvgQueryTime); public string ActionKeywordsText => string.Join(Query.ActionKeywordSeperater, PluginPair.Metadata.ActionKeywords); From fc37246a86a8a9ff91710921e1edbf32cb2cd561 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 22 Jun 2020 06:16:37 +1000 Subject: [PATCH 12/13] settings window- update query time translation on language change --- Flow.Launcher/Languages/da.xaml | 2 +- Flow.Launcher/Languages/de.xaml | 2 +- Flow.Launcher/Languages/en.xaml | 2 +- Flow.Launcher/Languages/fr.xaml | 2 +- Flow.Launcher/Languages/it.xaml | 2 +- Flow.Launcher/Languages/ja.xaml | 2 +- Flow.Launcher/Languages/ko.xaml | 2 +- Flow.Launcher/Languages/nb-NO.xaml | 2 +- Flow.Launcher/Languages/nl.xaml | 2 +- Flow.Launcher/Languages/pl.xaml | 2 +- Flow.Launcher/Languages/pt-br.xaml | 2 +- Flow.Launcher/Languages/ru.xaml | 2 +- Flow.Launcher/Languages/sk.xaml | 2 +- Flow.Launcher/Languages/sr.xaml | 2 +- Flow.Launcher/Languages/tr.xaml | 2 +- Flow.Launcher/Languages/uk-UA.xaml | 2 +- Flow.Launcher/Languages/zh-cn.xaml | 2 +- Flow.Launcher/Languages/zh-tw.xaml | 2 +- Flow.Launcher/SettingWindow.xaml | 3 ++- Flow.Launcher/ViewModel/PluginViewModel.cs | 2 +- 20 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index 6b9151cd0..91ee2616e 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -37,7 +37,7 @@ Plugin bibliotek Forfatter Initaliseringstid: - Søgetid: {0}ms + Søgetid: Tema diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index bddd9c8c9..70cdbcbc8 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -37,7 +37,7 @@ Pluginordner Autor Initialisierungszeit: - Abfragezeit: {0}ms + Abfragezeit: Theme diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 6807983df..a28ac399e 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -46,7 +46,7 @@ Plugin Directory Author Init time: - Query time: {0}ms + Query time: Theme diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index 749cf24ff..77537ab59 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -41,7 +41,7 @@ Répertoire Auteur Chargement : - Utilisation : {0}ms + Utilisation : Thèmes diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index 77c16fafa..34f659ae4 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -41,7 +41,7 @@ Cartella Plugin Autore Tempo di avvio: - Tempo ricerca: {0}ms + Tempo ricerca: Tema diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index 36d3d1184..b595128db 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -42,7 +42,7 @@ プラグイン・ディレクトリ 作者 初期化時間: - クエリ時間: {0}ms + クエリ時間: テーマ diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 9bd6de201..4fbac8c6f 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -41,7 +41,7 @@ 플러그인 디렉토리 저자 초기화 시간: - 쿼리 시간: {0}ms + 쿼리 시간: 테마 diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index 4a41d540e..19233ffbd 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -41,7 +41,7 @@ Utvidelseskatalog Forfatter Oppstartstid: - Spørringstid: {0}ms + Spørringstid: Tema diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index 9df08631f..bdc92e266 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -37,7 +37,7 @@ Plugin map Auteur Init tijd: - Query tijd: {0}ms + Query tijd: Thema diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index ae17c14c0..fb67e0ce1 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -37,7 +37,7 @@ Folder wtyczki Autor Czas ładowania: - Czas zapytania: {0}ms + Czas zapytania: Skórka diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index dc63abe44..96e84e512 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -41,7 +41,7 @@ Diretório de Plugins Autor Tempo de inicialização: - Tempo de consulta: {0}ms + Tempo de consulta: Tema diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index f0c837bbf..43dcfd716 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -37,7 +37,7 @@ Папка Автор Инициализация: - Запрос: {0}ms + Запрос: Темы diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index 3b2e45693..f62ba56c0 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -42,7 +42,7 @@ Priečinok s pluginmy Autor Čas inic.: - Čas dopytu: {0}ms + Čas dopytu: Motív diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index 48dfc5ec7..709f5f6ce 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -41,7 +41,7 @@ Plugin direktorijum Autor Vreme inicijalizacije: - Vreme upita: {0}ms + Vreme upita: Tema diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index aaf09394a..7a366f0bb 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -43,7 +43,7 @@ Eklenti Klasörü Yapımcı Açılış Süresi: - Sorgu Süresi: {0}ms + Sorgu Süresi: Temalar diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index fb9ad5cc3..aabb3578b 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -37,7 +37,7 @@ Директорія плагіну Автор Ініціалізація: - Запит: {0}ms + Запит: Теми diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index bab84caeb..485459a43 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -42,7 +42,7 @@ 插件目录 作者 加载耗时 - 查询耗时 {0}ms + 查询耗时 主题 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index a8fd76a56..153a20da5 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -37,7 +37,7 @@ 外掛資料夾 作者 載入耗時： - 查詢耗時：{0}ms + 查詢耗時： 主題 diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index b5839bac4..acd992b6c 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -183,7 +183,8 @@ MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" /> - + + diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs index e6abe8e19..eb7e0054d 100644 --- a/Flow.Launcher/ViewModel/PluginViewModel.cs +++ b/Flow.Launcher/ViewModel/PluginViewModel.cs @@ -24,7 +24,7 @@ namespace Flow.Launcher.ViewModel } public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count > 1 ? Visibility.Collapsed : Visibility.Visible; public string InitilizaTime => PluginPair.Metadata.InitTime.ToString() + "ms"; - public string QueryTime => string.Format(_translator.GetTranslation("plugin_query_time"), PluginPair.Metadata.AvgQueryTime); + public string QueryTime => PluginPair.Metadata.AvgQueryTime + "ms"; public string ActionKeywordsText => string.Join(Query.ActionKeywordSeperater, PluginPair.Metadata.ActionKeywords); public void ChangeActionKeyword(string newActionKeyword, string oldActionKeyword) From d183b98e9a04e0e8bb019899283551c457d921a3 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 23 Jun 2020 07:37:30 +1000 Subject: [PATCH 13/13] readd success language keyword for other controls --- Flow.Launcher/Languages/da.xaml | 1 + Flow.Launcher/Languages/de.xaml | 3 ++- Flow.Launcher/Languages/en.xaml | 3 ++- Flow.Launcher/Languages/fr.xaml | 1 + Flow.Launcher/Languages/it.xaml | 3 ++- Flow.Launcher/Languages/ja.xaml | 3 ++- Flow.Launcher/Languages/ko.xaml | 3 ++- Flow.Launcher/Languages/nb-NO.xaml | 1 + Flow.Launcher/Languages/nl.xaml | 3 ++- Flow.Launcher/Languages/pl.xaml | 3 ++- Flow.Launcher/Languages/pt-br.xaml | 3 ++- Flow.Launcher/Languages/ru.xaml | 3 ++- Flow.Launcher/Languages/sk.xaml | 3 ++- Flow.Launcher/Languages/sr.xaml | 3 ++- Flow.Launcher/Languages/tr.xaml | 3 ++- Flow.Launcher/Languages/uk-UA.xaml | 3 ++- Flow.Launcher/Languages/zh-cn.xaml | 3 ++- Flow.Launcher/Languages/zh-tw.xaml | 3 ++- 18 files changed, 33 insertions(+), 15 deletions(-) diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index 91ee2616e..19e1951d8 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -92,6 +92,7 @@ Kan ikke finde det valgte plugin Nyt nøgleord må ikke være tomt Nyt nøgleord er tilknyttet et andet plugin, tilknyt venligst et andet nyt nøgeleord + Fortsæt Brug * hvis du ikke vil angive et nøgleord diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index 70cdbcbc8..39dc9b377 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -1,4 +1,4 @@ - @@ -92,6 +92,7 @@ Kann das angegebene Plugin nicht finden Neues Aktionsschlüsselwort darf nicht leer sein Aktionsschlüsselwort ist schon bei einem anderen Plugin in verwendung. Bitte stellen Sie ein anderes Aktionsschlüsselwort ein. + Erfolgreich Benutzen Sie * wenn Sie ein Aktionsschlüsselwort definieren wollen. diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index a28ac399e..0bf211bd9 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -1,4 +1,4 @@ - @@ -112,6 +112,7 @@ Can't find specified plugin New Action Keyword can't be empty New Action Keywords have been assigned to another plugin, please assign other new action keyword + Success Use * if you don't want to specify an action keyword diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index 77537ab59..a8f280bd1 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -98,6 +98,7 @@ Impossible de trouver le module spécifié Le nouveau mot-clé d'action doit être spécifié Le nouveau mot-clé d'action a été assigné à un autre module, veuillez en choisir un autre + Ajouté Saisissez * si vous ne souhaitez pas utiliser de mot-clé spécifique diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index 34f659ae4..e85e49933 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -1,4 +1,4 @@ - @@ -101,6 +101,7 @@ Impossibile trovare il plugin specificato La nuova parola chiave d'azione non può essere vuota La nuova parola chiave d'azione è stata assegnata ad un altro plugin, per favore sceglierne una differente + Successo Usa * se non vuoi specificare una parola chiave d'azione diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index b595128db..937a1e504 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -1,4 +1,4 @@ - @@ -104,6 +104,7 @@ プラグインが見つかりません 新しいアクションキーボードを空にすることはできません 新しいアクションキーボードは他のプラグインに割り当てられています。他のアクションキーボードを指定してください + 成功しました アクションキーボードを指定しない場合、* を使用してください diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 4fbac8c6f..6c755dbae 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -1,4 +1,4 @@ - @@ -96,6 +96,7 @@ 플러그인을 찾을 수 없습니다. 새 액션 키워드를 입력하세요. 새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요. + 성공 액션 키워드를 지정하지 않으려면 *를 사용하세요. diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index 19233ffbd..19f6cc36b 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -101,6 +101,7 @@ Kan ikke finne den angitte utvidelsen Nytt handlingsnøkkelord kan ikke være tomt De nye handlingsnøkkelordene er tildelt en annen utvidelse, vennligst velg et annet nøkkelord + Vellykket Bruk * hvis du ikke ønsker å angi et handlingsnøkkelord diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index bdc92e266..ca7fed180 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -1,4 +1,4 @@ - @@ -92,6 +92,7 @@ Kan plugin niet vinden Nieuwe actie sneltoets moet ingevuld worden Nieuwe actie sneltoets is toegewezen aan een andere plugin, wijs een nieuwe actie sneltoets aan + Succesvol Gebruik * wanneer je geen nieuwe actie sneltoets wilt specificeren diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index fb67e0ce1..4f3042be3 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -1,4 +1,4 @@ - @@ -92,6 +92,7 @@ Nie można odnaleźć podanej wtyczki Nowy wyzwalacz nie może być pusty Ten wyzwalacz został już przypisany do innej wtyczki, musisz podać inny wyzwalacz. + Sukces Użyj * jeżeli nie chcesz podawać wyzwalacza diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index 96e84e512..dce921ff7 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -1,4 +1,4 @@ - @@ -101,6 +101,7 @@ Não foi possível encontrar o plugin especificado A nova palavra-chave da ação não pode ser vazia A nova palavra-chave da ação já foi atribuída a outro plugin, por favor tente outra + Sucesso Use * se não quiser especificar uma palavra-chave de ação diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index 43dcfd716..d0d6ff0e5 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -1,4 +1,4 @@ - @@ -92,6 +92,7 @@ Не удалось найти заданный плагин Новая горячая клавиша не может быть пустой Новая горячая клавиша уже используется другим плагином. Пожалуйста, задайте новую + Сохранено Используйте * в случае, если вы не хотите задавать конкретную горячую клавишу diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index f62ba56c0..a2ff5926d 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -1,4 +1,4 @@ - @@ -102,6 +102,7 @@ Nepodarilo sa nájsť zadaný plugin Nová skratka pre akciu nemôže byť prázdna Nová skratka pre akciu bola priradená pre iný plugin, prosím, zvoľte inú skratku + Úspešné Použite * ak nechcete určiť skratku pre akciu diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index 709f5f6ce..0394b398d 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -1,4 +1,4 @@ - @@ -101,6 +101,7 @@ Navedeni plugin nije moguće pronaći Prečica za novu radnju ne može da bude prazna Prečica za novu radnju je dodeljena drugom plugin-u, molim Vas dodelite drugu prečicu + Uspešno Koristite * ako ne želite da navedete prečicu za radnju diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index 7a366f0bb..421375df9 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -1,4 +1,4 @@ - @@ -105,6 +105,7 @@ Belirtilen eklenti bulunamadı Yeni anahtar kelime boş olamaz Yeni anahtar kelime başka bir eklentiye atanmış durumda. Lütfen başka bir anahtar kelime seçin + Başarılı Anahtar kelime belirlemek istemiyorsanız * kullanın diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index aabb3578b..b57676f8d 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -1,4 +1,4 @@ - @@ -92,6 +92,7 @@ Не вдалося знайти вказаний плагін Нова гаряча клавіша не може бути порожньою Нова гаряча клавіша вже використовується іншим плагіном. Будь ласка, вкажіть нову + Збережено Використовуйте * у разі, якщо ви не хочете ставити конкретну гарячу клавішу diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index 485459a43..92ce60e7f 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -1,4 +1,4 @@ - @@ -99,6 +99,7 @@ 找不到指定的插件 新触发关键字不能为空 新触发关键字已经被指派给其他插件了，请重新选择一个关键字 + 成功 如果你不想设置触发关键字，可以使用*代替 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 153a20da5..294add207 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -1,4 +1,4 @@ - @@ -92,6 +92,7 @@ 找不到指定的外掛 新觸發關鍵字不能為空白 新觸發關鍵字已經被指派給另一外掛，請設定其他關鍵字。 + 成功 如果不想設定觸發關鍵字，可以使用*代替