Skip to content

Commit 0f298ec

Browse files
jjw24jjw24
authored
Merge pull request #1 from Flow-Launcher/rebrand_name
Rebrand- name
2 parents 98758f6 + 8f31670 commit 0f298ec

File tree

554 files changed

+2731
-2726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+2731
-2726
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ paket-files/
285285
# New to Visual Studio
286286
*.VC.db
287287

288-
## Wox specific
288+
## Flow Launcher specific
289289
Output/*
290290
/Python.Runtime.dll
291291
Thumbs.db

‎Wox.Core/Configuration/IPortable.cs renamed to ‎Flow.Launcher.Core/Configuration/IPortable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace Wox.Core.Configuration
2+
namespace Flow.Launcher.Core.Configuration
33
{
44
public interface IPortable
55
{

‎Wox.Core/Configuration/Portable.cs renamed to ‎Flow.Launcher.Core/Configuration/Portable.cs

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
using System.IO;
55
using System.Reflection;
66
using System.Windows;
7-
using Wox.Infrastructure;
8-
using Wox.Infrastructure.Logger;
9-
using Wox.Infrastructure.UserSettings;
10-
using Wox.Plugin.SharedCommands;
7+
using Flow.Launcher.Infrastructure;
8+
using Flow.Launcher.Infrastructure.Logger;
9+
using Flow.Launcher.Infrastructure.UserSettings;
10+
using Flow.Launcher.Plugin.SharedCommands;
11+
using System.Linq;
1112

12-
namespace Wox.Core.Configuration
13+
namespace Flow.Launcher.Core.Configuration
1314
{
1415
public class Portable : IPortable
1516
{
@@ -19,7 +20,11 @@ public class Portable : IPortable
1920
/// <returns></returns>
2021
private UpdateManager NewUpdateManager()
2122
{
22-
return new UpdateManager(string.Empty, Constant.Wox, Constant.RootDirectory);
23+
var applicationFolderName = Constant.ApplicationDirectory
24+
.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
25+
.Last();
26+
27+
return new UpdateManager(string.Empty, applicationFolderName, Constant.RootDirectory);
2328
}
2429

2530
public void DisablePortableMode()
@@ -36,7 +41,7 @@ public void DisablePortableMode()
3641
#endif
3742
IndicateDeletion(DataLocation.PortableDataPath);
3843

39-
MessageBox.Show("Wox needs to restart to finish disabling portable mode, " +
44+
MessageBox.Show("Flow Launcher needs to restart to finish disabling portable mode, " +
4045
"after the restart your portable data profile will be deleted and roaming data profile kept");
4146

4247
UpdateManager.RestartApp(Constant.ApplicationFileName);
@@ -64,7 +69,7 @@ public void EnablePortableMode()
6469
#endif
6570
IndicateDeletion(DataLocation.RoamingDataPath);
6671

67-
MessageBox.Show("Wox needs to restart to finish enabling portable mode, " +
72+
MessageBox.Show("Flow Launcher needs to restart to finish enabling portable mode, " +
6873
"after the restart your roaming data profile will be deleted and portable data profile kept");
6974

7075
UpdateManager.RestartApp(Constant.ApplicationFileName);
@@ -126,7 +131,7 @@ public void CreateUninstallerEntry()
126131
.CreateSubKey("Uninstall", RegistryKeyPermissionCheck.ReadWriteSubTree)) {; }
127132

128133
var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default)
129-
.CreateSubKey(uninstallRegSubKey + "\\" + Constant.Wox, RegistryKeyPermissionCheck.ReadWriteSubTree);
134+
.CreateSubKey(uninstallRegSubKey + "\\" + Constant.FlowLauncher, RegistryKeyPermissionCheck.ReadWriteSubTree);
130135
key.SetValue("DisplayIcon", Constant.ApplicationDirectory + "\\app.ico", RegistryValueKind.String);
131136

132137
using (var portabilityUpdater = NewUpdateManager())
@@ -142,13 +147,13 @@ internal void IndicateDeletion(string filePathTodelete)
142147

143148
///<summary>
144149
///This method should be run at first before all methods during start up and should be run before determining which data location
145-
///will be used for Wox.
150+
///will be used for Flow Launcher.
146151
///</summary>
147152
public void PreStartCleanUpAfterPortabilityUpdate()
148153
{
149154
// Specify here so this method does not rely on other environment variables to initialise
150155
var portableDataPath = Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location.NonNull()).ToString(), "UserData");
151-
var roamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Wox");
156+
var roamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FlowLauncher");
152157

153158
bool DataLocationPortableDeleteRequired = false;
154159
bool DataLocationRoamingDeleteRequired = false;
@@ -163,7 +168,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
163168
{
164169
FilesFolders.RemoveFolderIfExists(roamingDataPath);
165170

166-
if (MessageBox.Show("Wox has detected you enabled portable mode, " +
171+
if (MessageBox.Show("Flow Launcher has detected you enabled portable mode, " +
167172
"would you like to move it to a different location?", string.Empty,
168173
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
169174
{
@@ -179,7 +184,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
179184
{
180185
FilesFolders.RemoveFolderIfExists(portableDataPath);
181186

182-
MessageBox.Show("Wox has detected you disabled portable mode, " +
187+
MessageBox.Show("Flow Launcher has detected you disabled portable mode, " +
183188
"the relevant shortcuts and uninstaller entry have been created");
184189

185190
return;
@@ -193,7 +198,7 @@ public bool CanUpdatePortability()
193198

194199
if(roamingLocationExists && portableLocationExists)
195200
{
196-
MessageBox.Show(string.Format("Wox detected your user data exists both in {0} and " +
201+
MessageBox.Show(string.Format("Flow Launcher detected your user data exists both in {0} and " +
197202
"{1}. {2}{2}Please delete {1} in order to proceed. No changes have occured.",
198203
DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
199204

‎Wox.Core/Wox.Core.csproj renamed to ‎Flow.Launcher.Core/Flow.Launcher.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<UseWindowsForms>true</UseWindowsForms>
77
<OutputType>Library</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>Wox.Core</RootNamespace>
10-
<AssemblyName>Wox.Core</AssemblyName>
9+
<RootNamespace>Flow.Launcher.Core</RootNamespace>
10+
<AssemblyName>Flow.Launcher.Core</AssemblyName>
1111
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1212
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1313
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -68,8 +68,8 @@
6868
</ItemGroup>
6969

7070
<ItemGroup>
71-
<ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
72-
<ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />
71+
<ProjectReference Include="..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
72+
<ProjectReference Include="..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
7373
</ItemGroup>
7474

7575
</Project>

‎Wox.Core/FodyWeavers.xml renamed to ‎Flow.Launcher.Core/FodyWeavers.xml

File renamed without changes.

‎Wox.Core/Plugin/ExecutablePlugin.cs renamed to ‎Flow.Launcher.Core/Plugin/ExecutablePlugin.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Diagnostics;
3-
using Wox.Plugin;
3+
using Flow.Launcher.Plugin;
44

5-
namespace Wox.Core.Plugin
5+
namespace Flow.Launcher.Core.Plugin
66
{
77
internal class ExecutablePlugin : JsonRPCPlugin
88
{

‎Wox.Core/Plugin/JsonPRCModel.cs renamed to ‎Flow.Launcher.Core/Plugin/JsonPRCModel.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11

2-
/* We basically follow the Json-RPC 2.0 spec (http://www.jsonrpc.org/specification) to invoke methods between Wox and other plugins,
2+
/* We basically follow the Json-RPC 2.0 spec (http://www.jsonrpc.org/specification) to invoke methods between Flow Launcher and other plugins,
33
* like python or other self-execute program. But, we added addtional infos (proxy and so on) into rpc request. Also, we didn't use the
44
* "id" and "jsonrpc" in the request, since it's not so useful in our request model.
55
*
66
* When execute a query:
7-
* Wox -------JsonRPCServerRequestModel--------> client
8-
* Wox <------JsonRPCQueryResponseModel--------- client
7+
* Flow Launcher -------JsonRPCServerRequestModel--------> client
8+
* Flow Launcher <------JsonRPCQueryResponseModel--------- client
99
*
1010
* When execute a action (which mean user select an item in reulst item):
11-
* Wox -------JsonRPCServerRequestModel--------> client
12-
* Wox <------JsonRPCResponseModel-------------- client
11+
* Flow Launcher -------JsonRPCServerRequestModel--------> client
12+
* Flow Launcher <------JsonRPCResponseModel-------------- client
1313
*
1414
*/
1515

