Hide pending items

StefanKert · Apr 6, 2019 · 51c606f · 51c606f
1 parent 9e7f92d
commit 51c606f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj
@@ -73,6 +73,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Attributes\DisplayStringAttribute.cs" />
     <Compile Include="Components\ProjectGrid.xaml.cs">
       <DependentUpon>ProjectGrid.xaml</DependentUpon>
     </Compile>
@@ -129,7 +130,6 @@
     <Compile Include="Extensions\TextBlockUtils.cs" />
     <Compile Include="Extensions\VectorResources.cs" />
     <Compile Include="Extensions\VisualHelper.cs" />
-    <Compile Include="Attributes\DisplayStringAttribute.cs" />
     <Compile Include="Helpers\EnumExtensions.cs" />
     <Compile Include="Helpers\StyleConverting.cs" />
     <Compile Include="MainWindow.xaml.cs">

diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml b/src/BuildVision.UI/Components/ProjectGrid.xaml
@@ -195,6 +195,15 @@
                         <Setter Property="Visibility" Value="Collapsed"/>
                     </MultiDataTrigger>
 
+
+                    <MultiDataTrigger>
+                        <MultiDataTrigger.Conditions>
+                            <Condition Value="{x:Static contracts:ProjectState.Pending}" Binding="{Binding Path=State}"/>
+                            <Condition Binding="{Binding Path=DataContext.FillProjectListOnBuildBegin, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="False"/>
+                        </MultiDataTrigger.Conditions>
+                        <Setter Property="Visibility" Value="Collapsed"/>
+                    </MultiDataTrigger>
+
                     <DataTrigger Value="True">
                         <DataTrigger.Binding>
                             <MultiBinding Converter="{StaticResource ObjectsReferencesEqualsConverter}">

diff --git a/src/BuildVision.UI/DataGrid/ColumnsManager.cs b/src/BuildVision.UI/DataGrid/ColumnsManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -9,25 +9,25 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using BuildVision.Contracts;
-using BuildVision.UI.Modelss;
-using BuildVision.UI.Helpers;
-using BuildVision.UI.Extensions;
 using BuildVision.UI.Common.Logging;
+using BuildVision.UI.Extensions;
+using BuildVision.UI.Helpers;
 using BuildVision.UI.Models;
+using BuildVision.UI.Modelss;
+using BuildVision.UI.Settings.Models;
 using BuildVision.UI.Settings.Models.Columns;
 using BuildVision.UI.Settings.Models.Sorting;
-using BuildVision.UI.Settings.Models;
 
 namespace BuildVision.UI.DataGrid
 {
     public static class ColumnsManager
     {
-        private static List<string> _nonSortableColumns = new List<string>
+        private static readonly List<string> _nonSortableColumns = new List<string>
         {
             nameof(ProjectItem.StateBitmap)
         };
 
-        private static List<string> _nonGroupableColumns = new List<string>
+        private static readonly List<string> _nonGroupableColumns = new List<string>
         {
             nameof(ProjectItem.StateBitmap),
             nameof(ProjectItem.BuildStartTime),
@@ -112,11 +112,11 @@ public static void GenerateColumns(ObservableCollection<DataGridColumn> columns,
                     else
                     {
                         columnSettings = new GridColumnSettings(
-                            propertyName, 
-                            columnConfiguration.Header, 
-                            columnConfiguration.Visible, 
-                            columnConfiguration.DisplayIndex, 
-                            columnConfiguration.Width, 
+                            propertyName,
+                            columnConfiguration.Header,
+                            columnConfiguration.Visible,
+                            columnConfiguration.DisplayIndex,
+                            columnConfiguration.Width,
                             columnConfiguration.ValueStringFormat);
                         gridSettings.Columns.Add(columnSettings);
                     }
@@ -149,7 +149,7 @@ public static void SyncColumnSettings(ObservableCollection<DataGridColumn> colum
                 foreach (DataGridBoundColumn column in columns.OfType<DataGridBoundColumn>())
                 {
                     string propertyName = column.GetBindedProperty();
-                    GridColumnSettings columnSettings = gridSettings.Columns[propertyName];
+                    var columnSettings = gridSettings.Columns[propertyName];
                     if (columnSettings == null)
                         continue;
 
@@ -283,4 +283,4 @@ private static void InitColumn(DataGridBoundColumn column, GridColumnAttribute c
             column.SetValue(DataGridColumnExtensions.NameProperty, columnName);
         }
     }
-}
+}
diff --git a/src/BuildVision.UI/Enums/BuildMajorMessageFormat.cs b/src/BuildVision.UI/Enums/BuildMajorMessageFormat.cs
@@ -1,4 +1,4 @@
-using BuildVision.UI.Helpers;
+using BuildVision.UI.Helpers;
 
 namespace BuildVision.UI.Models
 {