removed reference to everything (#2133)
This commit is contained in:
parent
65276f45f1
commit
dafc514353
|
@ -71,10 +71,9 @@ namespace PowerLauncher
|
||||||
var window = new MainWindow(_settings, _mainVM);
|
var window = new MainWindow(_settings, _mainVM);
|
||||||
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
|
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
|
||||||
PluginManager.InitializePlugins(API);
|
PluginManager.InitializePlugins(API);
|
||||||
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
|
|
||||||
|
|
||||||
Current.MainWindow = window;
|
Current.MainWindow = window;
|
||||||
Current.MainWindow.Title = Constant.Wox;
|
Current.MainWindow.Title = Constant.ExeFileName;
|
||||||
|
|
||||||
// happlebao todo temp fix for instance code logic
|
// happlebao todo temp fix for instance code logic
|
||||||
// load plugin before change language, because plugin language also needs be changed
|
// load plugin before change language, because plugin language also needs be changed
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
|
xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
|
||||||
Title="Wox"
|
Title="PowerLaunch"
|
||||||
Topmost="True"
|
Topmost="True"
|
||||||
SizeToContent="Height"
|
SizeToContent="Height"
|
||||||
ResizeMode="NoResize"
|
ResizeMode="NoResize"
|
||||||
|
|
|
@ -3,24 +3,20 @@ using System.ComponentModel;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media.Animation;
|
using System.Windows.Media.Animation;
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Forms;
|
|
||||||
using Wox.Core.Plugin;
|
using Wox.Core.Plugin;
|
||||||
using Wox.Core.Resource;
|
using Wox.Core.Resource;
|
||||||
using Wox.Helper;
|
using Wox.Helper;
|
||||||
using Wox.Infrastructure.UserSettings;
|
using Wox.Infrastructure.UserSettings;
|
||||||
using Wox.ViewModel;
|
using Wox.ViewModel;
|
||||||
|
|
||||||
using Screen = System.Windows.Forms.Screen;
|
using Screen = System.Windows.Forms.Screen;
|
||||||
using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip;
|
|
||||||
using DataFormats = System.Windows.DataFormats;
|
using DataFormats = System.Windows.DataFormats;
|
||||||
using DragEventArgs = System.Windows.DragEventArgs;
|
using DragEventArgs = System.Windows.DragEventArgs;
|
||||||
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
|
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
|
||||||
using MessageBox = System.Windows.MessageBox;
|
using MessageBox = System.Windows.MessageBox;
|
||||||
using Microsoft.Toolkit.Wpf.UI.XamlHost;
|
using Microsoft.Toolkit.Wpf.UI.XamlHost;
|
||||||
using Windows.UI.Xaml.Controls;
|
using Windows.UI.Xaml.Controls;
|
||||||
using System.Diagnostics;
|
|
||||||
using Wox.Plugin;
|
|
||||||
using Windows.UI.Xaml.Input;
|
|
||||||
|
|
||||||
namespace PowerLauncher
|
namespace PowerLauncher
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,7 +34,6 @@ namespace PowerLauncher
|
||||||
|
|
||||||
StringBuilder content = new StringBuilder();
|
StringBuilder content = new StringBuilder();
|
||||||
content.AppendLine(ErrorReporting.RuntimeInfo());
|
content.AppendLine(ErrorReporting.RuntimeInfo());
|
||||||
content.AppendLine(ErrorReporting.DependenciesInfo());
|
|
||||||
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
|
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
|
||||||
content.AppendLine("Exception:");
|
content.AppendLine("Exception:");
|
||||||
content.AppendLine(exception.ToString());
|
content.AppendLine(exception.ToString());
|
||||||
|
|
|
@ -66,7 +66,6 @@ namespace Wox.Infrastructure.Exception
|
||||||
sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}");
|
sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}");
|
||||||
sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
|
sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
|
||||||
sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
|
sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
|
||||||
sb.AppendLine($"* Everything SDK Path: {Constant.EverythingSDKPath}");
|
|
||||||
sb.AppendLine($"* CLR Version: {Environment.Version}");
|
sb.AppendLine($"* CLR Version: {Environment.Version}");
|
||||||
sb.AppendLine($"* Installed .NET Framework: ");
|
sb.AppendLine($"* Installed .NET Framework: ");
|
||||||
foreach (var result in GetFrameworkVersionFromRegistry())
|
foreach (var result in GetFrameworkVersionFromRegistry())
|
||||||
|
|
|
@ -7,12 +7,12 @@ namespace Wox.Infrastructure
|
||||||
{
|
{
|
||||||
public static class Constant
|
public static class Constant
|
||||||
{
|
{
|
||||||
public const string Wox = "PowerLauncher";
|
public const string ExeFileName = "PowerLauncher";
|
||||||
public const string Plugins = "Plugins";
|
public const string Plugins = "Plugins";
|
||||||
|
|
||||||
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
|
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
|
||||||
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
|
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
|
||||||
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, Wox + ".exe");
|
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, ExeFileName + ".exe");
|
||||||
|
|
||||||
public static bool IsPortableMode;
|
public static bool IsPortableMode;
|
||||||
public const string PortableFolderName = "UserData";
|
public const string PortableFolderName = "UserData";
|
||||||
|
@ -26,7 +26,7 @@ namespace Wox.Infrastructure
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Wox);
|
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ExeFileName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,5 @@ namespace Wox.Infrastructure
|
||||||
public static readonly int ThumbnailSize = 64;
|
public static readonly int ThumbnailSize = 64;
|
||||||
public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.png");
|
public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.png");
|
||||||
public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png");
|
public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png");
|
||||||
|
|
||||||
public static string EverythingSDKPath;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,10 +65,9 @@ namespace Wox
|
||||||
var window = new MainWindow(_settings, _mainVM);
|
var window = new MainWindow(_settings, _mainVM);
|
||||||
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
|
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
|
||||||
PluginManager.InitializePlugins(API);
|
PluginManager.InitializePlugins(API);
|
||||||
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
|
|
||||||
|
|
||||||
Current.MainWindow = window;
|
Current.MainWindow = window;
|
||||||
Current.MainWindow.Title = Constant.Wox;
|
Current.MainWindow.Title = Constant.ExeFileName;
|
||||||
|
|
||||||
// happlebao todo temp fix for instance code logic
|
// happlebao todo temp fix for instance code logic
|
||||||
// load plugin before change language, because plugin language also needs be changed
|
// load plugin before change language, because plugin language also needs be changed
|
||||||
|
|
|
@ -12,6 +12,7 @@ namespace Wox.Helper
|
||||||
{
|
{
|
||||||
var logger = LogManager.GetLogger("UnHandledException");
|
var logger = LogManager.GetLogger("UnHandledException");
|
||||||
logger.Fatal(ExceptionFormatter.FormatExcpetion(e));
|
logger.Fatal(ExceptionFormatter.FormatExcpetion(e));
|
||||||
|
|
||||||
var reportWindow = new ReportWindow(e);
|
var reportWindow = new ReportWindow(e);
|
||||||
reportWindow.Show();
|
reportWindow.Show();
|
||||||
}
|
}
|
||||||
|
@ -32,17 +33,11 @@ namespace Wox.Helper
|
||||||
|
|
||||||
public static string RuntimeInfo()
|
public static string RuntimeInfo()
|
||||||
{
|
{
|
||||||
var info = $"\nWox version: {Constant.Version}" +
|
var info = $"\nVersion: {Constant.Version}" +
|
||||||
$"\nOS Version: {Environment.OSVersion.VersionString}" +
|
$"\nOS Version: {Environment.OSVersion.VersionString}" +
|
||||||
$"\nIntPtr Length: {IntPtr.Size}" +
|
$"\nIntPtr Length: {IntPtr.Size}" +
|
||||||
$"\nx64: {Environment.Is64BitOperatingSystem}";
|
$"\nx64: {Environment.Is64BitOperatingSystem}";
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string DependenciesInfo()
|
|
||||||
{
|
|
||||||
var info = $"\nEverything SDK Path: {Constant.EverythingSDKPath}";
|
|
||||||
return info;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,6 @@ namespace Wox
|
||||||
|
|
||||||
StringBuilder content = new StringBuilder();
|
StringBuilder content = new StringBuilder();
|
||||||
content.AppendLine(ErrorReporting.RuntimeInfo());
|
content.AppendLine(ErrorReporting.RuntimeInfo());
|
||||||
content.AppendLine(ErrorReporting.DependenciesInfo());
|
|
||||||
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
|
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
|
||||||
content.AppendLine("Exception:");
|
content.AppendLine("Exception:");
|
||||||
content.AppendLine(exception.ToString());
|
content.AppendLine(exception.ToString());
|
||||||
|
|
|
@ -6,6 +6,7 @@ using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
using NHotkey;
|
using NHotkey;
|
||||||
using NHotkey.Wpf;
|
using NHotkey.Wpf;
|
||||||
using Wox.Core.Plugin;
|
using Wox.Core.Plugin;
|
||||||
|
@ -196,6 +197,9 @@ namespace Wox.ViewModel
|
||||||
|
|
||||||
#region ViewModel Properties
|
#region ViewModel Properties
|
||||||
|
|
||||||
|
public Brush MainWindowBackground { get; set; }
|
||||||
|
public Brush MainWindowBorderBrush { get; set; }
|
||||||
|
|
||||||
public ResultsViewModel Results { get; private set; }
|
public ResultsViewModel Results { get; private set; }
|
||||||
public ResultsViewModel ContextMenu { get; private set; }
|
public ResultsViewModel ContextMenu { get; private set; }
|
||||||
public ResultsViewModel History { get; private set; }
|
public ResultsViewModel History { get; private set; }
|
||||||
|
|
Loading…
Reference in a new issue