Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 03:07:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix applicationDirectory issues and add plugin debuggerMode

Browse Source
This commit is contained in:
Yeechan Lu
2014-03-22 16:50:47 +08:00
parent 9d404b6679
commit 31bbf3cfd5
12 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Wox/App.xaml.cs
View File

@@ -83,6 +83,11 @@ namespace Wox
return;
}
if (e.Args.Length > 0 && e.Args[0].ToLower() == "plugindebugger")
{
var path = e.Args[1];
PluginLoader.Plugins.ActivatePluginDebugger(path);
}
window = new MainWindow();
if (e.Args.Length == 0 || e.Args[0].ToLower() != "hidestart")

2
Wox/MainWindow.xaml.cs
View File

@@ -424,7 +424,7 @@ namespace Wox
{
var dict = new ResourceDictionary
{
Source = new Uri(Path.Combine(Directory.GetCurrentDirectory(), "Themes\\" + themeName + ".xaml"), UriKind.Absolute)
Source = new Uri(Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Themes\\" + themeName + ".xaml"), UriKind.Absolute)
};

8
Wox/PluginLoader/BasePluginLoader.cs
View File

@@ -13,7 +13,7 @@ namespace Wox.PluginLoader
{
public abstract class BasePluginLoader
{
private static string PluginPath = AppDomain.CurrentDomain.BaseDirectory + "Plugins";
private static string PluginPath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Plugins");
private static string PluginConfigName = "plugin.json";
protected static List<PluginMetadata> pluginMetadatas = new List<PluginMetadata>();
public abstract List<PluginPair> LoadPlugin();
@@ -23,6 +23,12 @@ namespace Wox.PluginLoader
pluginMetadatas.Clear();
ParseSystemPlugins();
ParseThirdPartyPlugins();
if (Plugins.DebuggerMode != null)
{
PluginMetadata metadata = GetMetadataFromJson(Plugins.DebuggerMode);
if (metadata != null) pluginMetadatas.Add(metadata);
}
}
private static void ParseSystemPlugins()

11
Wox/PluginLoader/Plugins.cs
View File

@@ -12,6 +12,7 @@ namespace Wox.PluginLoader
{
public static class Plugins
{
private static string debuggerMode = null;
private static List<PluginPair> plugins = new List<PluginPair>();
public static void Init()
@@ -68,5 +69,15 @@ namespace Wox.PluginLoader
return plugins.Any(o => o.Metadata.PluginType == PluginType.ThirdParty && o.Metadata.ActionKeyword == query.ActionName);
}
public static void ActivatePluginDebugger(string path)
{
debuggerMode = path;
}
public static String DebuggerMode
{
get { return debuggerMode; }
}
}
}

2
Wox/PluginLoader/PythonPluginLoader.cs
View File

@@ -47,7 +47,7 @@ namespace Wox.PluginLoader
private void SetPythonHome()
{
//Environment.SetEnvironmentVariable("PYTHONHOME",Path.Combine(Directory.GetCurrentDirectory(),"PythonHome"));
//Environment.SetEnvironmentVariable("PYTHONHOME",Path.Combine(Path.GetDirectoryName(Application.ExecutablePath),"PythonHome"));
//PythonEngine.PythonHome =
//PythonEngine.ProgramName
}

6
Wox/SettingWindow.xaml.cs
View File

@@ -139,7 +139,7 @@ namespace Wox
private List<string> LoadAvailableThemes()
{
string themePath = Directory.GetCurrentDirectory() + "\\Themes\\";
string themePath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Themes");
return Directory.GetFiles(themePath).Where(filePath => filePath.EndsWith(".xaml") && !filePath.EndsWith("Default.xaml")).ToList();
}
@@ -244,9 +244,9 @@ namespace Wox
IWshShortcut shortcut = (IWshShortcut)wshShell.CreateShortcut(woxLinkPath);
shortcut.TargetPath = Application.ExecutablePath;
shortcut.Arguments = "hideStart";
shortcut.WorkingDirectory = Application.StartupPath;
shortcut.WorkingDirectory = Path.GetDirectoryName(Application.ExecutablePath);
shortcut.Description = "Launch Wox";
shortcut.IconLocation = Application.StartupPath + @"\App.ico";
shortcut.IconLocation = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "App.ico");
shortcut.Save();
}