1616
using System.Collections.Generic;
1717
using System.Linq;
18-
using Wox.Plugin;
18+
using Flow.Launcher.Plugin;
1919

20-
namespace Wox.Core.Plugin
20+
namespace Flow.Launcher.Core.Plugin
2121
{
2222
public class JsonRPCErrorModel
2323
{
@@ -98,7 +98,7 @@ private string ReplaceEscapes(string str)
9898
}
9999

100100
/// <summary>
101-
/// Json RPC Request that Wox sent to client
101+
/// Json RPC Request that Flow Launcher sent to client
102102
/// </summary>
103103
public class JsonRPCServerRequestModel : JsonRPCRequestModel
104104
{
@@ -110,7 +110,7 @@ public override string ToString()
110110
}
111111

112112
/// <summary>
113-
/// Json RPC Request(in query response) that client sent to Wox
113+
/// Json RPC Request(in query response) that client sent to Flow Launcher
114114
/// </summary>
115115
public class JsonRPCClientRequestModel : JsonRPCRequestModel
116116
{
@@ -124,9 +124,9 @@ public override string ToString()
124124
}
125125

126126
/// <summary>
127-
/// Represent the json-rpc result item that client send to Wox
127+
/// Represent the json-rpc result item that client send to Flow Launcher
128128
/// Typically, we will send back this request model to client after user select the result item
129-
/// But if the request method starts with "Wox.", we will invoke the public APIs we expose.
129+
/// But if the request method starts with "Flow Launcher.", we will invoke the public APIs we expose.
130130
/// </summary>
131131
public class JsonRPCResult : Result
132132
{

‎Wox.Core/Plugin/JsonRPCPlugin.cs renamed to ‎Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
using System.Threading.Tasks;
88
using System.Windows.Forms;
99
using Newtonsoft.Json;
10-
using Wox.Infrastructure.Exception;
11-
using Wox.Infrastructure.Logger;
12-
using Wox.Plugin;
10+
using Flow.Launcher.Infrastructure.Exception;
11+
using Flow.Launcher.Infrastructure.Logger;
12+
using Flow.Launcher.Plugin;
1313

14-
namespace Wox.Core.Plugin
14+
namespace Flow.Launcher.Core.Plugin
1515
{
1616
/// <summary>
1717
/// Represent the plugin that using JsonPRC
@@ -77,19 +77,19 @@ private List<Result> DeserializedResult(string output)
7777

7878
if (!String.IsNullOrEmpty(result1.JsonRPCAction.Method))
7979
{
80-
if (result1.JsonRPCAction.Method.StartsWith("Wox."))
80+
if (result1.JsonRPCAction.Method.StartsWith("Flow.Launcher."))
8181
{
82-
ExecuteWoxAPI(result1.JsonRPCAction.Method.Substring(4), result1.JsonRPCAction.Parameters);
82+
ExecuteFlowLauncherAPI(result1.JsonRPCAction.Method.Substring(4), result1.JsonRPCAction.Parameters);
8383
}
8484
else
8585
{
8686
string actionReponse = ExecuteCallback(result1.JsonRPCAction);
8787
JsonRPCRequestModel jsonRpcRequestModel = JsonConvert.DeserializeObject<JsonRPCRequestModel>(actionReponse);
8888
if (jsonRpcRequestModel != null
8989
&& !String.IsNullOrEmpty(jsonRpcRequestModel.Method)
90-
&& jsonRpcRequestModel.Method.StartsWith("Wox."))
90+
&& jsonRpcRequestModel.Method.StartsWith("Flow.Launcher."))
9191
{
92-
ExecuteWoxAPI(jsonRpcRequestModel.Method.Substring(4), jsonRpcRequestModel.Parameters);
92+
ExecuteFlowLauncherAPI(jsonRpcRequestModel.Method.Substring(4), jsonRpcRequestModel.Parameters);
9393
}
9494
}
9595
}
@@ -105,7 +105,7 @@ private List<Result> DeserializedResult(string output)
105105
}
106106
}
107107

