Merge pull request #1004 from Flow-Launcher/release_1_9_2

Release 1.9.2
2026-03-11 08:54:32 +00:00 · 2022-02-02 19:02:43 +11:00 · 2022-02-02 19:02:43 +11:00 · 68101e0bda
commit 68101e0bda
parent 2c67aa6f13 ab0f72bce4
34 changed files with 104 additions and 98 deletions
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@ -88,6 +88,7 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="InputSimulator" Version="1.0.4" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
    <PackageReference Include="ModernWpfUI" Version="0.9.4" />
    <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
    <PackageReference Include="NuGet.CommandLine" Version="5.4.0">
--- a/Flow.Launcher/Languages/da.xaml
+++ b/Flow.Launcher/Languages/da.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">Opdater</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Annuler</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Denne opdatering vil genstarte Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Følgende filer bliver opdateret</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Følgende filer bliver opdateret</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Opdatereringsfiler</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Opdateringsbeskrivelse</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Opdateringsbeskrivelse</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/de.xaml
+++ b/Flow.Launcher/Languages/de.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">Aktualisieren</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Abbrechen</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Diese Aktualisierung wird Flow Launcher neu starten</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Folgende Dateien werden aktualisiert</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Folgende Dateien werden aktualisiert</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Aktualisiere Dateien</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Aktualisierungbeschreibung</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Aktualisierungbeschreibung</system:String>
    
 </ResourceDictionary>
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@ -244,9 +244,9 @@
    <system:String x:Key="update_flowlauncher_fail">Update Failed</system:String>
    <system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">This upgrade will restart Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Following files will be updated</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Following files will be updated</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Update files</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Update description</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Update description</system:String>

    <!--  Welcome Window  -->
    <system:String x:Key="Skip">Skip</system:String>
@ -281,7 +281,7 @@
    <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
    <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
-    <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Setting</system:String>
+    <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
    <system:String x:Key="RecommendAcronyms">sn</system:String>
    <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

--- a/Flow.Launcher/Languages/fr.xaml
+++ b/Flow.Launcher/Languages/fr.xaml
@ -132,8 +132,8 @@
    <system:String x:Key="update_flowlauncher_update">Mettre à jour</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Annuler</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Flow Launcher doit redémarrer pour installer cette mise à jour</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Les fichiers suivants seront mis à jour</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Les fichiers suivants seront mis à jour</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Fichiers mis à jour</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Description de la mise à jour</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Description de la mise à jour</system:String>
    
 </ResourceDictionary>
--- a/Flow.Launcher/Languages/it.xaml
+++ b/Flow.Launcher/Languages/it.xaml
@ -135,8 +135,8 @@
    <system:String x:Key="update_flowlauncher_update">Aggiorna</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Annulla</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Questo aggiornamento riavvierà Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">I seguenti file saranno aggiornati</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">I seguenti file saranno aggiornati</system:String>
    <system:String x:Key="update_flowlauncher_update_files">File aggiornati</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Descrizione aggiornamento</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Descrizione aggiornamento</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/ja.xaml
+++ b/Flow.Launcher/Languages/ja.xaml
@ -138,8 +138,8 @@
    <system:String x:Key="update_flowlauncher_update">アップデート</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">キャンセル</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">このアップデートでは、Flow Launcherの再起動が必要です</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">次のファイルがアップデートされます</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">次のファイルがアップデートされます</system:String>
    <system:String x:Key="update_flowlauncher_update_files">更新ファイル一覧</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">アップデートの詳細</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">アップデートの詳細</system:String>
    
 </ResourceDictionary>
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@ -241,9 +241,9 @@
    <system:String x:Key="update_flowlauncher_fail">업데이트 실패</system:String>
    <system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">업데이트를 위해 Flow Launcher를 재시작합니다.</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">아래 파일들이 업데이트됩니다.</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">아래 파일들이 업데이트됩니다.</system:String>
    <system:String x:Key="update_flowlauncher_update_files">업데이트 파일</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">업데이트 설명</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">업데이트 설명</system:String>


    <!--  Welcome Window  -->
--- a/Flow.Launcher/Languages/nb-NO.xaml
+++ b/Flow.Launcher/Languages/nb-NO.xaml
@ -135,8 +135,8 @@
    <system:String x:Key="update_flowlauncher_update">Oppdater</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Avbryt</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Denne opgraderingen vil starte Flow Launcher på nytt</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Følgende filer vil bli oppdatert</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Følgende filer vil bli oppdatert</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Oppdateringsfiler</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Oppdateringsbeskrivelse</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Oppdateringsbeskrivelse</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/nl.xaml
