From 3c235887d63628bdf838bfac11012b78e3152866 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 28 Apr 2020 21:10:42 +1000 Subject: [PATCH 01/38] Update General tab UI --- Flow.Launcher.Core/Resource/Theme.cs | 3 + Flow.Launcher/App.xaml | 3 + Flow.Launcher/Flow.Launcher.csproj | 1 + Flow.Launcher/SettingWindow.xaml | 105 +++++++++--------- .../ViewModel/SettingWindowViewModel.cs | 12 ++ 5 files changed, 73 insertions(+), 51 deletions(-) diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs index 6c06bb484c4..a4258474f17 100644 --- a/Flow.Launcher.Core/Resource/Theme.cs +++ b/Flow.Launcher.Core/Resource/Theme.cs @@ -34,6 +34,9 @@ public Theme() var dicts = Application.Current.Resources.MergedDictionaries; _oldResource = dicts.First(d => { + if (d.Source == null) + return false; + var p = d.Source.AbsolutePath; var dir = Path.GetDirectoryName(p).NonNull(); var info = new DirectoryInfo(dir); diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml index 0b67b87dd8c..29688cada71 100644 --- a/Flow.Launcher/App.xaml +++ b/Flow.Launcher/App.xaml @@ -1,11 +1,14 @@  + + diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj index 4baeb69e493..f9b26831165 100644 --- a/Flow.Launcher/Flow.Launcher.csproj +++ b/Flow.Launcher/Flow.Launcher.csproj @@ -57,6 +57,7 @@ + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index be87e4f5260..b655a04c536 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1,4 +1,4 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - + + + - - - - + + + - - - - -