UI polishing, clearing windows during refresh and reconnect

rappen · Dec 19, 2017 · 3100f30 · 3100f30
1 parent efde74d
commit 3100f30
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 1 deletion.
diff --git a/Cinteros.XTB.PluginTraceViewer/Controls/ExceptionControl.cs b/Cinteros.XTB.PluginTraceViewer/Controls/ExceptionControl.cs
@@ -23,5 +23,11 @@ internal void SetException(string text, string caption)
             textException.SelectionStart = 0;
             TabText = caption;
         }
+
+        internal void Clear()
+        {
+            textException.Clear();
+            TabText = "Exception";
+        }
     }
 }
diff --git a/Cinteros.XTB.PluginTraceViewer/Controls/StatsControl.cs b/Cinteros.XTB.PluginTraceViewer/Controls/StatsControl.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Windows.Forms;
 
 namespace Cinteros.XTB.PluginTraceViewer.Controls
 {
@@ -33,6 +34,10 @@ internal void Clear()
             {
                 statistics.Clear();
             }
+            foreach (var textBox in this.AllChildren<TextBox>())
+            {
+                textBox.Clear();
+            }
         }
 
         internal void ShowStatistics(Entity entity)

diff --git a/Cinteros.XTB.PluginTraceViewer/Controls/TraceControl.cs b/Cinteros.XTB.PluginTraceViewer/Controls/TraceControl.cs
@@ -22,5 +22,10 @@ internal void SetLogText(string log)
             textMessage.Text = log;
             textMessage.SelectionStart = 0;
         }
+
+        internal void Clear()
+        {
+            textMessage.Clear();
+        }
     }
 }
diff --git a/Cinteros.XTB.PluginTraceViewer/Extensions.cs b/Cinteros.XTB.PluginTraceViewer/Extensions.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace Cinteros.XTB.PluginTraceViewer
+{
+    public static class Extensions
+    {
+        public static List<T> AllChildren<T>(this Control control) where T : Control
+        {
+            var result = new List<T>();
+            if (control is T)
+            {
+                result.Add((T)control);
+            }
+            foreach (Control child in control.Controls)
+            {
+                result.AddRange(child.AllChildren<T>());
+            }
+            return result;
+        }
+    }
+}
diff --git a/Cinteros.XTB.PluginTraceViewer/PluginTraceViewer.cs b/Cinteros.XTB.PluginTraceViewer/PluginTraceViewer.cs
@@ -186,6 +186,7 @@ private void PluginTraceViewer_ConnectionUpdated(object sender, ConnectionUpdate
             LoadFilter();
             var orgver = new Version(e.ConnectionDetail.OrganizationVersion);
             LogInfo("Connected CRM version: {0}", orgver);
+            ClearControls();
             var orgok = orgver >= new Version(7, 1);
             gridControl.SetDataSource(orgok ? e.Service : null);
             buttonRetrieveLogs.Enabled = orgok;
@@ -321,7 +322,7 @@ private void RefreshTraces(QueryExpression query)
             {
                 return;
             }
-            statsControl.Clear();
+            ClearControls();
             LogUse("RetrieveLogs");
             var asyncinfo = new WorkAsyncInfo()
             {
@@ -352,6 +353,13 @@ private void RefreshTraces(QueryExpression query)
             WorkAsync(asyncinfo);
         }
 
+        private void ClearControls()
+        {
+            traceControl.Clear();
+            exceptionControl.Clear();
+            statsControl.Clear();
+        }
+
         private void FriendlyfyCorrelationIds(EntityCollection entities)
         {
             var allCorrelationIds = new List<Guid>();