From 4514a1a9670751f3c1d6d2113eb8f42e91991e80 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Mon, 6 Oct 2025 16:26:41 +0200 Subject: [PATCH] - eliminato x:name da EgtDataGrid - aggiunto style in Dictionary per DataGridColumnHeader - modificato in tutti gli usi di EgtDataGrid --- .../OnlyProdBeamMachiningsWindowV.xaml | 7 +- EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml | 14 -- .../EgtDataGrid/EgtDataGrid.xaml.vb | 195 +++++++----------- .../NewOpenProjectFileDialogV.xaml | 4 +- .../OnlyProdNewOpenProjectFileDialogV.xaml | 7 +- .../OnlyProdOpenProjectFileDialogV.xaml | 7 +- .../OpenProjectFileDialogV.xaml | 1 - .../AddSectionXMaterialWndV.xaml | 1 - .../ItemParamList/OnlyProdBTLPartListV.xaml | 14 +- .../OnlyProdBTLPartListV.xaml.vb | 2 +- .../OnlyProdFeatureInPartInRawPartListV.xaml | 7 +- .../ItemParamList/OnlyProdFeatureListV.xaml | 7 +- .../OnlyProdPParameterListV.xaml | 7 +- .../OnlyProdPartInRawPartListV.xaml | 7 +- .../OnlyProdQParameterListProdV.xaml | 6 - .../OnlyProdQParameterListV.xaml | 6 - .../ItemParamList/OnlyProdRawPartListV.xaml | 16 +- .../OnlyProdOptimizerStatisticsV.xaml | 14 +- .../Statistics/OnlyProdStatisticsV.xaml | 19 +- .../UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml | 7 +- .../UpdateBTLWnd/UpdateBTLWndV.xaml | 1 - EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml | 51 +++++ .../WarehouseWnd/OnlyProdWarehouseWndV.xaml | 7 +- .../FeatureInPartInRawPartListV.xaml | 1 - .../OnlyProdFeatureInPartInRawPartListV.xaml | 7 +- .../OnlyProdPartInRawPartListV.xaml | 7 +- .../ItemParamList/OnlyProdRawPartListV.xaml | 7 +- .../ItemParamList/PartInRawPartListV.xaml | 1 - .../ItemParamList/RawPartListV.xaml | 1 - EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml | 1 - .../MDIPage/OnlyProdMDIPageV.xaml | 7 +- .../MachineLogPage/MachineLogPageV.xaml | 1 - .../OnlyProdMachineLogPageV.xaml | 7 +- .../Utility/Dictionary.xaml | 45 ++++ 34 files changed, 206 insertions(+), 286 deletions(-) diff --git a/EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml b/EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml index c85cd5df..3198d239 100644 --- a/EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml +++ b/EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml @@ -39,12 +39,7 @@ BindingColumns="{Binding BeamMachiningsColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml index c962587b..cfb015d9 100644 --- a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml +++ b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml @@ -1,20 +1,6 @@  - - - diff --git a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb index 255ab3ca..549f52df 100644 --- a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb +++ b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb @@ -6,6 +6,7 @@ Imports System.Windows.Controls Imports System.Windows.Controls.Primitives Imports System.Windows.Data Imports System.Windows.Media +Imports System.Windows.Threading Imports EgtUILib Imports EgtWPFLib5 @@ -25,6 +26,7 @@ Public Class EgtDataGrid Sub New() InitializeComponent() + AddHandler Columns.CollectionChanged, AddressOf Columns_CollectionChanged End Sub Public Shadows Property BindingColumns As ObservableCollection(Of EgtDataGridColumn) @@ -70,6 +72,78 @@ Public Class EgtDataGrid End If End Sub + Private Sub Columns_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs) + If e.Action = NotifyCollectionChangedAction.Add Then + For Each newColumn As DataGridColumn In e.NewItems + Dispatcher.BeginInvoke(New Action(Sub() + HookHeaderForColumn(newColumn) + End Sub), DispatcherPriority.Loaded) + Next + ElseIf e.Action = NotifyCollectionChangedAction.Remove Then + For Each removedColumn As DataGridColumn In e.OldItems + Dispatcher.BeginInvoke(New Action(Sub() + UnhookHeaderForColumn(removedColumn) + End Sub), DispatcherPriority.Loaded) + Next + End If + End Sub + + Private Sub HookHeaderForColumn(ByVal column As DataGridColumn) + Dim headersPresenter = FindVisualChild(Of DataGridColumnHeadersPresenter)(Me) + If headersPresenter Is Nothing Then Return + + For Each header In FindVisualChildren(Of DataGridColumnHeader)(headersPresenter) + + If header.Column Is column Then + AddHandler header.SizeChanged, AddressOf ColumnHeader_SizeChanged + AddHandler header.MouseRightButtonDown, AddressOf ColumnHeader_MouseRightButtonDown + Exit For + End If + Next + End Sub + + Private Sub UnhookHeaderForColumn(ByVal column As DataGridColumn) + Dim headersPresenter = FindVisualChild(Of DataGridColumnHeadersPresenter)(Me) + If headersPresenter Is Nothing Then Return + + For Each header In FindVisualChildren(Of DataGridColumnHeader)(headersPresenter) + + If header.Column Is column Then + RemoveHandler header.SizeChanged, AddressOf ColumnHeader_SizeChanged + RemoveHandler header.MouseRightButtonDown, AddressOf ColumnHeader_MouseRightButtonDown + Exit For + End If + Next + End Sub + + Private Function FindVisualChild(Of T As DependencyObject)(ByVal parent As DependencyObject) As T + Dim tChild As T = Nothing + + For i As Integer = 0 To VisualTreeHelper.GetChildrenCount(parent) - 1 + Dim child = VisualTreeHelper.GetChild(parent, i) + tChild = TryCast(child, T) + If tChild IsNot Nothing Then Return tChild + Dim result = FindVisualChild(Of T)(child) + If result IsNot Nothing Then Return result + Next + + Return Nothing + End Function + + Private Iterator Function FindVisualChildren(Of T As DependencyObject)(ByVal parent As DependencyObject) As IEnumerable(Of T) + Dim tChild As T = Nothing + + For i As Integer = 0 To VisualTreeHelper.GetChildrenCount(parent) - 1 + Dim child = VisualTreeHelper.GetChild(parent, i) + tChild = TryCast(child, T) + If tChild IsNot Nothing Then Yield tChild + + For Each descendant In FindVisualChildren(Of T)(child) + Yield descendant + Next + Next + End Function + Private Sub collectionChanged(ByVal sender As Object, ByVal e As NotifyCollectionChangedEventArgs) Select Case e.Action Case NotifyCollectionChangedAction.Add @@ -122,7 +196,7 @@ Public Class EgtDataGrid End Select End Sub - Private Sub Cell_SizedChanged(sender As Object, e As SizeChangedEventArgs) + Private Sub ColumnHeader_SizeChanged(sender As Object, e As SizeChangedEventArgs) ' ad ogni ridimensionamento della cella del ColumnHeader salvo le nuove dimensioni nell'ini If Not IsNothing(e.OriginalSource.Column) AndAlso Not IsNothing(BindingColumns(e.OriginalSource.Column.DisplayIndex)) Then ' se la colonna corrente è Star ed è preceduta da una colonna Pixel non scrivo le modifiche @@ -138,11 +212,11 @@ Public Class EgtDataGrid If BindingColumns.Count > 0 Then If Me.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then ' nascondo la ScrollBar orizzontale e setto lo UnitType dell'ultima colonna visibile a Star - ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Hidden) + ScrollViewer.SetHorizontalScrollBarVisibility(Me, ScrollBarVisibility.Hidden) BindingColumns.Last(Function(x) x.Visible = True).Width = New DataGridLength(1, DataGridLengthUnitType.Star) Else ' mostro la ScrollBar orizzontale e se UnitType delle colonne è Star lo setto a Pixel - ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Visible) + ScrollViewer.SetHorizontalScrollBarVisibility(Me, ScrollBarVisibility.Visible) For Each bc In BindingColumns If bc.Width.IsStar Then bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel) @@ -170,7 +244,7 @@ Public Class EgtDataGrid End If End Sub - Private Sub Cell_MouseRightButtonDown(sender As Object, e As RoutedEventArgs) + Private Sub ColumnHeader_MouseRightButtonDown(sender As Object, e As RoutedEventArgs) Dim nDispIndex As Integer = sender.DisplayIndex ' creo il ContextMenu con gli item checkabili Dim cm As ContextMenu = New ContextMenu() @@ -366,119 +440,6 @@ Public Class EgtDataGrid End If End Sub -#Region "COLUMN HEADER PROPERTY DATAGRID" - -#Region "BACKGROUND HEADER" - - Public Shared ReadOnly ColumnHeaderBackgroundProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderBackground", - GetType(Brush), - GetType(EgtDataGrid), - New FrameworkPropertyMetadata(SystemColors.ControlBrush)) - - Public Property ColumnHeaderBackground As Brush - Get - Return DirectCast(GetValue(ColumnHeaderBackgroundProperty), Brush) - End Get - Set(value As Brush) - SetValue(ColumnHeaderBackgroundProperty, value) - End Set - End Property - -#End Region ' BackGround Heder - -#Region "FOREGROUND HEADER" - - Public Shared ReadOnly ColumnHeaderForegroundProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderForeground", - GetType(Brush), - GetType(EgtDataGrid), - New FrameworkPropertyMetadata(SystemColors.ControlTextBrush)) - - Public Property ColumnHeaderForeground As Brush - Get - Return DirectCast(GetValue(ColumnHeaderForegroundProperty), Brush) - End Get - Set(value As Brush) - SetValue(ColumnHeaderForegroundProperty, value) - End Set - End Property - -#End Region ' Foreground Header - -#Region "FONTWEIGHT HEADER" - - Public Shared ReadOnly ColumnHeaderFontWeightProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderFontWeight", - GetType(FontWeight), - GetType(EgtDataGrid), - New FrameworkPropertyMetadata(FontWeights.Normal)) - - Public Property ColumnHeaderFontWeight As FontWeight - Get - Return DirectCast(GetValue(ColumnHeaderFontWeightProperty), FontWeight) - End Get - Set(value As FontWeight) - SetValue(ColumnHeaderFontWeightProperty, value) - End Set - End Property - -#End Region ' FontWeight Header - -#Region "FONTSIZE HEADER" - - Public Shared ReadOnly ColumnHeaderFontSizeProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderFontSize", - GetType(Double), - GetType(EgtDataGrid), - New FrameworkPropertyMetadata(Convert.ToDouble(12))) - - Public Property ColumnHeaderFontSize As Double - Get - Return DirectCast(GetValue(ColumnHeaderFontSizeProperty), Double) - End Get - Set(value As Double) - SetValue(ColumnHeaderFontSizeProperty, value) - End Set - End Property - -#End Region ' FontSize Header - -#Region "HORIZONTAKCONTENTALIGNMENT HEADER" - - Public Shared ReadOnly ColumnHeaderHorizontalContentAlignmentProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderHorizontalContentAlignment", - GetType(HorizontalAlignment), - GetType(EgtDataGrid), - New FrameworkPropertyMetadata(HorizontalAlignment.Stretch)) - - Public Property ColumnHeaderHorizontalContentAlignment As HorizontalAlignment - Get - Return DirectCast(GetValue(ColumnHeaderHorizontalContentAlignmentProperty), HorizontalAlignment) - End Get - Set(value As HorizontalAlignment) - SetValue(ColumnHeaderHorizontalContentAlignmentProperty, value) - End Set - End Property - -#End Region ' HorizontalContentAlignment Header - -#Region "PADDING HEADER" - - Public Shared ReadOnly ColumnHeaderPaddingProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderPadding", - GetType(Thickness), - GetType(EgtDataGrid), - New FrameworkPropertyMetadata(New Thickness(0))) - - Public Property ColumnHeaderPadding As Thickness - Get - Return DirectCast(GetValue(ColumnHeaderPaddingProperty), Thickness) - End Get - Set(value As Thickness) - SetValue(ColumnHeaderPaddingProperty, value) - End Set - End Property - -#End Region ' Padding Header - - -#End Region ' Column Header Property DataGrid - End Class Public Class EgtDataGridColumn diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml index cb2b2b70..d840a3b4 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml @@ -90,8 +90,7 @@ - diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml index fd33a392..9907f9dd 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml @@ -106,12 +106,7 @@ CellEditEnding="MainDataGrid_CellEditEnding" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" Style="{StaticResource DataGrid_OnlyProd}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml index 74fffb81..efce95fc 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml @@ -102,12 +102,7 @@ BindingColumns="{Binding ProjectColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" Style="{StaticResource DataGrid_OnlyProd}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml index 2d20d69e..3dec78b6 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml @@ -94,7 +94,6 @@ ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" - ColumnHeaderBackground="{x:Null}" Margin="5" BindingColumns="{Binding ProjectColumns}"> diff --git a/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml b/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml index a0bef1ac..e126a9b4 100644 --- a/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml +++ b/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml @@ -25,7 +25,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding SectXMatColumns}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml index f78c1af0..39f254ce 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml @@ -11,8 +11,7 @@ 0.6 - - @@ -357,7 +350,7 @@ - + diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb index eff847c1..f7f328a4 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb @@ -22,7 +22,7 @@ Public Class OnlyProdBTLPartListV Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs) ' Evita il drag sulla selezione multipla If e.LeftButton = MouseButtonState.Pressed Then - If CBool(If(m_isDraggingSelectionField?.GetValue(BTLPart_DataGrid), False)) Then m_endDraggingMethod.Invoke(BTLPart_DataGrid, New Object(-1) {}) + If CBool(If(m_isDraggingSelectionField?.GetValue(sender), False)) Then m_endDraggingMethod.Invoke(sender, New Object(-1) {}) End If End Sub diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml index d5eb8430..6f39b421 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml @@ -14,12 +14,7 @@ BeginningEdit="FeatureInPartInRawPartList_BeginningEdit" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureListV.xaml index 7a6611f0..5615c2eb 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdFeatureListV.xaml @@ -17,12 +17,7 @@ BindingColumns="{Binding FeatureColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Keppel}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Feature_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPParameterListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPParameterListV.xaml index 9e672ffb..0c10e039 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPParameterListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPParameterListV.xaml @@ -22,12 +22,7 @@ BindingColumns="{Binding PParameterListColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Downy}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml index 1d8e8d7b..43441117 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml @@ -16,12 +16,7 @@ BeginningEdit="PartInRawPartList_BeginningEdit" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Jaffa}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource PartInRawPart_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListProdV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListProdV.xaml index f964f5fc..d10746dc 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListProdV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListProdV.xaml @@ -14,12 +14,6 @@ BindingColumns="{Binding QParameterListColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_TexasRose}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListV.xaml index 610352b2..f2436622 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdQParameterListV.xaml @@ -14,12 +14,6 @@ BindingColumns="{Binding QParameterListColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Downy}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml index c72810d3..e2102498 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml @@ -4,8 +4,7 @@ xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"> - @@ -295,11 +289,7 @@ Margin="15,0,0,5" BeginningEdit="PartInRawPartList_BeginningEdit" BindingColumns="{Binding DataContext.PartInRawPartColumns, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}" - ColumnHeaderBackground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="SemiBold" - ColumnHeaderFontSize="13" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource RawPart_DataGridColumnHeader}" FontSize="11" GridLinesVisibility="None" BorderThickness="0" diff --git a/EgtBEAMWALL.Optimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml index 3c3c9ffa..7a20cc60 100644 --- a/EgtBEAMWALL.Optimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml +++ b/EgtBEAMWALL.Optimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml @@ -31,12 +31,7 @@ BindingColumns="{Binding OptimizerStatisticsColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" RowStyle="{StaticResource RowDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> @@ -129,12 +124,7 @@ BindingColumns="{Binding RawPartStatisticsColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" RowStyle="{StaticResource RowDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Optimizer/Statistics/OnlyProdStatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/OnlyProdStatisticsV.xaml index aa4b0394..e3304131 100644 --- a/EgtBEAMWALL.Optimizer/Statistics/OnlyProdStatisticsV.xaml +++ b/EgtBEAMWALL.Optimizer/Statistics/OnlyProdStatisticsV.xaml @@ -22,12 +22,7 @@ BindingColumns="{Binding StatisticsColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" RowStyle="{StaticResource RowDataGrid_CustomHighLight}" Style="{StaticResource DataGrid_OnlyProd}"> @@ -187,12 +182,12 @@ Margin="0,10,10,10"> - + diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml index 85dc77fc..1d8c8f1c 100644 --- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml +++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml @@ -34,12 +34,7 @@ SelectedItem="{Binding SelBTLPart}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CanUserAddRows="False" AutoGenerateColumns="False" CanUserResizeRows="False" diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml index 20d36738..ee97d0a0 100644 --- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml +++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml @@ -31,7 +31,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding UpdateBTLColumns}"> diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml index 62c2abdb..11ef7ee2 100644 --- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml @@ -1293,6 +1293,51 @@ + + + + + + + + + + + + diff --git a/EgtBEAMWALL.Optimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml b/EgtBEAMWALL.Optimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml index d763edb8..73ebacd9 100644 --- a/EgtBEAMWALL.Optimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml +++ b/EgtBEAMWALL.Optimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml @@ -217,12 +217,7 @@ SelectionMode="Single" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource Omag_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" BindingColumns="{Binding SParamColumns}" Style="{StaticResource DataGrid_OnlyProd}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml index 9f5417c9..879b36c8 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml @@ -18,7 +18,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding FeatureInPartInRawPartColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml index 06f28f05..71ce8820 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml @@ -21,12 +21,7 @@ Margin="0,0,0,5" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_NeonCarrot}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Feature_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml index 814ddc0e..c5a62991 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml @@ -20,12 +20,7 @@ BindingColumns="{Binding PartInRawPartColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Jaffa}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource PartInRawPart_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml index 0947548e..870cb720 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml @@ -22,12 +22,7 @@ Margin="0,0,0,5" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Christine}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource RawPart_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}" Style="{StaticResource DataGrid_OnlyProd}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml index 045475d4..1314e076 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml @@ -17,7 +17,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding PartInRawPartColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml index 21a8c4ea..65f9ef96 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml @@ -18,7 +18,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding RawPartColumns}" Sorting="MachGroupVMList_Sorting" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml index dd5430f6..f5944bd1 100644 --- a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml @@ -19,7 +19,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding MDICommandColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/MDIPage/OnlyProdMDIPageV.xaml b/EgtBEAMWALL.Supervisor/MDIPage/OnlyProdMDIPageV.xaml index 02cf5baf..df38c488 100644 --- a/EgtBEAMWALL.Supervisor/MDIPage/OnlyProdMDIPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MDIPage/OnlyProdMDIPageV.xaml @@ -23,12 +23,7 @@ BindingColumns="{Binding MDICommandColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" Style="{StaticResource DataGrid_OnlyProd}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" RowStyle="{StaticResource RowDataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml index 054e4c00..4abe25d4 100644 --- a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml @@ -72,7 +72,6 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" - ColumnHeaderBackground="{x:Null}" BindingColumns="{Binding MachineLogColumns}"> diff --git a/EgtBEAMWALL.Supervisor/MachineLogPage/OnlyProdMachineLogPageV.xaml b/EgtBEAMWALL.Supervisor/MachineLogPage/OnlyProdMachineLogPageV.xaml index 4199dfdc..f5f1187c 100644 --- a/EgtBEAMWALL.Supervisor/MachineLogPage/OnlyProdMachineLogPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MachineLogPage/OnlyProdMachineLogPageV.xaml @@ -77,12 +77,7 @@ BindingColumns="{Binding MachineLogColumns}" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" AlternationCount="2" - ColumnHeaderBackground="{StaticResource BeamWall_Teal}" - ColumnHeaderForeground="{StaticResource BeamWall_White}" - ColumnHeaderHorizontalContentAlignment="Center" - ColumnHeaderFontWeight="Bold" - ColumnHeaderFontSize="15" - ColumnHeaderPadding="0,2,0,2" + ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" Style="{StaticResource DataGrid_OnlyProd}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" RowStyle="{StaticResource RowDataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml index d771766a..44e5c6d3 100644 --- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml @@ -1666,6 +1666,51 @@ + + + + + + + + + +