+++ b/Flow.Launcher/Languages/nl.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">Update</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Annuleer</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Deze upgrade zal Flow Launcher opnieuw opstarten</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Volgende bestanden zullen worden geüpdatet</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Volgende bestanden zullen worden geüpdatet</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Update bestanden</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Update beschrijving</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Update beschrijving</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/pl.xaml
+++ b/Flow.Launcher/Languages/pl.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">Aktualizuj</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Anuluj</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Aby dokończyć proces aktualizacji Flow Launcher musi zostać zresetowany</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Następujące pliki zostaną zaktualizowane</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Następujące pliki zostaną zaktualizowane</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Aktualizuj pliki</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Opis aktualizacji</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Opis aktualizacji</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/pt-br.xaml
+++ b/Flow.Launcher/Languages/pt-br.xaml
@ -135,8 +135,8 @@
    <system:String x:Key="update_flowlauncher_update">Atualizar</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Cancelar</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Essa atualização reiniciará o Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Os seguintes arquivos serão atualizados</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Os seguintes arquivos serão atualizados</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Atualizar arquivos</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Atualizar descrição</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Atualizar descrição</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/pt-pt.xaml
+++ b/Flow.Launcher/Languages/pt-pt.xaml
@ -244,9 +244,9 @@
    <system:String x:Key="update_flowlauncher_fail">Falha ao atualizar</system:String>
    <system:String x:Key="update_flowlauncher_check_connection">Verifique a sua ligação e as definições do proxy estabelecidas para github-cloud.s3.amazonaws.com</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Esta atualização irá reiniciar o Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Os seguintes ficheiros serão atualizados</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Os seguintes ficheiros serão atualizados</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Atualizar ficheiros</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Atualizar descrição</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Atualizar descrição</system:String>

    <!--  Welcome Window  -->
    <system:String x:Key="Skip">Ignorar</system:String>
--- a/Flow.Launcher/Languages/ru.xaml
+++ b/Flow.Launcher/Languages/ru.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">Обновить</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Отмена</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Это обновление перезапустит Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Следующие файлы будут обновлены</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Следующие файлы будут обновлены</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Обновить файлы</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Описание обновления</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Описание обновления</system:String>
    
 </ResourceDictionary>
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@ -242,9 +242,9 @@
    <system:String x:Key="update_flowlauncher_fail">Aktualizácia zlyhala</system:String>
    <system:String x:Key="update_flowlauncher_check_connection">Skontrolujte pripojenie a skúste aktualizovať nastavenia servera proxy k github-cloud.s3.amazonaws.com.</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Tento upgrade reštartuje Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Nasledujúce súbory budú aktualizované</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Nasledujúce súbory budú aktualizované</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Aktualizovať súbory</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Aktualizovať popis</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Aktualizovať popis</system:String>

    <!--  Welcome Window  -->
    <system:String x:Key="Skip">Preskočiť</system:String>
--- a/Flow.Launcher/Languages/sr.xaml
+++ b/Flow.Launcher/Languages/sr.xaml
@ -135,8 +135,8 @@
    <system:String x:Key="update_flowlauncher_update">Ažuriraj</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Otkaži</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Ova nadogradnja će ponovo pokrenuti Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Sledeće datoteke će biti ažurirane</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Sledeće datoteke će biti ažurirane</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Ažuriraj datoteke</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Opis ažuriranja</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Opis ažuriranja</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/tr.xaml
+++ b/Flow.Launcher/Languages/tr.xaml
@ -139,8 +139,8 @@
    <system:String x:Key="update_flowlauncher_update">Güncelle</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">İptal</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Bu güncelleme Flow Launcher'u yeniden başlatacaktır</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Aşağıdaki dosyalar güncelleştirilecektir</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Aşağıdaki dosyalar güncelleştirilecektir</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Güncellenecek dosyalar</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Güncelleme açıklaması</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Güncelleme açıklaması</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/uk-UA.xaml
