From 69f6eb36c1648bf0de511b9e96bab843d452e2d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:24:12 +0000 Subject: [PATCH 01/14] Bump SharpZipLib in /Plugins/Flow.Launcher.Plugin.PluginsManager Bumps [SharpZipLib](https://github.com/icsharpcode/SharpZipLib) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/icsharpcode/SharpZipLib/releases) - [Changelog](https://github.com/icsharpcode/SharpZipLib/blob/master/docs/Changes.txt) - [Commits](https://github.com/icsharpcode/SharpZipLib/compare/v1.3.2...v1.3.3) --- updated-dependencies: - dependency-name: SharpZipLib dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../Flow.Launcher.Plugin.PluginsManager.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj b/Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj index 62534ef98..a03c961f7 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj @@ -38,6 +38,6 @@ - + \ No newline at end of file From 362ab52c5280684427c035ea8b87650361faf702 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 2 Feb 2022 07:32:46 +1100 Subject: [PATCH 02/14] version bump PluginsManager --- Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json index de1604d4b..0900ddb6c 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json @@ -6,7 +6,7 @@ "Name": "Plugins Manager", "Description": "Management of installing, uninstalling or updating Flow Launcher plugins", "Author": "Jeremy Wu", - "Version": "1.11.1", + "Version": "1.11.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll", From f9fefc059cd012558866d587bbb36d58b90bd0e1 Mon Sep 17 00:00:00 2001 From: tech189 Date: Tue, 11 Jan 2022 22:09:58 +0000 Subject: [PATCH 03/14] Fix spellings in translation keys --- Flow.Launcher/Languages/da.xaml | 4 ++-- Flow.Launcher/Languages/de.xaml | 4 ++-- Flow.Launcher/Languages/en.xaml | 6 +++--- Flow.Launcher/Languages/fr.xaml | 4 ++-- Flow.Launcher/Languages/it.xaml | 4 ++-- Flow.Launcher/Languages/ja.xaml | 4 ++-- Flow.Launcher/Languages/ko.xaml | 4 ++-- Flow.Launcher/Languages/nb-NO.xaml | 4 ++-- Flow.Launcher/Languages/nl.xaml | 4 ++-- Flow.Launcher/Languages/pl.xaml | 4 ++-- Flow.Launcher/Languages/pt-br.xaml | 4 ++-- Flow.Launcher/Languages/pt-pt.xaml | 4 ++-- Flow.Launcher/Languages/ru.xaml | 4 ++-- Flow.Launcher/Languages/sk.xaml | 4 ++-- Flow.Launcher/Languages/sr.xaml | 4 ++-- Flow.Launcher/Languages/tr.xaml | 4 ++-- Flow.Launcher/Languages/uk-UA.xaml | 4 ++-- Flow.Launcher/Languages/zh-cn.xaml | 4 ++-- Flow.Launcher/Languages/zh-tw.xaml | 4 ++-- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index 19e1951d8..9a6e6ebf4 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -126,8 +126,8 @@ Opdater Annuler Denne opdatering vil genstarte Flow Launcher - Følgende filer bliver opdateret + Følgende filer bliver opdateret Opdatereringsfiler - Opdateringsbeskrivelse + Opdateringsbeskrivelse diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index 39dc9b377..9572db8cb 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -126,8 +126,8 @@ Aktualisieren Abbrechen Diese Aktualisierung wird Flow Launcher neu starten - Folgende Dateien werden aktualisiert + Folgende Dateien werden aktualisiert Aktualisiere Dateien - Aktualisierungbeschreibung + Aktualisierungbeschreibung \ No newline at end of file diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 2b9d83000..4b0f4933c 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -244,9 +244,9 @@ Update Failed Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com. This upgrade will restart Flow Launcher - Following files will be updated + Following files will be updated Update files - Update description + Update description Skip @@ -281,7 +281,7 @@ > ping 8.8.8.8 Shell Command Bluetooth - Bluetooth in Windows Setting + Bluetooth in Windows Settings sn Sticky Notes diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index a8f280bd1..d9c46e6b9 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -132,8 +132,8 @@ Mettre à jour Annuler Flow Launcher doit redémarrer pour installer cette mise à jour - Les fichiers suivants seront mis à jour + Les fichiers suivants seront mis à jour Fichiers mis à jour - Description de la mise à jour + Description de la mise à jour diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index e85e49933..0302a1531 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -135,8 +135,8 @@ Aggiorna Annulla Questo aggiornamento riavvierà Flow Launcher - I seguenti file saranno aggiornati + I seguenti file saranno aggiornati File aggiornati - Descrizione aggiornamento + Descrizione aggiornamento \ No newline at end of file diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index 937a1e504..3fc6296c1 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -138,8 +138,8 @@ アップデート キャンセル このアップデートでは、Flow Launcherの再起動が必要です - 次のファイルがアップデートされます + 次のファイルがアップデートされます 更新ファイル一覧 - アップデートの詳細 + アップデートの詳細 \ No newline at end of file diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index b26ce82fb..59485e1f1 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -241,9 +241,9 @@ 업데이트 실패 Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com. 업데이트를 위해 Flow Launcher를 재시작합니다. - 아래 파일들이 업데이트됩니다. + 아래 파일들이 업데이트됩니다. 업데이트 파일 - 업데이트 설명 + 업데이트 설명 diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index 19f6cc36b..859ec20a0 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -135,8 +135,8 @@ Oppdater Avbryt Denne opgraderingen vil starte Flow Launcher på nytt - Følgende filer vil bli oppdatert + Følgende filer vil bli oppdatert Oppdateringsfiler - Oppdateringsbeskrivelse + Oppdateringsbeskrivelse diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index ca7fed180..822af21bf 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -126,8 +126,8 @@ Update Annuleer Deze upgrade zal Flow Launcher opnieuw opstarten - Volgende bestanden zullen worden geüpdatet + Volgende bestanden zullen worden geüpdatet Update bestanden - Update beschrijving + Update beschrijving diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index 4f3042be3..a8c423de1 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -126,8 +126,8 @@ Aktualizuj Anuluj Aby dokończyć proces aktualizacji Flow Launcher musi zostać zresetowany - Następujące pliki zostaną zaktualizowane + Następujące pliki zostaną zaktualizowane Aktualizuj pliki - Opis aktualizacji + Opis aktualizacji \ No newline at end of file diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index dce921ff7..a4dfe446c 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -135,8 +135,8 @@ Atualizar Cancelar Essa atualização reiniciará o Flow Launcher - Os seguintes arquivos serão atualizados + Os seguintes arquivos serão atualizados Atualizar arquivos - Atualizar descrição + Atualizar descrição \ No newline at end of file diff --git a/Flow.Launcher/Languages/pt-pt.xaml b/Flow.Launcher/Languages/pt-pt.xaml index 86e079950..b641f0e86 100644 --- a/Flow.Launcher/Languages/pt-pt.xaml +++ b/Flow.Launcher/Languages/pt-pt.xaml @@ -244,9 +244,9 @@ Falha ao atualizar Verifique a sua ligação e as definições do proxy estabelecidas para github-cloud.s3.amazonaws.com Esta atualização irá reiniciar o Flow Launcher - Os seguintes ficheiros serão atualizados + Os seguintes ficheiros serão atualizados Atualizar ficheiros - Atualizar descrição + Atualizar descrição Ignorar diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index d0d6ff0e5..63c8d46ee 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -126,8 +126,8 @@ Обновить Отмена Это обновление перезапустит Flow Launcher - Следующие файлы будут обновлены + Следующие файлы будут обновлены Обновить файлы - Описание обновления + Описание обновления \ No newline at end of file diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index b78141821..385eef658 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -242,9 +242,9 @@ Aktualizácia zlyhala Skontrolujte pripojenie a skúste aktualizovať nastavenia servera proxy k github-cloud.s3.amazonaws.com. Tento upgrade reštartuje Flow Launcher - Nasledujúce súbory budú aktualizované + Nasledujúce súbory budú aktualizované Aktualizovať súbory - Aktualizovať popis + Aktualizovať popis Preskočiť diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index 0394b398d..3efe27a47 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -135,8 +135,8 @@ Ažuriraj Otkaži Ova nadogradnja će ponovo pokrenuti Flow Launcher - Sledeće datoteke će biti ažurirane + Sledeće datoteke će biti ažurirane Ažuriraj datoteke - Opis ažuriranja + Opis ažuriranja \ No newline at end of file diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index 421375df9..a39b55b23 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -139,8 +139,8 @@ Güncelle İptal Bu güncelleme Flow Launcher'u yeniden başlatacaktır - Aşağıdaki dosyalar güncelleştirilecektir + Aşağıdaki dosyalar güncelleştirilecektir Güncellenecek dosyalar - Güncelleme açıklaması + Güncelleme açıklaması \ No newline at end of file diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index b57676f8d..790314d0f 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -126,8 +126,8 @@ Оновити Скасувати Це оновлення перезавантажить Flow Launcher - Ці файли будуть оновлені + Ці файли будуть оновлені Оновити файли - Опис оновлення + Опис оновлення \ No newline at end of file diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index 01cd97467..e404c4deb 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -226,9 +226,9 @@ 更新失败 检查网络是否可以连接至github-cloud.s3.amazonaws.com. 此次更新需要重启Flow Launcher - 下列文件会被更新 + 下列文件会被更新 更新文件 - 更新日志 + 更新日志 跳过 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 294add207..cba62ead4 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -126,8 +126,8 @@ 更新 取消 此更新需要重新啟動 Flow Launcher - 下列檔案會被更新 + 下列檔案會被更新 更新檔案 - 更新日誌 + 更新日誌 From 2ae2c0f600a7631e13c02a2c31ed13d116a6e564 Mon Sep 17 00:00:00 2001 From: tech189 Date: Thu, 13 Jan 2022 10:30:44 +0000 Subject: [PATCH 04/14] Clean up deprecated translations --- .../Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Plugins/Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml diff --git a/Plugins/Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml deleted file mode 100644 index bcfdd3fc9..000000000 --- a/Plugins/Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 제어판 - 제어판 항목을 검색합니다. - - From 781a7731313af7d426c846710a996a34858cd053 Mon Sep 17 00:00:00 2001 From: tech189 Date: Thu, 13 Jan 2022 11:13:40 +0000 Subject: [PATCH 05/14] Some pedantic capitalisation --- .../Flow.Launcher.Plugin.WebSearch/Settings.cs | 14 +++++++------- .../Flow.Launcher.Plugin.WebSearch/setting.json | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs index 33c304375..19e996b84 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs @@ -84,7 +84,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Duckduckgo", + Title = "DuckDuckGo", ActionKeyword = "duckduckgo", Icon = "duckduckgo.png", Url = "https://duckduckgo.com/?q={q}", @@ -92,7 +92,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Github", + Title = "GitHub", ActionKeyword = "github", Icon = "github.png", Url = "https://github.com/search?q={q}", @@ -100,7 +100,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Github Gist", + Title = "GitHub Gist", ActionKeyword = "gist", Icon = "gist.png", Url = "https://gist.github.com/search?q={q}", @@ -124,7 +124,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Wolframalpha", + Title = "WolframAlpha", ActionKeyword = "wolframalpha", Icon = "wolframalpha.png", Url = "https://www.wolframalpha.com/input/?i={q}", @@ -132,7 +132,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Stackoverflow", + Title = "Stack Overflow", ActionKeyword = "stackoverflow", Icon = "stackoverflow.png", Url = "https://stackoverflow.com/search?q={q}", @@ -148,7 +148,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Google Image", + Title = "Google Images", ActionKeyword = "image", Icon = "google.png", Url = "https://www.google.com/search?q={q}&tbm=isch", @@ -156,7 +156,7 @@ namespace Flow.Launcher.Plugin.WebSearch }, new SearchSource { - Title = "Youtube", + Title = "YouTube", ActionKeyword = "youtube", Icon = "youtube.png", Url = "https://www.youtube.com/results?search_query={q}", diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json b/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json index c8f521653..533b894b8 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json @@ -8,7 +8,7 @@ "Enabled": true }, { - "Title": "Youtube", + "Title": "YouTube", "ActionKeyword": "youtube", "IconPath": "Images\\youtube.png", "Url": "http://www.youtube.com/results?search_query={q}", @@ -43,7 +43,7 @@ "Enabled": true }, { - "Title": "Youtube Music", + "Title": "YouTube Music", "ActionKeyword": "ytmusic", "IconPath": "Images\\youtubemusic.png", "Url": "https://music.youtube.com/search?q={q}", @@ -78,35 +78,35 @@ "Enabled": true }, { - "Title": "Duckduckgo", + "Title": "DuckDuckGo", "ActionKeyword": "duckduckgo", "IconPath": "Images\\duckduckgo.png", "Url": "https://duckduckgo.com/?q={q}", "Enabled": true }, { - "Title": "Github", + "Title": "GitHub", "ActionKeyword": "github", "IconPath": "Images\\github.png", "Url": "https://github.com/search?q={q}", "Enabled": true }, { - "Title": "Github Gist", + "Title": "GitHub Gist", "ActionKeyword": "gist", "IconPath": "Images\\gist.png", "Url": "https://gist.github.com/search?q={q}", "Enabled": true }, { - "Title": "Wolframalpha", + "Title": "WolframAlpha", "ActionKeyword": "wolframalpha", "IconPath": "Images\\wolframalpha.png", "Url": "http://www.wolframalpha.com/input/?i={q}", "Enabled": true }, { - "Title": "Stackoverflow", + "Title": "Stack Overflow", "ActionKeyword": "stackoverflow", "IconPath": "Images\\stackoverflow.png", "Url": "http://stackoverflow.com/search?q={q}", @@ -120,7 +120,7 @@ "Enabled": true }, { - "Title": "Google Image", + "Title": "Google Images", "ActionKeyword": "image", "IconPath": "Images\\google.png", "Url": "https://www.google.com/search?q={q}&tbm=isch", From f64c50c479408d4d31e39201e7fd3369f93e7352 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 14 Jan 2022 07:48:12 +1100 Subject: [PATCH 06/14] bump WebSearch plugin --- Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json index d9bc47f3b..41c642b1f 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json @@ -26,7 +26,7 @@ "Name": "Web Searches", "Description": "Provide the web search ability", "Author": "qianlifeng", - "Version": "1.5.1", + "Version": "1.5.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll", From fd1310fcf93db6aa425ff108d629ff97e7585e64 Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Mon, 10 Jan 2022 16:20:55 -0600 Subject: [PATCH 07/14] use resources for raising top most success message --- Flow.Launcher/ViewModel/MainViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs index 95ef5d483..437464c2b 100644 --- a/Flow.Launcher/ViewModel/MainViewModel.cs +++ b/Flow.Launcher/ViewModel/MainViewModel.cs @@ -644,7 +644,7 @@ namespace Flow.Launcher.ViewModel Action = _ => { _topMostRecord.Remove(result); - App.API.ShowMsg("Success"); + App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success")); return false; } }; From 66d5772760e0a33e43fcc84d0ceb90c68da2968c Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Thu, 6 Jan 2022 19:15:50 -0600 Subject: [PATCH 08/14] Use Microsoft Package to register toast notification --- Flow.Launcher/Flow.Launcher.csproj | 1 + Flow.Launcher/MainWindow.xaml.cs | 1 + Flow.Launcher/Notification.cs | 22 ++++++++++++++-------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj index f431504c2..35a6389ca 100644 --- a/Flow.Launcher/Flow.Launcher.csproj +++ b/Flow.Launcher/Flow.Launcher.csproj @@ -88,6 +88,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 6298fdf3d..757a3537b 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -59,6 +59,7 @@ namespace Flow.Launcher _viewModel.Save(); e.Cancel = true; await PluginManager.DisposePluginsAsync(); + Notification.Uninstall(); Environment.Exit(0); } diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs index d8f9fd45e..3f5565eeb 100644 --- a/Flow.Launcher/Notification.cs +++ b/Flow.Launcher/Notification.cs @@ -1,4 +1,5 @@ using Flow.Launcher.Infrastructure; +using Microsoft.Toolkit.Uwp.Notifications; using System; using System.IO; using Windows.Data.Xml.Dom; @@ -8,10 +9,17 @@ namespace Flow.Launcher { internal static class Notification { + internal static bool legacy = Environment.OSVersion.Version.Build < 19041; + [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] + internal static void Uninstall() + { + if (!legacy) + ToastNotificationManagerCompat.Uninstall(); + } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] public static void Show(string title, string subTitle, string iconPath) { - var legacy = Environment.OSVersion.Version.Build < 19041; // Handle notification for win7/8/early win10 if (legacy) { @@ -24,13 +32,11 @@ namespace Flow.Launcher ? Path.Combine(Constant.ProgramDirectory, "Images\\app.png") : iconPath; - var xml = $"\"meziantou\"/{title}" + - $"{subTitle}"; - var toastXml = new XmlDocument(); - toastXml.LoadXml(xml); - var toast = new ToastNotification(toastXml); - ToastNotificationManager.CreateToastNotifier("Flow Launcher").Show(toast); - + new ToastContentBuilder() + .AddText(title, hintMaxLines: 1) + .AddText(subTitle) + .AddAppLogoOverride(new Uri(Icon)) + .Show(); } private static void LegacyShow(string title, string subTitle, string iconPath) From bffa90a81eb5f5cfe86f1fe24d758c4c6ba6e24f Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Mon, 3 Jan 2022 10:26:18 -0600 Subject: [PATCH 09/14] stop trigger global hotkey when shell plugin is not enabled --- Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs index 0c539015e..bed46425d 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs @@ -317,7 +317,7 @@ namespace Flow.Launcher.Plugin.Shell bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state) { - if (_settings.ReplaceWinR) + if (!context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR) { if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed) { From dd52a34919305c951c4e096ed43de6d03bafeb9f Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 10 Jan 2022 20:05:05 +1100 Subject: [PATCH 10/14] Shell plugin version bump --- Plugins/Flow.Launcher.Plugin.Shell/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json index d04a919e4..aaad63665 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json @@ -4,7 +4,7 @@ "Name": "Shell", "Description": "Provide executing commands from Flow Launcher", "Author": "qianlifeng", - "Version": "1.4.8", + "Version": "1.4.9", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll", From 8bef59e0fcf06a69e54a5b678544c43eb1d39be8 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 3 Jan 2022 23:48:54 +0900 Subject: [PATCH 11/14] - Change Toggle Switch Flow (LTR from RTL) - Change Open Theme Folder Button Width to Responsive --- .../Resources/CustomControlTemplate.xaml | 15 +++++---- Flow.Launcher/SettingWindow.xaml | 32 +++++++++---------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index a021d5de2..6329ead88 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -1478,7 +1478,7 @@ - + @@ -1486,7 +1486,7 @@ @@ -1511,7 +1509,7 @@ - + @@ -1520,6 +1518,7 @@ Grid.RowSpan="3" Grid.ColumnSpan="3" Margin="0,5" + HorizontalAlignment="Right" ui:FocusVisualHelper.IsTemplateFocusTarget="True" Background="{DynamicResource ToggleSwitchContainerBackground}" /> - + @@ -102,7 +99,7 @@ TargetType="{x:Type CheckBox}"> - + @@ -110,11 +107,16 @@ - @@ -948,9 +950,9 @@ FlowDirection="LeftToRight"> - - - + + +