Merge branch 'bug_1269' of https://github.com/nachmore/Flow.Launcher into bug_1269

nachmore · nachmore · commit 91ada374d892 · 2022-08-07T19:57:04.000-07:00
diff --git a/Flow.Launcher.Core/Plugin/JsonPRCModel.cs b/Flow.Launcher.Core/Plugin/JsonPRCModel.cs
@@ -93,4 +93,4 @@ public class JsonRPCResult : Result
 
         public Dictionary<string, object> SettingsChange { get; set; }
     }
-}
+}
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -85,10 +85,13 @@ public bool ChangeTheme(string theme)
 
                 Settings.Theme = theme;
 
+                // reload all resources even if the theme itself hasn't changed in order to pickup changes
+                // to things like fonts
+                UpdateResourceDictionary(GetResourceDictionary());
+
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
-                    UpdateResourceDictionary(GetResourceDictionary());
                     _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
                 }
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -915,6 +915,7 @@
                             Padding="0,0,0,0"
                             Background="{DynamicResource Color01B}">
                             <ListBox
+                                Name="Plugins"
                                 Width="Auto"
                                 Margin="5,0,0,0"
                                 Padding="0,0,7,0"
@@ -926,8 +927,7 @@
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
                                 SelectionChanged="SelectedPluginChanged"
-                                SnapsToDevicePixels="True"
-                                Name="Plugins">
+                                SnapsToDevicePixels="True">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel Margin="0,0,0,18" />
@@ -1116,8 +1116,8 @@
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
-                                                            Content="{Binding SettingControl}" 
-                                                            SizeChanged="ItemSizeChanged"/>
+                                                            Content="{Binding SettingControl}"
+                                                            SizeChanged="ItemSizeChanged" />
                                                     </StackPanel>
 
                                                     <StackPanel>
@@ -1127,8 +1127,7 @@
                                                             VerticalAlignment="Center"
                                                             BorderThickness="0,1,0,0"
                                                             CornerRadius="0"
-                                                            Style="{DynamicResource SettingGroupBox}"
-                                                            Visibility="{Binding ActionKeywordsVisibility}">
+                                                            Style="{DynamicResource SettingGroupBox}">
                                                             <ItemsControl Style="{DynamicResource SettingGrid}">
                                                                 <StackPanel
                                                                     Margin="0,0,-14,0"
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -60,7 +60,13 @@ public bool AutoUpdates
                 Settings.AutoUpdates = value;
 
                 if (value)
+                {
                     UpdateApp();
+                    SetStartup();
+                } else 
+                {
+                    RemoveStartup();
+                }
             }
         }
 
diff --git a/README.md b/README.md
@@ -38,10 +38,13 @@ Dedicated to making your workflow flow more seamless. Search everything from app
 <img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
 
 <h4 align="center">
-  <a href="#Getting-Started">Getting Started</a> •  <a href="#Features">Features</a> • <a href="#Plugins">Plugins</a> •
-       <a href="#Hotkeys">Hotkeys</a> •
-  <a href="#QuestionsSuggestions">Questions/Suggestions</a> •
-  <a href="#Development">Development</a> •
+  <a href="#-getting-started">Getting Started</a> •
+  <a href="#-features">Features</a> •
+  <a href="#-plugins">Plugins</a> •
+  <a href="#%EF%B8%8F-hotkeys">Hotkeys</a> •
+  <a href="#sponsors">Sponsors</a> •
+  <a href="#-questionssuggestions">Questions/Suggestions</a> •
+  <a href="#development">Development</a> •
   <a href="https://flowlauncher.com/docs">Docs</a>
 </h4>
 
@@ -262,10 +265,28 @@ And you can download <a href="https://github.com/Flow-Launcher/Flow.Launcher/dis
 
 <img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
 
+## Sponsors
+
+<p align="center">
+  <a href="https://appwrite.io">
+    <img src='https://appwrite.io/images-ee/press/logo-1.svg' width="25%"/>
+  </a>
+</p>
+
+<p align="left">
+  <a href="https://dev.to/appwrite/appwrite-loves-open-source-why-i-chose-to-support-flow-launcher-54pj">
+    :sparkles:<i>Why I Chose to Support Flow-Launcher</i>:sparkles:
+  </a>
+</p>
+
+<img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
+
 ## ❔ Questions/Suggestions
 
 Yes please, let us know in the [Q&A](https://github.com/Flow-Launcher/Flow.Launcher/discussions/categories/q-a) section. **Join our community on [Discord](https://discord.gg/AvgAQgh)!**
 
+<img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
+
 ## Development
 
 ### Contributing

Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,4 @@ public class JsonRPCResult : Result`
`93`	`93`
`94`	`94`	`public Dictionary<string, object> SettingsChange { get; set; }`
`95`	`95`	`}`
`96`		`-}`
	`96`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,13 @@ public bool ChangeTheme(string theme)`
`85`	`85`
`86`	`86`	`Settings.Theme = theme;`
`87`	`87`
	`88`	`+ // reload all resources even if the theme itself hasn't changed in order to pickup changes`
	`89`	`+ // to things like fonts`
	`90`	`+ UpdateResourceDictionary(GetResourceDictionary());`
	`91`	`+`
`88`	`92`	`//always allow re-loading default theme, in case of failure of switching to a new theme from default theme`
`89`	`93`	`if (_oldTheme != theme \|\| theme == defaultTheme)`
`90`	`94`	`{`
`91`		`- UpdateResourceDictionary(GetResourceDictionary());`
`92`	`95`	`_oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);`
`93`	`96`	`}`
`94`	`97`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,13 @@ public bool AutoUpdates`
`60`	`60`	`Settings.AutoUpdates = value;`
`61`	`61`
`62`	`62`	`if (value)`
	`63`	`+ {`
`63`	`64`	`UpdateApp();`
	`65`	`+ SetStartup();`
	`66`	`+ } else`
	`67`	`+ {`
	`68`	`+ RemoveStartup();`
	`69`	`+ }`
`64`	`70`	`}`
`65`	`71`	`}`
`66`	`72`