Skip to content

Commit f5ed029

Browse files
committed
Fix rename errors
1 parent 3c7f067 commit f5ed029

File tree

17 files changed

+42
-42
lines changed

17 files changed

+42
-42
lines changed

Flow.Launcher.Core/Configuration/Portable.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class Portable : IPortable
1919
/// <returns></returns>
2020
private UpdateManager NewUpdateManager()
2121
{
22-
return new UpdateManager(string.Empty, Constant.Flow.Launcher, Constant.RootDirectory);
22+
return new UpdateManager(string.Empty, Constant.FlowLauncher, Constant.RootDirectory);
2323
}
2424

2525
public void DisablePortableMode()
@@ -126,7 +126,7 @@ public void CreateUninstallerEntry()
126126
.CreateSubKey("Uninstall", RegistryKeyPermissionCheck.ReadWriteSubTree)) {; }
127127

128128
var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default)
129-
.CreateSubKey(uninstallRegSubKey + "\\" + Constant.Flow.Launcher, RegistryKeyPermissionCheck.ReadWriteSubTree);
129+
.CreateSubKey(uninstallRegSubKey + "\\" + Constant.FlowLauncher, RegistryKeyPermissionCheck.ReadWriteSubTree);
130130
key.SetValue("DisplayIcon", Constant.ApplicationDirectory + "\\app.ico", RegistryValueKind.String);
131131

