Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-ripristinata datagridclassica

Browse Source
This commit is contained in:
Demetrio Cassarino
2025-03-27 14:51:06 +01:00
parent 966b8ea26d
commit 1874f0aa4b
29 changed files with 165 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+2 -1
View File
@@ -104,6 +104,7 @@
Margin="5"
RowDetailsVisibilityMode="Visible"
CellEditEnding="MainDataGrid_CellEditEnding"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding ProdColumns}">
<DataGrid.Resources>
<!-- ProdId -->
@@ -126,7 +127,7 @@
<ToggleButton Grid.Column="1"
Margin="5,0,0,0"
IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
Style="{StaticResource ToolBar_SmallToggleButton}">
Style="{StaticResource OldToolBar_SmallToggleButton}">
<Image Source="\Resources\CalcPanel\Edit.png"
Style="{StaticResource LockImage}"/>
</ToggleButton>
EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
+1
View File
@@ -94,6 +94,7 @@
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ColumnHeaderBackground="{x:Null}"
Margin="5"
BindingColumns="{Binding ProjectColumns}">
<DataGrid.Resources>
EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml
+1 -4
View File
@@ -18,10 +18,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding FeatureInPartInRawPartColumns}"
Style="{StaticResource DataGrid_CustomHighLight}">
<DataGrid.Resources>
EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml
+1 -4
View File
@@ -17,10 +17,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding PartInRawPartColumns}"
Style="{StaticResource DataGrid_CustomHighLight}">
<DataGrid.Resources>
EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
+1 -4
View File
@@ -18,10 +18,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding RawPartColumns}"
Sorting="MachGroupVMList_Sorting"
Style="{StaticResource DataGrid_CustomHighLight}">
EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
+1 -1
View File
@@ -47,7 +47,7 @@
Visibility="{Binding E80002_Visibility}"/>
</UniformGrid>
<Expander Grid.Row="4"
Header="Axis">
Header="Axis" Style="{x:Null}">
<EgtBEAMWALL:AxesPanelV DataContext="{StaticResource AxesPanelVM}"/>
</Expander>
EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml
+8 -8
View File
@@ -70,36 +70,36 @@
Margin="0,3,5,2">
<Button Command="{Binding MoveUpRawPart_Command}"
IsEnabled="{Binding MoveRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/MoveUp.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MoveDownRawPart_Command}"
IsEnabled="{Binding MoveRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/MoveDown.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ProduceAll_ToolTip}"
Command="{Binding ProduceAll_Command}"
IsEnabled="{Binding LeftPanel_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/ProduceAll.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding DoneRawPart_ToolTip}"
Command="{Binding DoneRawPart_Command}"
IsEnabled="{Binding DoneRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/DoneRawPart.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ResetRawPart_ToolTip}"
Command="{Binding ResetRawPart_Command}"
IsEnabled="{Binding ResetRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/ResetRawPart.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding DeleteRawPart_ToolTip}"
Command="{Binding DeleteRawPart_Command}"
IsEnabled="{Binding DeleteRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/DeleteRawPart.png" Stretch="Uniform"/>
</Button>
</StackPanel>
@@ -133,14 +133,14 @@
Command="{Binding PrintLabel_Command}"
IsEnabled="{Binding LeftPanel_IsEnabled}"
Visibility="{Binding PrintLabel_Visibility}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/PrintLabel.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding DonePart_ToolTip}"
Command="{Binding DonePart_Command}"
IsEnabled="{Binding LeftPanel_IsEnabled}"
Visibility="{Binding DonePart_Visibility}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/DonePart.png" Stretch="Uniform"/>
</Button>
</StackPanel>
EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml
+1
View File
@@ -19,6 +19,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding MDICommandColumns}"
Style="{StaticResource DataGrid_CustomHighLight}">
<DataGrid.Resources>
EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml
+1
View File
@@ -72,6 +72,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding MachineLogColumns}">
<DataGrid.Resources>
<!-- Data/ora -->
EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+64 -5
View File
@@ -193,7 +193,61 @@
<!--#region GRAFICA GENERALE-->
<!--#region Button Style-->
<!--#region Button Old Style-->
<SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="#FFDDDDDD"/>
<SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="#FF707070"/>
<SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="#FFBEE6FD"/>
<SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="#FF3C7FB1"/>
<SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="#FFC4E5F6"/>
<SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="#FF2C628B"/>
<SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="#FFF4F4F4"/>
<SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="#FFADB2B5"/>
<SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="#FF838383"/>
<Style TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
<Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Margin" Value="1"/>
<Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Border}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource ButtonBasic.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!--#endregion Button Old Style-->
<!--#region Button New Style-->
<!--#FFDDDDDD-->
<SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
@@ -254,7 +308,7 @@
</Setter>
</Style>
<!--#endregion Button Style-->
<!--#endregion Button New Style-->
<!--#region ScrollBar-->
@@ -1160,9 +1214,6 @@
<Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
</Style>
<Style x:Key="LeftPanel_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -2211,6 +2262,14 @@
</Setter>
</Style>
<Style x:Key="OnlyProdLeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
</Style>
<!--#endregion Button Style-->
<!--#region EgtFloatingPanel-->
EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml
+1
View File
@@ -25,6 +25,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding SectXMatColumns}">
<DataGrid.Resources>
<!-- SectionXMaterial -->
EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+7 -7
View File
@@ -190,9 +190,6 @@
<Compile Include="AddRawPartWnd\OnlyProdAddRawPartWndV.xaml.vb">
<DependentUpon>OnlyProdAddRawPartWndV.xaml</DependentUpon>
</Compile>
<Compile Include="BTLPartList\OnlyProdBTLPartListV.xaml.vb">
<DependentUpon>OnlyProdBTLPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="BTLPartManager\BTLPartManagerV.xaml.vb">
<DependentUpon>BTLPartManagerV.xaml</DependentUpon>
</Compile>
@@ -238,6 +235,9 @@
<Compile Include="InstrumentPanel\OnlyProdInstrumentPanelV.xaml.vb">
<DependentUpon>OnlyProdInstrumentPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\OnlyProdBTLPartListV.xaml.vb">
<DependentUpon>OnlyProdBTLPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\OnlyProdFeatureInPartInRawPartListV.xaml.vb">
<DependentUpon>OnlyProdFeatureInPartInRawPartListV.xaml</DependentUpon>
</Compile>
@@ -592,10 +592,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="BTLPartList\OnlyProdBTLPartListV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="BTLPartManager\BTLPartManagerV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -648,6 +644,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ItemParamList\OnlyProdBTLPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\OnlyProdFeatureInPartInRawPartListV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml
+1
View File
@@ -20,6 +20,7 @@
PreviewMouseUp="DataGrid_PreviewMouseUp"
PreviewMouseMove="DataGrid_PreviewMouseMove"
Margin="0,0,0,5"
ColumnHeaderBackground="{x:Null}"
EgtBEAMWALL:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
BindingColumns="{Binding PartColumns}"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+1 -4
View File
@@ -16,10 +16,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding FeatureInPartInRawPartColumns}"
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml
+1 -4
View File
@@ -16,10 +16,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
IsEnabled="{Binding FeatureList_IsEnabled}"
BindingColumns="{Binding FeatureColumns}"
Style="{StaticResource DataGrid_CustomHighLight}">
EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml → EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdBTLPartListV.xaml
View File
EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml.vb → EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb
View File
EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml
+1 -4
View File
@@ -12,10 +12,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
IsEnabled="{Binding PParameterList_IsEnabled}"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml
+1 -4
View File
@@ -18,10 +18,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding PartInRawPartColumns}"
BeginningEdit="PartInRawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml
+1 -4
View File
@@ -12,10 +12,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
BeginningEdit="QParameterList_BeginningEdit"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml
+1 -4
View File
@@ -16,10 +16,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding RawPartColumns}"
BeginningEdit="RawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
+1 -1
View File
@@ -733,7 +733,7 @@ Public Class MySceneHostVM
' scrivo info proj e type su layer BtlInfo
Dim nBTLInfoLayer As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
EgtSetInfo(nBTLInfoLayer, BTL_PRT_PROJ, ProjectManagerVM.nLoadingProjId)
EgtSetInfo(nBTLInfoLayer, BTL_GEN_PROJTYPE, ProjectManagerVM.CurrProd.nType)
EgtSetInfo(nBTLInfoLayer, BTL_GEN_PROJTYPE, ProjectManagerVM.CurrProj.nType)
' scrivo info proj su layer AsseBase
Dim nAsseBaseLayer As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
EgtSetInfo(nAsseBaseLayer, BTL_PRT_PROJ, ProjectManagerVM.nLoadingProjId)
EgtBEAMWALL.ViewerOptimizer/Statistics/OptimizerStatisticsV.xaml
+2
View File
@@ -28,6 +28,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding OptimizerStatisticsColumns}">
<DataGrid.Resources>
<!--Id - Nome-->
@@ -115,6 +116,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding RawPartStatisticsColumns}">
<DataGrid.Resources>
<!--W - Larghezza-->
EgtBEAMWALL.ViewerOptimizer/Statistics/StatisticsV.xaml
+1
View File
@@ -19,6 +19,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding StatisticsColumns}">
<DataGrid.Resources>
<!--PDN - Nome-->
EgtBEAMWALL.ViewerOptimizer/StatusBar/StatusBarV.xaml
+2 -2
View File
@@ -44,9 +44,9 @@
<!--Indica il tipo di punto notevole selezionato-->
<StatusBarItem Grid.Column="3">
<Button Content="{Binding SnapPointType}"
Background="{Binding SnapPointType_Background}"
Style="{StaticResource SnapPointType_Button}"/>
Background="{Binding SnapPointType_Background}"/>
</StatusBarItem>
<!--Style="{StaticResource SnapPointType_Button}"-->
<!--Indica la posizione del mouse quando è sulla scena-->
<StatusBarItem Grid.Column="4">
EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateOrAppendWndV.xaml
+2 -2
View File
@@ -32,12 +32,12 @@
<RadioButton Content="{Binding Update_Msg}"
IsChecked="{Binding UpdateIsChecked}"
Style="{StaticResource ToolBar_TextToggleButton}"
Style="{StaticResource OnlyProdToolBar_TextToggleButton}"
Grid.Row="1" Grid.Column="0">
</RadioButton>
<RadioButton Content="{Binding Append_Msg}"
IsChecked="{Binding AppendIsChecked}"
Style="{StaticResource ToolBar_TextToggleButton}"
Style="{StaticResource OnlyProdToolBar_TextToggleButton}"
Grid.Row="1" Grid.Column="1">
</RadioButton>
</Grid>
EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
+1
View File
@@ -31,6 +31,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="5"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding UpdateBTLColumns}">
<DataGrid.Resources>
<!-- PDN -->
EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+59 -115
View File
@@ -2076,15 +2076,58 @@
<!--#region ToggleButton Style-->
<Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Background" Value="#FFDDDDDD"/>
<Setter Property="BorderBrush" Value="#FF707070"/>
<Style x:Key="OldStyle_ToggleButton" TargetType="{x:Type ToggleButton}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
<Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Margin" Value="1"/>
<Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Button.IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Border}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsChecked" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource ButtonBasic.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OldStyle_ToggleButton}">
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
</Style>
<Style x:Key="MainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Style x:Key="MainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OldStyle_ToggleButton}">
<Setter Property="Background" Value="{StaticResource Omag_White}"/>
<Setter Property="Foreground" Value="{StaticResource Omag_DarkGray}"/>
<Setter Property="TextBlock.FontWeight" Value="Normal"/>
@@ -2095,6 +2138,16 @@
</Style.Triggers>
</Style>
<Style x:Key="OldToolBar_SmallToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OldStyle_ToggleButton}">
<Setter Property="Height" Value="20"/>
<Setter Property="Width" Value="20"/>
</Style>
<Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OldStyle_ToggleButton}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="70"/>
</Style>
<!--#endregion ToggleButton Style-->
<!--#region TextBox-->
@@ -2317,108 +2370,8 @@
<!--region DataGrid-->
<!--<Style x:Key="DataGrid_CustomHighLight" TargetType="{x:Type DataGrid}">
--><!--<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="BorderBrush" Value="#FF688CAF"/>
<Setter Property="BorderThickness" Value="1.5"/>
<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="HeadersVisibility" Value="Column"/>--><!--
<Style.Resources>
<Style TargetType="{x:Type DataGridCell}">
<Style.Triggers>
<Trigger Property="DataGridCell.IsSelected" Value="True">
<Setter Property="BorderBrush" Value="Cyan" />
<Setter Property="Foreground" Value="Blue" />
</Trigger>
<Trigger Property="IsKeyboardFocusWithin" Value="True">
<Setter Property="BorderBrush" Value="DodgerBlue" />
<Setter Property="Foreground" Value="Blue" />
</Trigger>
<Trigger Property="IsEditing" Value="True">
<Setter Property="BorderBrush" Value="DodgerBlue" />
<Setter Property="TextElement.Foreground" Value="Blue" />
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}"/>
<Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource {x:Type ScrollBar}}"/>
</Style.Resources>
</Style>-->
<Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Grid>
<Rectangle x:Name="Border" Fill="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" SnapsToDevicePixels="True"/>
<Polygon x:Name="Arrow" Fill="Black" HorizontalAlignment="Right" Margin="8,8,3,3" Opacity="0.15" Points="0,10 10,10 10,0" Stretch="Uniform" VerticalAlignment="Bottom"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Stroke" TargetName="Border" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Fill" TargetName="Border" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Visibility" TargetName="Arrow" Value="Collapsed"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="DataGrid_CustomHighLight" TargetType="{x:Type DataGrid}">
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="BorderBrush" Value="#FF688CAF"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGrid}">
<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
<ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
<ScrollViewer.Template>
<ControlTemplate TargetType="{x:Type ScrollViewer}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Button Command="{x:Static DataGrid.SelectAllCommand}" Focusable="false" Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="2" Grid.Row="1"/>
<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
<Grid Grid.Column="1" Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
</Grid>
</Grid>
</ControlTemplate>
</ScrollViewer.Template>
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</ScrollViewer>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="HeadersVisibility" Value="Column"/>
<Style.Resources>
<Style TargetType="{x:Type DataGridCell}">
<Style.Triggers>
@@ -2439,15 +2392,6 @@
<Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}"/>
<Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource {x:Type ScrollBar}}"/>
</Style.Resources>
<Style.Triggers>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsGrouping" Value="true"/>
<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
</MultiTrigger.Conditions>
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</MultiTrigger>
</Style.Triggers>
</Style>
<!--#endregion DataGrid-->
@@ -2755,7 +2699,7 @@
<Setter Property="Margin" Value="5,0,0,0"/>
</Style>
<Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Style x:Key="OnlyProdToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="70"/>
</Style>
EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml
+1 -4
View File
@@ -215,10 +215,7 @@
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ColumnHeaderBackground="{StaticResource DataGrid.Static.Background}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ColumnHeaderBackground="{x:Null}"
BindingColumns="{Binding SParamColumns}">
<DataGrid.Resources>
<!-- Active -->