Changes in ErrorBox

Author: sergiisyrovatchenko

Common/Utils.cs

@@ -7,6 +7,13 @@ namespace SQLIndexManager {
 
   public static class Utils {
 
+    public static void ShowErrorFrom(Exception e, string message = "Error") {
+      Output.Current.Add($"{message}: {e.Source}", e.Message);
+      using (ErrorBox errorBox = new ErrorBox(e)) {
+        errorBox.ShowDialog();
+      }
+    }
+
     public static string Description(this Enum value) {
       var da = (DescriptionAttribute[])(value.GetType().GetField(value.ToString())).GetCustomAttributes(typeof(DescriptionAttribute), false);
       return da.Length > 0 ? da[0].Description : value.ToString();

Forms/AboutBox.cs

@@ -23,8 +23,7 @@ private void GitHub_HyperlinkClick(object sender, HyperlinkClickEventArgs e) {
         Process.Start(Resources.GitHubLink);
       }
       catch (Exception ex) {
-        Output.Current.Add($"Error: {ex.Source}", ex.Message);
-        XtraMessageBox.Show(ex.Message.Replace(". ", "." + Environment.NewLine), ex.Source, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        Utils.ShowErrorFrom(ex);
       }
     }
 

Forms/DatabaseBox.cs

@@ -61,20 +61,19 @@ private void ScanDatabases(object sender, DoWorkEventArgs e) {
           connection.Open();
 
           try { _disks = QueryEngine.GetDiskInfo(connection); }
-          catch (Exception ex) { Output.Current.Add("Refresh disk info failed", ex.Message); }
+          catch (Exception ex) { Utils.ShowErrorFrom(ex, "Refresh disk info failed"); }
 
           try { _databases = QueryEngine.GetDatabases(connection); }
-          catch (Exception ex) { Output.Current.Add("Refresh databases failed", ex.Message); }
+          catch (Exception ex) { Utils.ShowErrorFrom(ex, "Refresh databases failed"); }
 
           if (_databases.Count > 0 && !Settings.ServerInfo.IsAzure) {
             try { QueryEngine.RefreshDatabaseSize(connection, _databases); }
-            catch (Exception ex) { Output.Current.Add("Refresh database sizes failed", ex.Message); }
+            catch (Exception ex) { Utils.ShowErrorFrom(ex, "Refresh database sizes failed"); }
           }
 
         }
         catch (Exception ex) {
-          Output.Current.Add("Refresh failed", ex.Message);
-          XtraMessageBox.Show(ex.Message.Replace(". ", "." + Environment.NewLine), ex.Source, MessageBoxButtons.OK, MessageBoxIcon.Error);
+          Utils.ShowErrorFrom(ex, "Refresh failed");
         }
         finally {
           connection.Close();

Forms/ErrorBox.Designer.cs

@@ -10,11 +10,14 @@ public partial class ErrorBox : XtraForm {
     public ErrorBox(Exception ex) {
       InitializeComponent();
 
+      ServerInfo si = null;
+      try { si = Settings.ServerInfo; } catch { }
+
       edError.Text =
-        "Application has encountered an unexpected error" +
-        $"{Environment.NewLine}Please send error detail to {Resources.GitHubLink}" +
+        $"Application has encountered an unexpected error{Environment.NewLine}" +
+        $"Please send error detail to {Resources.GitHubLink}{Environment.NewLine}" +
+        (si == null ? "" : $"{Environment.NewLine}SQL Server: {si}") +
         $"{Environment.NewLine}Build: {AppInfo.Version}" +
-        $"{Environment.NewLine}OS: {Environment.OSVersion}" +
         $"{Environment.NewLine}{Environment.NewLine}{ex.Message}" +
         $"{Environment.NewLine}{ex.Source}" +
         $"{Environment.NewLine}{ex.StackTrace}";

Forms/ErrorBox.cs

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="defaultLookAndFeel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

Forms/ErrorBox.resx

@@ -6,7 +6,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Windows.Forms;
 using DevExpress.Data;
 using DevExpress.Utils;
@@ -130,8 +129,7 @@ private void ScanIndexes(object sender, DoWorkEventArgs e) {
               }
 
               if (!ex.Message.Contains("timeout")) {
-                Output.Current.Add($"Error: {ex.Source}", ex.Message);
-                XtraMessageBox.Show(ex.Message.Replace(". ", "." + Environment.NewLine), ex.Source, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Utils.ShowErrorFrom(ex);
                 return;
               }
 
@@ -906,7 +904,7 @@ private void ButtonLog(object sender, ItemClickEventArgs e) {
         Process.Start(AppInfo.LogFileName);
       }
       catch (Exception ex) {
-        XtraMessageBox.Show(ex.Message.Replace(". ", "." + Environment.NewLine), ex.Source, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        Utils.ShowErrorFrom(ex);
       }
     }
 

Forms/MainBox.cs

@@ -48,9 +48,7 @@ static void Main(string[] args) {
     }
 
     private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) {
-      using (ErrorBox errorBox = new ErrorBox(e.Exception)) {
-        errorBox.ShowDialog();
-      }
+      Utils.ShowErrorFrom(e.Exception);
     }
 
     private static void AttachConsole() {

Program.cs

@@ -7,5 +7,5 @@
 [assembly: AssemblyCopyright("Sergii Syrovatchenko")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.0.0.67")]
-[assembly: AssemblyFileVersion("1.0.0.67")]
+[assembly: AssemblyVersion("1.0.0.68")]
+[assembly: AssemblyFileVersion("1.0.0.68")]