修改Routine
修改PC9相关仿真
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:deviceControl="clr-namespace:MECF.Framework.UI.Core.DeviceControl;assembly=MECF.Framework.UI.Core">
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:deviceControl="clr-namespace:MECF.Framework.UI.Core.DeviceControl;assembly=MECF.Framework.UI.Core">
|
||||
|
||||
<Style x:Key="ComboBoxFocusVisual">
|
||||
<Setter Property="Control.Template">
|
||||
@@ -773,7 +775,7 @@
|
||||
<TextBlock
|
||||
Grid.Column="3"
|
||||
Margin="8,0,0,0"
|
||||
Text="{Binding Description}"/>
|
||||
Text="{Binding Description}" />
|
||||
</Grid>
|
||||
</ContentControl>
|
||||
</DataTemplate>
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
<SolidColorBrush x:Key="DataGrid_BG_Highlight" Color="#262C3D6D" />
|
||||
<SolidColorBrush x:Key="DataGrid_Header_FG" Color="White" />
|
||||
|
||||
<!-- 当前Cell值和前序Cell值不相等时,当前Cell的背景色 -->
|
||||
<SolidColorBrush x:Key="DataGrid_BG_CellValueChangedWithoutSave" Color="#FFC0F18D"/>
|
||||
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotValid" Color="Red"/>
|
||||
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotEquFront" Color="Green"/>
|
||||
<!-- 当前Cell值和前序Cell值不相等时,当前Cell的背景色 -->
|
||||
<SolidColorBrush x:Key="DataGrid_BG_CellValueChangedWithoutSave" Color="#FFC0F18D" />
|
||||
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotValid" Color="Red" />
|
||||
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotEquFront" Color="Green" />
|
||||
|
||||
<Style TargetType="{x:Type DataGrid}">
|
||||
<Setter Property="Background" Value="{x:Null}" />
|
||||
@@ -266,23 +266,26 @@
|
||||
<SolidColorBrush x:Key="{x:Static DataGrid.FocusBorderBrushKey}" Color="#FF000000" />
|
||||
|
||||
<Style TargetType="DataGridRow">
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Template" >
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="DataGridRow">
|
||||
<Grid>
|
||||
<Border x:Name="border" Margin="0" Background="{TemplateBinding Background}" BorderThickness="0" BorderBrush="Transparent">
|
||||
<DataGridCellsPresenter
|
||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
|
||||
<Border
|
||||
x:Name="border"
|
||||
Margin="0"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="Transparent"
|
||||
BorderThickness="0">
|
||||
<DataGridCellsPresenter HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
|
||||
</Border>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" TargetName="border" Value="#FF91B0CD"/>
|
||||
<Setter TargetName="border" Property="Background" Value="#FF91B0CD" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="true">
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="#FF91B0CD"/>
|
||||
<Setter TargetName="border" Property="BorderBrush" Value="#FF91B0CD" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -299,24 +302,22 @@
|
||||
</Style>
|
||||
|
||||
<Style TargetType="DataGridCell">
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="VerticalContentAlignment" Value="Stretch" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="DataGridCell">
|
||||
<Border
|
||||
<Border
|
||||
Padding="2"
|
||||
BorderThickness="0"
|
||||
Background="{TemplateBinding Background}">
|
||||
<ContentPresenter
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderThickness="0">
|
||||
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="true">
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
<Setter Property="FontWeight" Value="Bold"/>
|
||||
<Setter Property="FontWeight" Value="Bold" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -345,7 +346,7 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
|
||||
|
||||
<Style TargetType="{x:Type DataGridCell}">
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource DataGrid_Cell_BD}"/>
|
||||
|
||||
@@ -151,9 +151,9 @@
|
||||
<Setter Property="CanContentScroll" Value="True" />
|
||||
<Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
|
||||
<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
|
||||
<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
|
||||
<Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel"/>
|
||||
<Setter Property="VirtualizingPanel.IsContainerVirtualizable" Value="True"/>
|
||||
<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
|
||||
<Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel" />
|
||||
<Setter Property="VirtualizingPanel.IsContainerVirtualizable" Value="True" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
||||
@@ -167,34 +167,35 @@
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border
|
||||
x:Name="TopBG"
|
||||
MinHeight="24"
|
||||
Background="{DynamicResource Listview_Header_BG}"
|
||||
BorderBrush="{DynamicResource Listview_Header_BD}"
|
||||
BorderThickness="1" >
|
||||
<GridViewHeaderRowPresenter
|
||||
AllowsColumnReorder="{Binding TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderContainerStyle="{Binding TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderContextMenu="{Binding TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderTemplate="{Binding TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderToolTip="{Binding TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
|
||||
</Border>
|
||||
<Border Grid.Row="1"
|
||||
Background="{DynamicResource Listview_BG_First}"
|
||||
BorderBrush="{DynamicResource Listview_Content_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<ScrollContentPresenter
|
||||
Name="PART_ScrollContentPresenter"
|
||||
CanContentScroll="{TemplateBinding CanContentScroll}"
|
||||
CanHorizontallyScroll="False"
|
||||
CanVerticallyScroll="False"
|
||||
Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
KeyboardNavigation.DirectionalNavigation="Local" />
|
||||
</Border>
|
||||
<Border
|
||||
x:Name="TopBG"
|
||||
MinHeight="24"
|
||||
Background="{DynamicResource Listview_Header_BG}"
|
||||
BorderBrush="{DynamicResource Listview_Header_BD}"
|
||||
BorderThickness="1">
|
||||
<GridViewHeaderRowPresenter
|
||||
AllowsColumnReorder="{Binding TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderContainerStyle="{Binding TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderContextMenu="{Binding TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderTemplate="{Binding TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ColumnHeaderToolTip="{Binding TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Background="{DynamicResource Listview_BG_First}"
|
||||
BorderBrush="{DynamicResource Listview_Content_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<ScrollContentPresenter
|
||||
Name="PART_ScrollContentPresenter"
|
||||
CanContentScroll="{TemplateBinding CanContentScroll}"
|
||||
CanHorizontallyScroll="False"
|
||||
CanVerticallyScroll="False"
|
||||
Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
KeyboardNavigation.DirectionalNavigation="Local" />
|
||||
</Border>
|
||||
<ScrollBar
|
||||
x:Name="PART_HorizontalScrollBar"
|
||||
Grid.Row="2"
|
||||
@@ -244,10 +245,10 @@
|
||||
<Setter Property="ItemsPanel">
|
||||
<Setter.Value>
|
||||
<ItemsPanelTemplate>
|
||||
<VirtualizingStackPanel
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
VirtualizingPanel.ScrollUnit="Pixel"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling"/>
|
||||
<VirtualizingStackPanel
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
VirtualizingPanel.ScrollUnit="Pixel"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling" />
|
||||
</ItemsPanelTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
@@ -256,7 +257,7 @@
|
||||
<ControlTemplate TargetType="{x:Type ListView}">
|
||||
<ScrollViewer Style="{DynamicResource ListView-ScrollViewer}">
|
||||
<!--<VirtualizingStackPanel IsItemsHost="True" ScrollUnit="Pixel"/>-->
|
||||
<ItemsPresenter/>
|
||||
<ItemsPresenter />
|
||||
</ScrollViewer>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
Padding="4"
|
||||
CanContentScroll="False"
|
||||
Focusable="False">
|
||||
<ItemsPresenter/>
|
||||
<ItemsPresenter />
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
|
||||
Reference in New Issue
Block a user