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/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
- 下列檔案會被更新
+ 下列檔案會被更新
更新檔案
- 更新日誌
+ 更新日誌
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 = $"{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)
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index a021d5de2..b4d7e78a7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1469,6 +1469,7 @@
-
+
@@ -1486,7 +1487,7 @@
@@ -1520,6 +1519,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">
-
-
-
+
+
+
@@ -1955,7 +1958,7 @@