132132
using (var portabilityUpdater = NewUpdateManager())

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private List<Result> DeserializedResult(string output)
7979
{
8080
if (result1.JsonRPCAction.Method.StartsWith("Flow.Launcher."))
8181
{
82-
ExecuteFlow.LauncherAPI(result1.JsonRPCAction.Method.Substring(4), result1.JsonRPCAction.Parameters);
82+
ExecuteFlowLauncherAPI(result1.JsonRPCAction.Method.Substring(4), result1.JsonRPCAction.Parameters);
8383
}
8484
else
8585
{
@@ -89,7 +89,7 @@ private List<Result> DeserializedResult(string output)
8989
&& !String.IsNullOrEmpty(jsonRpcRequestModel.Method)
9090
&& jsonRpcRequestModel.Method.StartsWith("Flow.Launcher."))
9191
{
92-
ExecuteFlow.LauncherAPI(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 ExecuteFlow.LauncherAPI(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)

Flow.Launcher.Core/Resource/Internationalization.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public Internationalization()
2727
LoadDefaultLanguage();
2828
// we don't want to load /Languages/en.xaml twice
2929
// so add wox language directory after load plugin language files
30-
AddFlow.LauncherLanguageDirectory();
30+
AddFlowLauncherLanguageDirectory();
3131
}
3232

3333

34-
private void AddFlow.LauncherLanguageDirectory()
34+
private void AddFlowLauncherLanguageDirectory()
3535
{
3636
var directory = Path.Combine(Constant.ProgramDirectory, Folder);
3737
_languageDirectories.Add(directory);

Flow.Launcher.Infrastructure/Constant.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ namespace Flow.Launcher.Infrastructure
66
{
77
public static class Constant
88
{
9-
public const string Flow.Launcher = "Flow.Launcher";
9+
public const string FlowLauncher = "Flow.Launcher";
1010
public const string Plugins = "Plugins";
1111

12-
public const string ApplicationFileName = Flow.Launcher + ".exe";
12+
public const string ApplicationFileName = FlowLauncher + ".exe";
1313

1414
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
1515
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
16-
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, Flow.Launcher + ".exe");
16+
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, FlowLauncher + ".exe");
1717
public static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
1818
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
1919

Flow.Launcher.Infrastructure/Storage/WoxJsonStorage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
namespace Flow.Launcher.Infrastructure.Storage
1010
{
11-
public class Flow.LauncherJsonStorage<T> : JsonStrorage<T> where T : new()
11+
public class FlowLauncherJsonStorage<T> : JsonStrorage<T> where T : new()
1212
{
13-
public Flow.LauncherJsonStorage()
13+
public FlowLauncherJsonStorage()
1414
{
1515
var directoryPath = Path.Combine(DataLocation.DataDirectory(), DirectoryName);
1616
Helper.ValidateDirectory(directoryPath);

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static class DataLocation
1212
public const string PortableFolderName = "UserData";
1313
public const string DeletionIndicatorFile = ".dead";
1414
public static string PortableDataPath = Path.Combine(Constant.ProgramDirectory, PortableFolderName);
15-
public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Constant.Flow.Launcher);
15+
public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Constant.FlowLauncher);
1616
public static string DataDirectory()
1717
{
1818
if (PortableDataLocationInUse())

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public string QuerySearchPrecisionString
7676
public bool DontPromptUpdateMsg { get; set; }
7777
public bool EnableUpdateLog { get; set; }
7878

79-
public bool StartFlow.LauncherOnSystemStartup { get; set; } = true;
79+
public bool StartFlowLauncherOnSystemStartup { get; set; } = true;
8080
public bool HideOnStartup { get; set; }
8181
bool _hideNotifyIcon { get; set; }
8282
public bool HideNotifyIcon

Flow.Launcher.Plugin/EventHandler.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
namespace Flow.Launcher.Plugin
55
{
6-
public delegate void Flow.LauncherKeyDownEventHandler(Flow.LauncherKeyDownEventArgs e);
7-
public delegate void AfterFlow.LauncherQueryEventHandler(Flow.LauncherQueryEventArgs e);
6+
public delegate void FlowLauncherKeyDownEventHandler(FlowLauncherKeyDownEventArgs e);
7+
public delegate void AfterFlowLauncherQueryEventHandler(FlowLauncherQueryEventArgs e);
88

99
public delegate void ResultItemDropEventHandler(Result result, IDataObject dropObject, DragEventArgs e);
1010

@@ -15,15 +15,15 @@ namespace Flow.Launcher.Plugin
1515
/// <param name="vkcode"></param>
1616
/// <param name="state"></param>
1717
/// <returns>return true to continue handling, return false to intercept system handling</returns>
18-
public delegate bool Flow.LauncherGlobalKeyboardEventHandler(int keyevent, int vkcode, SpecialKeyState state);
18+
public delegate bool FlowLauncherGlobalKeyboardEventHandler(int keyevent, int vkcode, SpecialKeyState state);
1919

20-
public class Flow.LauncherKeyDownEventArgs
20+
public class FlowLauncherKeyDownEventArgs
2121
{
2222
public string Query { get; set; }
2323
public KeyEventArgs keyEventArgs { get; set; }
2424
}
2525

26-
public class Flow.LauncherQueryEventArgs
26+
public class FlowLauncherQueryEventArgs
2727
{
2828
public Query Query { get; set; }
2929
}

Flow.Launcher.Plugin/IPublicAPI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,6 @@ public interface IPublicAPI
133133
/// Fired after global keyboard events
134134
/// if you want to hook something like Ctrl+R, you should use this event
135135
/// </summary>
136-
event Flow.LauncherGlobalKeyboardEventHandler GlobalKeyboardEvent;
136+
event FlowLauncherGlobalKeyboardEventHandler GlobalKeyboardEvent;
137137
}
138138
}

Flow.Launcher/App.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void OnStartup(object sender, StartupEventArgs e)
7373
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
7474

7575
Current.MainWindow = window;
76-
Current.MainWindow.Title = Constant.Flow.Launcher;
76+
Current.MainWindow.Title = Constant.FlowLauncher;
7777

7878
// happlebao todo temp fix for instance code logic
7979
// load plugin before change language, because plugin language also needs be changed
@@ -98,7 +98,7 @@ private void OnStartup(object sender, StartupEventArgs e)
9898

9999
private void AutoStartup()
100100
{
101-
if (_settings.StartFlow.LauncherOnSystemStartup)
101+
if (_settings.StartFlowLauncherOnSystemStartup)
102102
{
103103
if (!SettingWindow.StartupSet())
104104
{

0 commit comments

Comments
 (0)