108-
private void ExecuteWoxAPI(string method, object[] parameters)
108+
private void ExecuteFlowLauncherAPI(string method, object[] parameters)
109109
{
110110
MethodInfo methodInfo = PluginManager.API.GetType().GetMethod(method);
111111
if (methodInfo != null)

‎Wox.Core/Plugin/PluginConfig.cs renamed to ‎Flow.Launcher.Core/Plugin/PluginConfig.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
using System.IO;
55
using System.Threading.Tasks;
66
using Newtonsoft.Json;
7-
using Wox.Infrastructure.Exception;
8-
using Wox.Infrastructure.Logger;
9-
using Wox.Plugin;
7+
using Flow.Launcher.Infrastructure.Exception;
8+
using Flow.Launcher.Infrastructure.Logger;
9+
using Flow.Launcher.Plugin;
1010

11-
namespace Wox.Core.Plugin
11+
namespace Flow.Launcher.Core.Plugin
1212
{
1313

1414
internal abstract class PluginConfig

‎Wox.Core/Plugin/PluginInstaller.cs renamed to ‎Flow.Launcher.Core/Plugin/PluginInstaller.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
using System.Windows;
44
using ICSharpCode.SharpZipLib.Zip;
55
using Newtonsoft.Json;
6-
using Wox.Plugin;
6+
using Flow.Launcher.Plugin;
77

8-
namespace Wox.Core.Plugin
8+
namespace Flow.Launcher.Core.Plugin
99
{
1010
internal class PluginInstaller
1111
{
1212
internal static void Install(string path)
1313
{
1414
if (File.Exists(path))
1515
{
16-
string tempFoler = Path.Combine(Path.GetTempPath(), "wox\\plugins");
16+
string tempFoler = Path.Combine(Path.GetTempPath(), "flowlauncher\\plugins");
1717
if (Directory.Exists(tempFoler))
1818
{
1919
Directory.Delete(tempFoler, true);
@@ -77,13 +77,13 @@ internal static void Install(string path)
7777
//exsiting plugins may be has loaded by application,
7878
//if we try to delelte those kind of plugins, we will get a error that indicate the
7979
//file is been used now.
80-
//current solution is to restart wox. Ugly.
80+
//current solution is to restart Flow Launcher. Ugly.
8181
//if (MainWindow.Initialized)
8282
//{
8383
// Plugins.Initialize();
8484
//}
8585
if (MessageBox.Show($"You have installed plugin {plugin.Name} successfully.{Environment.NewLine}" +
86-
"Restart Wox to take effect?",
86+
"Restart Flow Launcher to take effect?",
8787
"Install plugin", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
8888
{
8989
PluginManager.API.RestarApp();

0 commit comments

Comments
 (0)