Merge pull request #176 from Flow-Launcher/dev

jjw24 · web-flow · commit 152e32e03399 · 2020-10-20T21:13:14.000+11:00
Release 1.3.1
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
@@ -85,6 +86,8 @@ private void OnStartup(object sender, StartupEventArgs e)
 
                 Http.Proxy = _settings.Proxy;
 
+                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
                 RegisterExitEvents();
 
                 AutoStartup();
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -34,7 +34,7 @@ static Main()
         {
             MagesEngine = new Engine();
         }
-        
+
         public void Init(PluginInitContext context)
         {
             Context = context;
@@ -78,16 +78,16 @@ public List<Result> Query(Query query)
                             {
                                 try
                                 {
-                                    Clipboard.SetText(newResult);
+                                    Clipboard.SetDataObject(newResult);
                                     return true;
                                 }
-                                catch (ExternalException)
+                                catch (ExternalException e)
                                 {
                                     MessageBox.Show("Copy failed, please try later");
                                     return false;
                                 }
                             }
-                        } 
+                        }
                     };
                 }
             }
@@ -111,7 +111,7 @@ private bool CanCalculate(Query query)
             {
                 return false;
             }
-                
+
             if (!IsBracketComplete(query.Search))
             {
                 return false;
@@ -164,7 +164,7 @@ private bool IsBracketComplete(string query)
 
             return leftBracketCount == 0;
         }
-        
+
         public string GetTranslatedPluginTitle()
         {
             return Context.API.GetTranslation("flowlauncher_plugin_caculator_plugin_name");
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Calculator",
   "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
   "Author": "cxfksword",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/Flow-Launcher/Flow.Launcher/total.svg)](https://github.com/Flow-Launcher/Flow.Launcher/releases)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/Flow-Launcher/Flow.Launcher)](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest)
 ![GitHub Release Date](https://img.shields.io/github/release-date/Flow-Launcher/Flow.Launcher)
+[![Discord](https://img.shields.io/discord/727828229250875472?color=7389D8&labelColor=6A7EC2&label=Community&logo=discord&logoColor=white)](https://discord.gg/AvgAQgh)
 
 Flow Launcher. Dedicated to make your workflow flow more seamlessly. Aimed at being more than an app launcher, it searches, integrates and expands on functionalities. Flow will continue to evolve, designed to be open and built with the community at heart.
 
@@ -59,6 +60,8 @@ Get in touch if you like to join the Flow-Launcher Team and help build this grea
 
 Yes please, submit an issue to let us know.
 
+**Join our community on [Discord](https://discord.gg/AvgAQgh)!**
+
 ## Developing/Debugging
 
 Flow Launcher's target framework is .Net Core 3.1
diff --git a/SolutionAssemblyInfo.cs b/SolutionAssemblyInfo.cs
@@ -16,6 +16,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
-[assembly: AssemblyInformationalVersion("1.3.0")]
+[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyFileVersion("1.3.1")]
+[assembly: AssemblyInformationalVersion("1.3.1")]
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '1.3.0.{build}'
+version: '1.3.1.{build}'
 
 init:
 - ps: |

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static Main()`
`34`	`34`	`{`
`35`	`35`	`MagesEngine = new Engine();`
`36`	`36`	`}`
`37`		`-`
	`37`	`+`
`38`	`38`	`public void Init(PluginInitContext context)`
`39`	`39`	`{`
`40`	`40`	`Context = context;`
`@@ -78,16 +78,16 @@ public List<Result> Query(Query query)`
`78`	`78`	`{`
`79`	`79`	`try`
`80`	`80`	`{`
`81`		`- Clipboard.SetText(newResult);`
	`81`	`+ Clipboard.SetDataObject(newResult);`
`82`	`82`	`return true;`
`83`	`83`	`}`
`84`		`- catch (ExternalException)`
	`84`	`+ catch (ExternalException e)`
`85`	`85`	`{`
`86`	`86`	`MessageBox.Show("Copy failed, please try later");`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`- }`
	`90`	`+ }`
`91`	`91`	`};`
`92`	`92`	`}`
`93`	`93`	`}`
`@@ -111,7 +111,7 @@ private bool CanCalculate(Query query)`
`111`	`111`	`{`
`112`	`112`	`return false;`
`113`	`113`	`}`
`114`		`-`
	`114`	`+`
`115`	`115`	`if (!IsBracketComplete(query.Search))`
`116`	`116`	`{`
`117`	`117`	`return false;`
`@@ -164,7 +164,7 @@ private bool IsBracketComplete(string query)`
`164`	`164`
`165`	`165`	`return leftBracketCount == 0;`
`166`	`166`	`}`
`167`		`-`
	`167`	`+`
`168`	`168`	`public string GetTranslatedPluginTitle()`
`169`	`169`	`{`
`170`	`170`	`return Context.API.GetTranslation("flowlauncher_plugin_caculator_plugin_name");`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: '1.3.0.{build}'`
	`1`	`+version: '1.3.1.{build}'`
`2`	`2`
`3`	`3`	`init:`
`4`	`4`	`- ps: \|`