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

EgtCAM5 :

Browse Source 
- Aggiunta ricerca su MTable lavorazioni ordinate.
- Aggiunta possibilità in MTable di spostare anche le righe della tabella associazioni.
- Migliorie varie.
This commit is contained in:
Emmanuele Sassi
2017-07-21 17:52:04 +00:00
parent a621285cd5
commit db6662ec48
4 changed files with 253 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTableDb/MTableDbV.xaml
+19 -29
View File
@@ -171,6 +171,7 @@
<SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{x:Static SystemColors.HighlightTextColor}"/>
</Style.Resources>
<Setter Property="IsSelected" Value="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<EventSetter Event="PreviewMouseDown" Handler="LeftTableMouseDown"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsValidForSearch}" Value="True">
<Setter Property="Background" Value="{StaticResource EgaltechGreen}"></Setter>
@@ -376,7 +377,7 @@
</DataGrid.InputBindings>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<EventSetter Event="PreviewMouseDown" Handler="CellLeftClick"/>
<EventSetter Event="PreviewMouseLeftButtonDown" Handler="CellLeftClick"/>
<EventSetter Event="PreviewMouseRightButtonDown" Handler="CellRightClick"/>
<EventSetter Event="PreviewMouseRightButtonUp" Handler="CellRightUp"/>
<EventSetter Event="PreviewMouseUp" Handler="CellMouseUp"/>
@@ -390,12 +391,16 @@
</Style.Resources>
<Setter Property="IsSelected" Value="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<EventSetter Event="MouseRightButtonDown" Handler="RowRightClick"/>
<EventSetter Event="MouseLeftButtonDown" Handler="RowLeftClick"/>
<!--<EventSetter Event="MouseLeftButtonDown" Handler="RowLeftClick"/>-->
<EventSetter Event="PreviewMouseDown" Handler="RowMouseDown"/>
<EventSetter Event="PreviewMouseUp" Handler="RowMouseUp"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsGroupEven}" Value="True">
<Setter Property="Background" Value="{StaticResource EgaltechUltralightGray}"></Setter>
</DataTrigger>
<DataTrigger Binding="{Binding IsValidForSearch}" Value="True">
<Setter Property="Background" Value="{StaticResource EgaltechGreen}"></Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>
@@ -428,13 +433,13 @@
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellEditingTemplate>
<DataTemplate>
<ComboBox SelectedItem="{Binding PropertyPar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
<ComboBox SelectedItem="{Binding grh_PropertyPar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
ItemsSource="{Binding PropertyList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
</DataTemplate>
</DataGridTemplateColumn.CellEditingTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock ToolTip="{Binding Path=PropertyPar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<TextBlock ToolTip="{Binding Path=grh_PropertyPar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<TextBlock.Text>
<MultiBinding Converter="{StaticResource PropertyConverter}">
<Binding Path="PropertyPar" />
@@ -459,15 +464,7 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Colonna GeometryName-->
<!--
<DataGridTextColumn Width="1*"
Binding="{Binding Geometry}"
IsReadOnly="True">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.GeometryHdr, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>-->
<!--Colonna MachiningName-->
<DataGridTemplateColumn Width="1*"
@@ -482,18 +479,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Colonna MachiningName-->
<!--
<DataGridTextColumn Width="1*"
Binding="{Binding Machining}"
IsReadOnly="True">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.MachiningHdr, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>-->
<!--Colonna Join-->
<DataGridCheckBoxColumn Width="Auto" Binding="{Binding Join}">
<DataGridCheckBoxColumn Width="Auto" Binding="{Binding grh_Join}">
<DataGridCheckBoxColumn.Header>
<TextBlock Text="{Binding Path=DataContext.JoinHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
</DataGridCheckBoxColumn.Header>
@@ -545,18 +533,20 @@
IsEnabled="{Binding IsEnabledResetSearch}"/>
</Grid>
<Button Content="{Binding AddMachiningBtn}" Command="{Binding AddRowCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
Grid.Column="1"/>
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
IsEnabled="{Binding AddRemoveRow_IsEnabled}"
Grid.Column="1"/>
<Button Content="{Binding RemoveMachiningBtn}" Command="{Binding RemoveRowCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
Grid.Column="2"/>
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
IsEnabled="{Binding AddRemoveRow_IsEnabled}"
Grid.Column="2"/>
<Button Content="/\" Command="{Binding MoveRowUpCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
IsEnabled="{Binding MoveRowUp_IsEnabled}"
IsEnabled="{Binding MoveRow_IsEnabled}"
Grid.Column="3"/>
<Button Content="\/" Command="{Binding MoveRowDownCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
IsEnabled="{Binding MoveRowDown_IsEnabled}"
IsEnabled="{Binding MoveRow_IsEnabled}"
Grid.Column="4"/>
<Button Content="Group" Command="{Binding GroupCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"