Merge branch 'master' into fix_settings_openurl

Author: jjw24

Flow.Launcher.Core/Configuration/Portable.cs

@@ -8,6 +8,7 @@
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin.SharedCommands;
+using System.Linq;
 
 namespace Flow.Launcher.Core.Configuration
 {
@@ -19,7 +20,11 @@ public class Portable : IPortable
         /// <returns></returns>
         private UpdateManager NewUpdateManager()
         {
-            return new UpdateManager(string.Empty, Constant.FlowLauncher, Constant.RootDirectory);
+            var applicationFolderName = Constant.ApplicationDirectory
+                                            .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
+                                            .Last();
+
+            return new UpdateManager(string.Empty, applicationFolderName, Constant.RootDirectory);
         }
 
         public void DisablePortableMode()
@@ -148,7 +153,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
         {
             // Specify here so this method does not rely on other environment variables to initialise
             var portableDataPath = Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location.NonNull()).ToString(), "UserData");
-            var roamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Flow.Launcher");
+            var roamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FlowLauncher");
 
             bool DataLocationPortableDeleteRequired = false;
             bool DataLocationRoamingDeleteRequired = false;

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

@@ -12,7 +12,7 @@ public static class DataLocation
         public const string PortableFolderName = "UserData";
         public const string DeletionIndicatorFile = ".dead";
         public static string PortableDataPath = Path.Combine(Constant.ProgramDirectory, PortableFolderName);
-        public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Constant.FlowLauncher);
+        public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FlowLauncher");
         public static string DataDirectory()
         {
             if (PortableDataLocationInUse())

Flow.Launcher/SettingWindow.xaml

@@ -387,7 +387,7 @@
                         <Run Text="{Binding Github, Mode=OneWay}" />
                     </Hyperlink>
                 </TextBlock>
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="JJW24 Version" />
+                <TextBlock Grid.Row="2" Grid.Column="0" Text="Version" />
                 <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Version}" />
                 <TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource releaseNotes}" />
                 <TextBlock Grid.Row="3" Grid.Column="1">

JsonRPC/wox.py

@@ -4,7 +4,7 @@
 import sys
 import inspect
 
-class Flow.Launcher(object):
+class FlowLauncher(object):
     """
     Flow.Launcher python plugin base
     """
@@ -42,7 +42,7 @@ def debug(self,msg):
         print("DEBUG:{}".format(msg))
         sys.exit()
 
-class Flow.LauncherAPI(object):
+class FlowLauncherAPI(object):
 
     @classmethod
     def change_query(cls,query,requery = False):

Plugins/HelloWorldPython/main.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from flowlauncher import Flow.Launcher
+from flow.launcher import Flow.Launcher
 
-class HelloWorld(Flow.Launcher):
+class HelloWorld(FlowLauncher):
 
     def query(self, query):
         results = []

Plugins/HelloWorldPython/plugin.json

@@ -6,7 +6,7 @@
     "Author":"happlebao",
     "Version":"1.0",
     "Language":"python",
-    "Website":"https://github.com/wox-launcher/wox",
+    "Website":"https://github.com/Flow-Launcher/Flow.Launcher",
     "IcoPath":"Images\\app.png",
     "ExecuteFileName":"main.py"
 }

Scripts/wox.nuspec renamed to Scripts/flowlauncher.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>Flow.Launcher-JJW24</id>
+    <id>FlowLauncher</id>
     <title>Flow Launcher</title>
     <version>$version$</version>
     <authors>happlebao, Jeremy Wu</authors>

Scripts/wox.plugin.nuspec renamed to Scripts/flowlauncher.plugin.nuspec

@@ -74,7 +74,7 @@ function Zip-Release ($path, $version, $output) {
 
     $input = "$path\Output\Release"
     Write-Host "Input path:  $input"
-    $file = "$output\Flow.Launcher-JJW24-$version.zip"
+    $file = "$output\Flow.Launcher-$version.zip"
     Write-Host "Filename: $file"
 
     [Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
@@ -93,7 +93,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     Write-Host "Input path:  $input"
     Nuget pack $spec -Version $version -Properties Configuration=Release -BasePath $input -OutputDirectory  $output
 
-    $nupkg = "$output\Flow.Launcher-JJW24.$version.nupkg"
+    $nupkg = "$output\FlowLauncher.$version.nupkg"
     Write-Host "nupkg path: $nupkg"
     $icon = "$path\Flow.Launcher\Resources\app.ico"
     Write-Host "icon: $icon"
@@ -107,7 +107,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     Move-Item $temp\* $output -Force
     Remove-Item $temp
 
-    $file = "$output\Flow.Launcher-JJW24-$version.exe"
+    $file = "$output\Flow Launcher-$version.exe"
     Write-Host "Filename: $file"
 
     Move-Item "$output\Setup.exe" $file -Force

Scripts/post_build.ps1

@@ -16,6 +16,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("2.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0")]