maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed reference to everything (#2133)

Browse source
This commit is contained in:
Clint Rutkas 2020-04-15 15:10:27 -07:00 committed by GitHub
parent 65276f45f1
commit dafc514353
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/modules/launcher/PowerLauncher/App.xaml.cs
View file

@ -71,10 +71,9 @@ namespace PowerLauncher
var window = new MainWindow(_settings, _mainVM);
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
PluginManager.InitializePlugins(API);
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
Current.MainWindow = window;
Current.MainWindow.Title = Constant.Wox;
Current.MainWindow.Title = Constant.ExeFileName;
// happlebao todo temp fix for instance code logic
// load plugin before change language, because plugin language also needs be changed

2
src/modules/launcher/PowerLauncher/MainWindow.xaml
View file

@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
Title="Wox"
Title="PowerLaunch"
Topmost="True"
SizeToContent="Height"
ResizeMode="NoResize"

8
src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
View file

@ -3,24 +3,20 @@ using System.ComponentModel;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media.Animation;
using System.Windows.Controls;
using System.Windows.Forms;
using Wox.Core.Plugin;
using Wox.Core.Resource;
using Wox.Helper;
using Wox.Infrastructure.UserSettings;
using Wox.ViewModel;
using Screen = System.Windows.Forms.Screen;
using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip;
using DataFormats = System.Windows.DataFormats;
using DragEventArgs = System.Windows.DragEventArgs;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MessageBox = System.Windows.MessageBox;
using Microsoft.Toolkit.Wpf.UI.XamlHost;
using Windows.UI.Xaml.Controls;
using System.Diagnostics;
using Wox.Plugin;
using Windows.UI.Xaml.Input;
namespace PowerLauncher
{

1
src/modules/launcher/PowerLauncher/ReportWindow.xaml.cs
View file

@ -34,7 +34,6 @@ namespace PowerLauncher
StringBuilder content = new StringBuilder();
content.AppendLine(ErrorReporting.RuntimeInfo());
content.AppendLine(ErrorReporting.DependenciesInfo());
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
content.AppendLine("Exception:");
content.AppendLine(exception.ToString());

1
src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs
View file

@ -66,7 +66,6 @@ namespace Wox.Infrastructure.Exception
sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}");
sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
sb.AppendLine($"* Everything SDK Path: {Constant.EverythingSDKPath}");
sb.AppendLine($"* CLR Version: {Environment.Version}");
sb.AppendLine($"* Installed .NET Framework: ");
foreach (var result in GetFrameworkVersionFromRegistry())

8
src/modules/launcher/Wox.Infrastructure/Wox.cs
View file

@ -7,12 +7,12 @@ namespace Wox.Infrastructure
{
public static class Constant
{
public const string Wox = "PowerLauncher";
public const string ExeFileName = "PowerLauncher";
public const string Plugins = "Plugins";
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
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 const string PortableFolderName = "UserData";
@ -26,7 +26,7 @@ namespace Wox.Infrastructure
}
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 string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.png");
public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png");
public static string EverythingSDKPath;
}
}

3
src/modules/launcher/Wox/App.xaml.cs
View file

@ -65,10 +65,9 @@ namespace Wox
var window = new MainWindow(_settings, _mainVM);
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
PluginManager.InitializePlugins(API);
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
Current.MainWindow = window;
Current.MainWindow.Title = Constant.Wox;
Current.MainWindow.Title = Constant.ExeFileName;
// happlebao todo temp fix for instance code logic
// load plugin before change language, because plugin language also needs be changed

9
src/modules/launcher/Wox/Helper/ErrorReporting.cs
View file

@ -12,6 +12,7 @@ namespace Wox.Helper
{
var logger = LogManager.GetLogger("UnHandledException");
logger.Fatal(ExceptionFormatter.FormatExcpetion(e));
var reportWindow = new ReportWindow(e);
reportWindow.Show();
}
@ -32,17 +33,11 @@ namespace Wox.Helper
public static string RuntimeInfo()
{
var info = $"\nWox version: {Constant.Version}" +
var info = $"\nVersion: {Constant.Version}" +
$"\nOS Version: {Environment.OSVersion.VersionString}" +
$"\nIntPtr Length: {IntPtr.Size}" +
$"\nx64: {Environment.Is64BitOperatingSystem}";
return info;
}
public static string DependenciesInfo()
{
var info = $"\nEverything SDK Path: {Constant.EverythingSDKPath}";
return info;
}
}
}

1
src/modules/launcher/Wox/ReportWindow.xaml.cs
View file

@ -34,7 +34,6 @@ namespace Wox
StringBuilder content = new StringBuilder();
content.AppendLine(ErrorReporting.RuntimeInfo());
content.AppendLine(ErrorReporting.DependenciesInfo());
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
content.AppendLine("Exception:");
content.AppendLine(exception.ToString());

4
src/modules/launcher/Wox/ViewModel/MainViewModel.cs
View file

@ -6,6 +6,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
using NHotkey;
using NHotkey.Wpf;
using Wox.Core.Plugin;
@ -196,6 +197,9 @@ namespace Wox.ViewModel
#region ViewModel Properties
public Brush MainWindowBackground { get; set; }
public Brush MainWindowBorderBrush { get; set; }
public ResultsViewModel Results { get; private set; }
public ResultsViewModel ContextMenu { get; private set; }
public ResultsViewModel History { get; private set; }