From 17951d7fe0a4e97b52a3031db190a9a6b94a21e4 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 17 Dec 2014 19:10:28 +0800 Subject: [PATCH] Add crashreproter --- .../ThirdpartyPluginIndicator.cs | 2 +- Wox.sln | 2 +- Wox/Helper/ErrorReporting/ErrorReporting.cs | 20 ++++++++++++++++++- Wox/MainWindow.xaml.cs | 7 +++---- Wox/Wox.csproj | 3 +++ Wox/packages.config | 1 + 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs b/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs index 686ff74dd0..31e3ab0acf 100644 --- a/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs +++ b/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs @@ -80,7 +80,7 @@ namespace Wox.Plugin.SystemPlugins public override string IcoPath { - get { return @"Images\list.png"; } + get { return @"Images\work.png"; } } public override string Description diff --git a/Wox.sln b/Wox.sln index 120076914c..a8b3e304fe 100644 --- a/Wox.sln +++ b/Wox.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}" EndProject diff --git a/Wox/Helper/ErrorReporting/ErrorReporting.cs b/Wox/Helper/ErrorReporting/ErrorReporting.cs index 06e0eae107..11a42ac7e1 100644 --- a/Wox/Helper/ErrorReporting/ErrorReporting.cs +++ b/Wox/Helper/ErrorReporting/ErrorReporting.cs @@ -9,15 +9,28 @@ using System.Windows.Threading; using System.Xml; using Microsoft.Win32; using Wox.Infrastructure.Logger; +using CrashReporterDotNET; namespace Wox.Helper.ErrorReporting { public static class ErrorReporting { + private static void ReportCrash(Exception exception) + { + var reportCrash = new ReportCrash + { + ToEmail = "qianlf2008@163.com" + }; + + reportCrash.Send(exception); + } + public static void UnhandledExceptionHandle(object sender, System.UnhandledExceptionEventArgs e) { if (System.Diagnostics.Debugger.IsAttached) return; + ReportCrash((Exception)e.ExceptionObject); + return; string error = CreateExceptionReport("System.AppDomain.UnhandledException", e.ExceptionObject); //e.IsTerminating is always true in most times, so try to avoid use this property @@ -30,6 +43,9 @@ namespace Wox.Helper.ErrorReporting { if (Debugger.IsAttached) return; + ReportCrash(e.Exception); + return; + e.Handled = true; string error = CreateExceptionReport("System.Windows.Application.DispatcherUnhandledException", e.Exception); @@ -39,7 +55,8 @@ namespace Wox.Helper.ErrorReporting public static void ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) { if (Debugger.IsAttached) return; - + ReportCrash(e.Exception); + return; string error = CreateExceptionReport("System.Windows.Forms.Application.ThreadException", e.Exception); Log.Fatal(error); @@ -271,6 +288,7 @@ namespace Wox.Helper.ErrorReporting var dialog = new WPFErrorReportingDialog(error, title, exceptionObject); dialog.ShowDialog(); } + private static void ShowWPFMessageBox(string error, string title) { System.Windows.MessageBox.Show(error, title, MessageBoxButton.OK, MessageBoxImage.Error, diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index cfc220ff9b..2a2b6eea1a 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -222,13 +222,12 @@ namespace Wox private void MainWindow_OnLoaded(object sender, RoutedEventArgs e) { - if (UserSettingStorage.Instance.WindowLeft == 0 - && UserSettingStorage.Instance.WindowTop == 0) + if (UserSettingStorage.Instance.WindowLeft == 0 && UserSettingStorage.Instance.WindowTop == 0) { Left = UserSettingStorage.Instance.WindowLeft = (SystemParameters.PrimaryScreenWidth - ActualWidth) / 2; Top = UserSettingStorage.Instance.WindowTop - = (SystemParameters.PrimaryScreenHeight - ActualHeight) / 5; + = (SystemParameters.PrimaryScreenHeight - ActualHeight) / 6; } else { @@ -548,7 +547,7 @@ namespace Wox break; case Key.F1: - Process.Start("https://github.com/qianlifeng/Wox/wiki/Wox-Function-Guide"); + Process.Start("http://doc.getwox.com"); break; case Key.Enter: diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 0d571690fc..a35be3687f 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -60,6 +60,9 @@ + + ..\packages\CrashReporterdotNet.1.5\lib\net20\CrashReporter.NET.dll + False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll diff --git a/Wox/packages.config b/Wox/packages.config index 35531b8872..68440ecb8e 100644 --- a/Wox/packages.config +++ b/Wox/packages.config @@ -1,5 +1,6 @@  +