+++ b/Flow.Launcher/Languages/uk-UA.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">Оновити</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">Скасувати</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">Це оновлення перезавантажить Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">Ці файли будуть оновлені</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">Ці файли будуть оновлені</system:String>
    <system:String x:Key="update_flowlauncher_update_files">Оновити файли</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">Опис оновлення</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">Опис оновлення</system:String>

 </ResourceDictionary>
--- a/Flow.Launcher/Languages/zh-cn.xaml
+++ b/Flow.Launcher/Languages/zh-cn.xaml
@ -226,9 +226,9 @@
    <system:String x:Key="update_flowlauncher_fail">更新失败</system:String>
    <system:String x:Key="update_flowlauncher_check_connection">检查网络是否可以连接至github-cloud.s3.amazonaws.com.</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">此次更新需要重启Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">下列文件会被更新</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">下列文件会被更新</system:String>
    <system:String x:Key="update_flowlauncher_update_files">更新文件</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">更新日志</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">更新日志</system:String>

    <!--  Welcome Window  -->
    <system:String x:Key="Skip">跳过</system:String>
--- a/Flow.Launcher/Languages/zh-tw.xaml
+++ b/Flow.Launcher/Languages/zh-tw.xaml
@ -126,8 +126,8 @@
    <system:String x:Key="update_flowlauncher_update">更新</system:String>
    <system:String x:Key="update_flowlauncher_update_cancel">取消</system:String>
    <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">此更新需要重新啟動 Flow Launcher</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_files">下列檔案會被更新</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_files">下列檔案會被更新</system:String>
    <system:String x:Key="update_flowlauncher_update_files">更新檔案</system:String>
-    <system:String x:Key="update_flowlauncher_update_upadte_description">更新日誌</system:String>
+    <system:String x:Key="update_flowlauncher_update_update_description">更新日誌</system:String>

 </ResourceDictionary>
--- 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);
        }

--- 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 = "<Pending>")]
+        internal static void Uninstall()
+        {
+            if (!legacy)
+                ToastNotificationManagerCompat.Uninstall();
+        }
+
        [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
        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 = $"<?xml version=\"1.0\"?><toast><visual><binding template=\"ToastImageAndText04\"><image id=\"1\" src=\"{Icon}\" alt=\"meziantou\"/><text id=\"1\">{title}</text>" +
-                      $"<text id=\"2\">{subTitle}</text></binding></visual></toast>";
-            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)
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@ -1469,6 +1469,7 @@
            <Setter.Value>
                <ControlTemplate TargetType="ui:ToggleSwitch">
                    <Border
+                        Width="Auto"
                        Background="{TemplateBinding Background}"
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
@ -1478,7 +1479,7 @@
                            <ui:SimpleVisualStateManager />
                        </VisualStateManager.CustomVisualStateManager>

-                        <Grid>
+                        <Grid HorizontalAlignment="Right">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
                                <RowDefinition Height="*" />
@ -1486,7 +1487,7 @@

                            <ui:ContentPresenterEx
                                x:Name="HeaderContentPresenter"
-                                Grid.Row="1"
+                                Grid.Row="0"
                                Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
                                VerticalAlignment="Top"
                                Content="{TemplateBinding Header}"
@ -1497,11 +1498,9 @@
                                TextWrapping="Wrap"
                                Visibility="Collapsed" />
                            <Grid
-                                Grid.Row="0"
-                                Width="100"
-                                MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
-                                Margin="10,0,0,0"
-                                HorizontalAlignment="Left"
+                                Grid.Row="1"
+                                MinWidth="10"
+                                HorizontalAlignment="Right"
                                VerticalAlignment="Top">

                                <Grid.RowDefinitions>
@ -1520,6 +1519,7 @@
                                    Grid.RowSpan="3"
                                    Grid.ColumnSpan="3"
                                    Margin="0,5"
+                                    HorizontalAlignment="Right"
                                    ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                                    Background="{DynamicResource ToggleSwitchContainerBackground}" />
                                <ContentPresenter
@ -1552,6 +1552,7 @@
                                    Grid.Column="2"
                                    Width="40"
                                    Height="20"
+                                    HorizontalAlignment="Right"
                                    Fill="{DynamicResource ToggleSwitchFillOff}"
                                    RadiusX="10"
                                    RadiusY="10"
@ -1563,6 +1564,7 @@
                                    Grid.Column="2"
                                    Width="40"
                                    Height="20"
