Merge branch 'dev'

winbench · Jul 6, 2018 · a38e4df · a38e4df
2 parents 76428c2 + 4397324
commit a38e4df
Show file tree

Hide file tree

Showing 11 changed files with 284 additions and 238 deletions.
diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.20.2.0")]
-[assembly: AssemblyFileVersion("0.20.2.0")]
+[assembly: AssemblyVersion("0.20.3.0")]
+[assembly: AssemblyFileVersion("0.20.3.0")]
diff --git a/BenchManager/BenchDashboard/AppList.cs b/BenchManager/BenchDashboard/AppList.cs
@@ -115,24 +115,20 @@ private void InitializeAppList()
             AsyncManager.StartTask(() =>
             {
                 appLookup.Clear();
-                var list = new List<AppWrapper>();
                 var cnt = 0;
                 foreach (var app in core.Config.Apps)
                 {
                     cnt++;
                     app.LoadCachedValues();
                     var wrapper = new AppWrapper(app, cnt);
-                    list.Add(wrapper);
                     appLookup[app.ID] = wrapper;
                 }
 
-                var bindingList = new SortedBindingList<AppWrapper>(list);
-
                 BeginInvoke((ThreadStart)(() =>
                 {
                     var selectedRow = gridApps.SelectedRows.Count > 0 ? gridApps.SelectedRows[0].Index : -10;
                     gridApps.SuspendLayout();
-                    gridApps.DataSource = bindingList;
+                    UpdateAppGridView();
                     if (sortedColumn != null)
                     {
                         gridApps.Sort(sortedColumn, sortDirection);
@@ -387,10 +383,12 @@ private void gridApps_CellDoubleClick(object sender, DataGridViewCellEventArgs e
 
         #region Search
 
-        private void txtSearch_TextChanged(object sender, EventArgs e)
+        public bool HasSearchFilter => !string.IsNullOrWhiteSpace(txtSearch.Text);
+
+        private void UpdateAppGridView()
         {
             var apps = appLookup.Values;
-            if (!string.IsNullOrWhiteSpace(txtSearch.Text))
+            if (HasSearchFilter)
             {
                 var searchWords = AppSearch.TokenizeSearchString(txtSearch.Text).Select(AppSearch.NormalizeForSearch).ToArray();
                 var sortedList = new SortedBindingList<AppWrapper>(apps
@@ -405,11 +403,21 @@ private void txtSearch_TextChanged(object sender, EventArgs e)
             }
         }
 
-        private void btnClearSearch_Click(object sender, EventArgs e)
+        public void ResetSearchFilter()
         {
             txtSearch.Text = string.Empty;
         }
 
+        private void txtSearch_TextChanged(object sender, EventArgs e)
+        {
+            UpdateAppGridView();
+        }
+
+        private void btnClearSearch_Click(object sender, EventArgs e)
+        {
+            ResetSearchFilter();
+        }
+
         #endregion
     }
 

diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.20.2.0")]
-[assembly: AssemblyFileVersion("0.20.2.0")]
+[assembly: AssemblyVersion("0.20.3.0")]
+[assembly: AssemblyFileVersion("0.20.3.0")]
diff --git a/BenchManager/BenchDashboard/SetupForm.Designer.cs b/BenchManager/BenchDashboard/SetupForm.Designer.cs
diff --git a/BenchManager/BenchDashboard/SetupForm.cs b/BenchManager/BenchDashboard/SetupForm.cs
@@ -45,6 +45,7 @@ private void SetupForm_Load(object sender, EventArgs e)
             InitializeAppListColumnsMenu();
             InitializeAppList();
             UpdatePendingCounts();
+            CoreBusyChangedHandler(core, EventArgs.Empty);
 
             if (core.SetupOnStartup)
             {
@@ -208,6 +209,7 @@ private void CoreBusyChangedHandler(object sender, EventArgs e)
             {
                 tsmi.Enabled = !busy;
             }
+            tsmiShowLastLogfile.Enabled = !busy && core.LastActionResult?.LogFile != null;
             btnAuto.Image = !busy
                             ? Resources.do_32
                             : Resources.stop_32;
@@ -651,11 +653,19 @@ private async void KeyDownDownHandler(object sender, KeyEventArgs e)
                 {
                     var cancelation = core.Cancelation;
                     if (cancelation != null) cancelation.Cancel();
+                    return;
                 }
-                else
+                if (BusyPanelVisible)
+                {
+                    BusyPanelVisible = false;
+                    return;
+                }
+                if (appList.HasSearchFilter)
                 {
-                    Close();
+                    appList.ResetSearchFilter();
+                    return;
                 }
+                Close();
             }
             else if (e.KeyCode == Keys.F && e.Modifiers == Keys.Control)
                 appList.FocusSearchBox();
@@ -702,7 +712,7 @@ private void CloseHandler(object sender, EventArgs e)
 
         private void ShowLastLogHandler(object sender, EventArgs e)
         {
-            var logFile = core?.LastActionResult?.LogFile;
+            var logFile = core.LastActionResult?.LogFile;
             if (string.IsNullOrWhiteSpace(logFile)) return;
             if (File.Exists(logFile))
             {

diff --git a/BenchManager/BenchDashboard/SetupForm.resx b/BenchManager/BenchDashboard/SetupForm.resx
@@ -117,12 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>266, 17</value>
-  </metadata>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="toolStripSeparator4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
@@ -135,6 +129,12 @@
   <metadata name="toolStripSeparator1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>266, 17</value>
+  </metadata>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>62</value>
   </metadata>

diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.20.2.0")]
-[assembly: AssemblyFileVersion("0.20.2.0")]
+[assembly: AssemblyVersion("0.20.3.0")]
+[assembly: AssemblyFileVersion("0.20.3.0")]