+                                    HorizontalAlignment="Right"
                                    Fill="{DynamicResource ToggleSwitchFillOn}"
                                    Opacity="0"
                                    RadiusX="10"
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@ -57,10 +57,7 @@
                                    MinWidth="20"
                                    MaxWidth="60" />
                                <ColumnDefinition Width="8*" />
-                                <ColumnDefinition
-                                    Width="Auto"
-                                    MinWidth="40"
-                                    MaxWidth="550" />
+                                <ColumnDefinition Width="Auto" MinWidth="30" />
                            </Grid.ColumnDefinitions>
                        </Grid>
                    </ItemsPanelTemplate>
@ -102,7 +99,7 @@
            TargetType="{x:Type CheckBox}">
            <Setter Property="Width" Value="24" />
            <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="Margin" Value="0,4,0,4" />
+            <Setter Property="Margin" Value="0,4,10,4" />
            <Setter Property="LayoutTransform">
                <Setter.Value>
                    <ScaleTransform ScaleX="1" ScaleY="1" />
@ -110,11 +107,16 @@
            </Setter>
        </Style>

-        <Style x:Key="SideToggleSwitch" TargetType="{x:Type ui:ToggleSwitch}">
+        <Style
+            x:Key="SideToggleSwitch"
+            BasedOn="{StaticResource DefaultToggleSwitch}"
+            TargetType="{x:Type ui:ToggleSwitch}">
            <Setter Property="Grid.Column" Value="2" />
+            <Setter Property="Width" Value="Auto" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
            <Setter Property="OffContent" Value="{DynamicResource disable}" />
            <Setter Property="OnContent" Value="{DynamicResource enable}" />
-            <Setter Property="FlowDirection" Value="RightToLeft" />
            <Setter Property="Margin" Value="0,4,22,4" />
        </Style>

@ -948,9 +950,9 @@
                                                    FlowDirection="LeftToRight">
                                                    <Grid.ColumnDefinitions>
                                                        <ColumnDefinition Width="100" MinWidth="100" />
-                                                        <ColumnDefinition Width="3*" />
-                                                        <ColumnDefinition />
-                                                        <ColumnDefinition />
+                                                        <ColumnDefinition Width="8*" />
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="Auto" />
                                                    </Grid.ColumnDefinitions>
                                                    <StackPanel
                                                        Grid.Column="0"
@ -990,7 +992,7 @@
                                                        <Border>
                                                            <Button
                                                                x:Name="PriorityButton"
-                                                                Margin="0,0,12,0"
+                                                                Margin="0,0,22,0"
                                                                VerticalAlignment="Center"
                                                                Click="OnPluginPriorityClick"
                                                                Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
@ -1022,10 +1024,11 @@
                                                    </StackPanel>
                                                    <DockPanel Grid.Column="3">
                                                        <ui:ToggleSwitch
-                                                            Margin="0"
-                                                            DockPanel.Dock="Right"
+                                                            Margin="0,0,6,0"
+                                                            HorizontalAlignment="Right"
                                                            IsOn="{Binding PluginState}"
-                                                            Style="{DynamicResource SideToggleSwitch}" />
+                                                            OffContent="{DynamicResource disable}"
+                                                            OnContent="{DynamicResource enable}" />
                                                    </DockPanel>
                                                </Grid>

@ -1955,7 +1958,7 @@
                                                </StackPanel>
                                                <Button
                                                    Grid.Column="2"
-                                                    Width="180"
+                                                    MinWidth="180"
                                                    Margin="0,0,18,0"
                                                    HorizontalAlignment="Center"
                                                    Click="OpenThemeFolder"
--- 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;
                    }
                };
--- a/Plugins/Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.ControlPanel/Languages/ko.xaml
@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
-
-    <system:String x:Key="flowlauncher_plugin_controlpanel_plugin_name">제어판</system:String>
-    <system:String x:Key="flowlauncher_plugin_controlpanel_plugin_description">제어판 항목을 검색합니다.</system:String>
-    
-</ResourceDictionary>
--- 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 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="SharpZipLib" Version="1.3.2" />
+    <PackageReference Include="SharpZipLib" Version="1.3.3" />
  </ItemGroup>
 </Project>
--- 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",
--- 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)
                {
--- 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",
--- 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}",
--- 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",
--- 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",
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,4 +1,4 @@
-version: '1.9.1.{build}'
+version: '1.9.2.{build}'

 init:
 - ps: |