Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop
This commit is contained in:
hanqiangqiang
commit
125f0e4a50
@ -1159,11 +1159,11 @@ namespace SicModules.PMs
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M2M9M15M19_M26)
|
||||
{
|
||||
lst = new List<int>() { 2, 9, 15, 19, 20, 21, 22, 23, 24, 25, 26};
|
||||
lst = new List<int>() { 9, 15, 19, 20, 21, 22, 23, 24, 25, 26};
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M5M21)
|
||||
{
|
||||
lst = new List<int>() { 5,21 };
|
||||
lst = new List<int>() { 21 };
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M17)
|
||||
{
|
||||
@ -1187,7 +1187,7 @@ namespace SicModules.PMs
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M2toM40NoFinal1MFC)
|
||||
{
|
||||
lst = new List<int>() { 2, 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 40 };
|
||||
lst = new List<int>() { 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 40 };
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M27toM38)
|
||||
{
|
||||
@ -1215,7 +1215,7 @@ namespace SicModules.PMs
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M19toM33)
|
||||
{
|
||||
lst = new List<int>() { 19, 20, 22, 23, 25, 26, 27, 28, 29, 40, 31, 32, 33, 2, 15, 9 };
|
||||
lst = new List<int>() { 19, 20, 22, 23, 25, 26, 27, 28, 29, 40, 31, 32, 33, 15, 9 };
|
||||
}
|
||||
else if (mGroupName == MfcGroupName.M32toM38)
|
||||
{
|
||||
@ -1237,7 +1237,7 @@ namespace SicModules.PMs
|
||||
{
|
||||
lst = new List<int>()
|
||||
{
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 22, 23, 25, 26, 27, 32, 33, 35, 36,
|
||||
1, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 22, 23, 25, 26, 27, 32, 33, 35, 36,
|
||||
37, 38
|
||||
};
|
||||
}
|
||||
@ -1245,8 +1245,8 @@ namespace SicModules.PMs
|
||||
{
|
||||
lst = new List<int>()
|
||||
{
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31,
|
||||
32, 33, 35, 36, 37, 38, 40, 41, 42
|
||||
1, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 31,
|
||||
32, 33, 35, 36, 37, 38, 40
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -192,7 +192,7 @@ namespace SicModules.PMs.Routines
|
||||
SetIoValueByGroup((int)RoutineStep.SetGroupG, IoGroupName.G, true, _IoValueOpenCloseTimeout);
|
||||
|
||||
//6、 M1-M17 设定为 default 值， 所有 PC 设定为 default 值（PC1-PC9） ，M18 - M40（除 M30\M34\M39） MFC 5s ramp 到 0。
|
||||
SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.M1toM17);
|
||||
SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.All);
|
||||
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
|
||||
SetMfcToDefaultByGroup((int)RoutineStep.SetM18toM40, MfcGroupName.M18toM40No303439, 5);
|
||||
|
||||
|
||||
@ -312,7 +312,7 @@ namespace SicModules.PMs.Routines
|
||||
SetIoValueByGroup((int)RoutineStep.SetGroupG, IoGroupName.G, true, _IoValueOpenCloseTimeout);
|
||||
|
||||
//5、 M1-M17 设定为 default 值，所有 PC 设定为 default 值(PC1-PC9)。
|
||||
SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.M1toM17);
|
||||
SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.All);
|
||||
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
|
||||
|
||||
//M1-M16设定为default值(M2、M9、M15除外)
|
||||
|
||||
@ -193,7 +193,7 @@ namespace SicModules.PMs.Routines
|
||||
SetIoValueByGroup((int)RoutineStep.SetGroupG, IoGroupName.G, true, _IoValueOpenCloseTimeout);
|
||||
|
||||
//6、 M1-M17 设定为 default 值， 所有 PC 设定为 default 值（PC1-PC9） ，M18 - M40（除 M30\M34\M39） MFC 5s ramp 到 0。
|
||||
SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.M1toM17);
|
||||
SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.All);
|
||||
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
|
||||
SetMfcToDefaultByGroup((int)RoutineStep.SetM18toM40, MfcGroupName.M18toM40No303439, 5);
|
||||
|
||||
|
||||
@ -607,7 +607,7 @@
|
||||
<config default="120" name="ThrottlePressureTimeout" description="蝶阀调节值超时时间" max="2000" min="0" paramter="" tag="" unit="s" type="Integer" />
|
||||
<config default="5" name="ThrottlePressureRate" description="蝶阀每秒调节速率(mbar/每秒)" max="1000" min="0" paramter="" tag="" unit="mbar" type="Double" />
|
||||
<config default="5" name="ThrottlePositionRate" description="蝶阀每秒调节速率(百分比/每秒)" max="100" min="0" paramter="" tag="" unit="%" type="Double" />
|
||||
<config default="300" visible="false" name="RotationCloseTimeout" description="关闭旋转超时时间" max="1000" min="0" paramter="" tag="" unit="s" type="Integer" />
|
||||
<config default="300" name="RotationCloseTimeout" description="关闭旋转超时时间" max="1000" min="0" paramter="" tag="" unit="s" type="Integer" />
|
||||
<config default="0" name="ThrottlePositionDefaultValue" description="蝶阀位置模式默认值" max="100" min="0" paramter="" tag="" unit="s" type="Double" />
|
||||
<config default="1100" name="ThrottlePressureDefaultValue" description="蝶阀压力模式默认值" max="1500" min="0" paramter="" tag="" unit="s" type="Double" />
|
||||
<config default="400" name="ThrottlePositionModeMaxPressure" description="蝶阀允许位置模式需要的最大压力值" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" />
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
<Window x:Class="MECF.Framework.UI.Client.ClientBase.Dialog.LoginRequestConfirmationDialog"
|
||||
<Window
|
||||
x:Class="MECF.Framework.UI.Client.ClientBase.Dialog.LoginRequestConfirmationDialog"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
mc:Ignorable="d"
|
||||
Height="220" Width="400"
|
||||
d:Background="White"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
Title="Login Request Confirmation"
|
||||
Width="400"
|
||||
Height="220"
|
||||
d:Background="White"
|
||||
Closing="Window_Closing"
|
||||
ResizeMode="NoResize"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Closing="Window_Closing">
|
||||
mc:Ignorable="d">
|
||||
<!--<WindowChrome.WindowChrome>
|
||||
<WindowChrome ResizeBorderThickness="0" CaptionHeight="0"/>
|
||||
</WindowChrome.WindowChrome>
|
||||
@ -18,28 +20,56 @@
|
||||
</Window.Effect>-->
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="5"/>
|
||||
<RowDefinition Height="5" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border Background="{StaticResource Color_BG_TopStrip}"/>
|
||||
<Border Background="{StaticResource Color_BG_TopStrip}" />
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"/>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition />
|
||||
<RowDefinition Height="70"/>
|
||||
<RowDefinition Height="70" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="Login Request" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Row="1" Margin="20 0" HorizontalAlignment="Center" >
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="24"
|
||||
Text="Login Request" />
|
||||
<StackPanel
|
||||
Grid.Row="1"
|
||||
Margin="20,0"
|
||||
HorizontalAlignment="Center">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="{Binding Description, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
|
||||
TextWrapping="Wrap"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
|
||||
TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Button x:Name="BtnAccept" Content="Accept" VerticalAlignment="Center" Height="30" Width="120" Margin="0,0,5,0" Click="BtnAccept_Click" />
|
||||
<Button x:Name="BtnRejected" Content="Reject" VerticalAlignment="Center" Height="30" Width="120" Margin="5,0,0,0" Click="BtnRejected_Click" IsCancel="True" IsDefault="True" />
|
||||
<StackPanel
|
||||
Grid.Row="2"
|
||||
HorizontalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<Button
|
||||
x:Name="BtnAccept"
|
||||
Width="120"
|
||||
Height="30"
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
Click="BtnAccept_Click"
|
||||
Content="Accept" />
|
||||
<Button
|
||||
x:Name="BtnRejected"
|
||||
Width="120"
|
||||
Height="30"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
Click="BtnRejected_Click"
|
||||
Content="Reject"
|
||||
IsCancel="True"
|
||||
IsDefault="True" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
<Window x:Class="MECF.Framework.UI.Client.ClientBase.Dialog.LoginRequestWaitDialog"
|
||||
<Window
|
||||
x:Class="MECF.Framework.UI.Client.ClientBase.Dialog.LoginRequestWaitDialog"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:MECF.Framework.UI.Client.ClientBase.Dialog"
|
||||
mc:Ignorable="d"
|
||||
Height="220" Width="400"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
Width="400"
|
||||
Height="220"
|
||||
d:Background="White"
|
||||
ResizeMode="NoResize"
|
||||
WindowStartupLocation="CenterScreen">
|
||||
WindowStartupLocation="CenterScreen"
|
||||
mc:Ignorable="d">
|
||||
<!--<WindowChrome.WindowChrome>
|
||||
<WindowChrome ResizeBorderThickness="0" CaptionHeight="0"/>
|
||||
</WindowChrome.WindowChrome>
|
||||
@ -17,27 +19,45 @@
|
||||
</Window.Effect>-->
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="5"/>
|
||||
<RowDefinition Height="5" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border Background="{StaticResource Color_BG_TopStrip}"/>
|
||||
<Border Background="{StaticResource Color_BG_TopStrip}" />
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"/>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition />
|
||||
<RowDefinition Height="70"/>
|
||||
<RowDefinition Height="70" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="Wait Confirmation" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Row="1" Margin="20 0" HorizontalAlignment="Center" >
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="24"
|
||||
Text="Wait Confirmation" />
|
||||
<StackPanel
|
||||
Grid.Row="1"
|
||||
Margin="20,0"
|
||||
HorizontalAlignment="Center">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="The account had already logged in somewhere, please wait for confirmation ..."
|
||||
TextWrapping="Wrap"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
|
||||
TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
|
||||
<Button Grid.Row="2" x:Name="BtnCancel" Content="Cancel" IsCancel="True" VerticalAlignment="Center" Height="30" Width="120" Margin="0,0,5,0" Click="BtnCancel_OnClick" />
|
||||
<Button
|
||||
x:Name="BtnCancel"
|
||||
Grid.Row="2"
|
||||
Width="120"
|
||||
Height="30"
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
Click="BtnCancel_OnClick"
|
||||
Content="Cancel"
|
||||
IsCancel="True" />
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@ -1,233 +1,332 @@
|
||||
<UserControl x:Class="OpenSEMI.ClientBase.MessageDialogView"
|
||||
<UserControl
|
||||
x:Class="OpenSEMI.ClientBase.MessageDialogView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:cal="http://www.caliburn.org"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
|
||||
xmlns:cal="http://www.caliburn.org"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:micro="clr-namespace:Caliburn.Micro"
|
||||
Background="Transparent">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto"/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="10"/>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
<RowDefinition Height="10" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.Effect>
|
||||
<DropShadowEffect BlurRadius="6" ShadowDepth="6" Opacity="0.6"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="6"
|
||||
Opacity="0.6"
|
||||
ShadowDepth="6" />
|
||||
</Grid.Effect>
|
||||
<Grid MinWidth="300" MaxWidth="650" MinHeight="200" MaxHeight="400" Margin="0,0,10,10">
|
||||
<Grid
|
||||
MinWidth="300"
|
||||
MinHeight="200"
|
||||
MaxWidth="650"
|
||||
MaxHeight="400"
|
||||
Margin="0,0,10,10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto"/>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
<RowDefinition Height="10"/>
|
||||
<RowDefinition Height="10" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border x:Name="DialogWindow" BorderThickness="1,1,0,0" BorderBrush="{DynamicResource Color_BD_Dialog}" MinWidth="300" MinHeight="200" MaxWidth="600" MaxHeight="400" Grid.Row="1" Background="{DynamicResource Color_BG_Dialog}" >
|
||||
<Border
|
||||
x:Name="DialogWindow"
|
||||
Grid.Row="1"
|
||||
MinWidth="300"
|
||||
MinHeight="200"
|
||||
MaxWidth="600"
|
||||
MaxHeight="400"
|
||||
Background="{DynamicResource Color_BG_Dialog}"
|
||||
BorderBrush="{DynamicResource Color_BD_Dialog}"
|
||||
BorderThickness="1,1,0,0">
|
||||
<Border BorderBrush="{DynamicResource Color_BG_Dialog_Shadow}" BorderThickness="0,0,1,1">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Rectangle Margin="5" Grid.RowSpan="2" Fill="{DynamicResource Color_BG_Dialog_Inner}"/>
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" CanContentScroll="True" Margin="20,20,20,0">
|
||||
<Rectangle
|
||||
Grid.RowSpan="2"
|
||||
Margin="5"
|
||||
Fill="{DynamicResource Color_BG_Dialog_Inner}" />
|
||||
<ScrollViewer
|
||||
Margin="20,20,20,0"
|
||||
CanContentScroll="True"
|
||||
HorizontalScrollBarVisibility="Disabled"
|
||||
VerticalScrollBarVisibility="Auto">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="40"/>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="40" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid VerticalAlignment="Top">
|
||||
<Grid x:Name="Warning" Width="40" Height="40">
|
||||
<Grid
|
||||
x:Name="Warning"
|
||||
Width="40"
|
||||
Height="40">
|
||||
<Grid Width="30" Height="30">
|
||||
<Ellipse Fill="#FF8B5D00">
|
||||
<Ellipse.Effect>
|
||||
<DropShadowEffect Color="White" ShadowDepth="0" BlurRadius="10"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="10"
|
||||
ShadowDepth="0"
|
||||
Color="White" />
|
||||
</Ellipse.Effect>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="3,3,3,1.5">
|
||||
<Ellipse.Effect>
|
||||
<BlurEffect Radius="10"/>
|
||||
<BlurEffect Radius="10" />
|
||||
</Ellipse.Effect>
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="#FFEB9E00" Offset="0"/>
|
||||
<GradientStop Color="#FFFDFA00" Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0" Color="#FFEB9E00" />
|
||||
<GradientStop Offset="1" Color="#FFFDFA00" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="5,2.5,5,12">
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="White" Offset="0.2"/>
|
||||
<GradientStop Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0.2" Color="White" />
|
||||
<GradientStop Offset="1" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<TextBlock TextWrapping="Wrap" Text="!" FontWeight="Bold" FontFamily="Belwe Bd BT" FontSize="26.667" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF682600">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Belwe Bd BT"
|
||||
FontSize="26.667"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF682600"
|
||||
Text="!"
|
||||
TextWrapping="Wrap">
|
||||
<TextBlock.Effect>
|
||||
<DropShadowEffect ShadowDepth="0" Color="White"/>
|
||||
<DropShadowEffect ShadowDepth="0" Color="White" />
|
||||
</TextBlock.Effect>
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<Grid.Style>
|
||||
<Style>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed"/>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding DialogType}" Value="WARNING">
|
||||
<Setter Property="Grid.Visibility" Value="Visible"/>
|
||||
<Setter Property="Grid.Visibility" Value="Visible" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Grid.Style>
|
||||
</Grid>
|
||||
<Grid x:Name="Information" Width="40" Height="40">
|
||||
<Grid
|
||||
x:Name="Information"
|
||||
Width="40"
|
||||
Height="40">
|
||||
<Grid Width="30" Height="30">
|
||||
<Ellipse Fill="#FF00628B">
|
||||
<Ellipse.Effect>
|
||||
<DropShadowEffect Color="White" ShadowDepth="0" BlurRadius="10"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="10"
|
||||
ShadowDepth="0"
|
||||
Color="White" />
|
||||
</Ellipse.Effect>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="3,3,3,1.5">
|
||||
<Ellipse.Effect>
|
||||
<BlurEffect Radius="10"/>
|
||||
<BlurEffect Radius="10" />
|
||||
</Ellipse.Effect>
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="#FF007BDA" Offset="0"/>
|
||||
<GradientStop Color="#FF68C6D8" Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0" Color="#FF007BDA" />
|
||||
<GradientStop Offset="1" Color="#FF68C6D8" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="5,2.5,5,12">
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="White" Offset="0.2"/>
|
||||
<GradientStop Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0.2" Color="White" />
|
||||
<GradientStop Offset="1" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<TextBlock TextWrapping="Wrap" Text="i" FontSize="26.667" Foreground="#FF002368" FontFamily="Monotype Corsiva" Margin="9.5,2.5,6.5,-2.5" FontWeight="Bold">
|
||||
<TextBlock
|
||||
Margin="9.5,2.5,6.5,-2.5"
|
||||
FontFamily="Monotype Corsiva"
|
||||
FontSize="26.667"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF002368"
|
||||
Text="i"
|
||||
TextWrapping="Wrap">
|
||||
<TextBlock.Effect>
|
||||
<DropShadowEffect ShadowDepth="0" Color="White"/>
|
||||
<DropShadowEffect ShadowDepth="0" Color="White" />
|
||||
</TextBlock.Effect>
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<Grid.Style>
|
||||
<Style>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed"/>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding DialogType}" Value="INFO">
|
||||
<Setter Property="Grid.Visibility" Value="Visible"/>
|
||||
<Setter Property="Grid.Visibility" Value="Visible" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Grid.Style>
|
||||
</Grid>
|
||||
<Grid x:Name="Error" Width="40" Height="40">
|
||||
<Grid
|
||||
x:Name="Error"
|
||||
Width="40"
|
||||
Height="40">
|
||||
<Grid Width="30" Height="30">
|
||||
<Ellipse Fill="#FFB60000">
|
||||
<Ellipse.Effect>
|
||||
<DropShadowEffect Color="White" ShadowDepth="0" BlurRadius="10"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="10"
|
||||
ShadowDepth="0"
|
||||
Color="White" />
|
||||
</Ellipse.Effect>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="3,3,3,1.5">
|
||||
<Ellipse.Effect>
|
||||
<BlurEffect Radius="10"/>
|
||||
<BlurEffect Radius="10" />
|
||||
</Ellipse.Effect>
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="#FFFF2F00" Offset="0"/>
|
||||
<GradientStop Color="#FFFF9D6F" Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0" Color="#FFFF2F00" />
|
||||
<GradientStop Offset="1" Color="#FFFF9D6F" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="5,2.5,5,12">
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="White" Offset="0.2"/>
|
||||
<GradientStop Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0.2" Color="White" />
|
||||
<GradientStop Offset="1" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<TextBlock TextWrapping="Wrap" Text="×" FontWeight="Bold" FontFamily="Arial Black" FontSize="24" HorizontalAlignment="Center" Foreground="#FF740000" Margin="0,2,0,0">
|
||||
<TextBlock
|
||||
Margin="0,2,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
FontFamily="Arial Black"
|
||||
FontSize="24"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF740000"
|
||||
Text="×"
|
||||
TextWrapping="Wrap">
|
||||
<TextBlock.Effect>
|
||||
<DropShadowEffect ShadowDepth="0" Color="White"/>
|
||||
<DropShadowEffect ShadowDepth="0" Color="White" />
|
||||
</TextBlock.Effect>
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<Grid.Style>
|
||||
<Style>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed"/>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding DialogType}" Value="ERROR">
|
||||
<Setter Property="Grid.Visibility" Value="Visible"/>
|
||||
<Setter Property="Grid.Visibility" Value="Visible" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Grid.Style>
|
||||
</Grid>
|
||||
<Grid x:Name="Confirm" Width="40" Height="40">
|
||||
<Grid
|
||||
x:Name="Confirm"
|
||||
Width="40"
|
||||
Height="40">
|
||||
<Grid Width="30" Height="30">
|
||||
<Ellipse Fill="#FF006A28">
|
||||
<Ellipse.Effect>
|
||||
<DropShadowEffect Color="White" ShadowDepth="0" BlurRadius="10"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="10"
|
||||
ShadowDepth="0"
|
||||
Color="White" />
|
||||
</Ellipse.Effect>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="3,3,3,1.5">
|
||||
<Ellipse.Effect>
|
||||
<BlurEffect Radius="10"/>
|
||||
<BlurEffect Radius="10" />
|
||||
</Ellipse.Effect>
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="#FF68EB00" Offset="0"/>
|
||||
<GradientStop Color="#FFE1FF82" Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0" Color="#FF68EB00" />
|
||||
<GradientStop Offset="1" Color="#FFE1FF82" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<Ellipse Margin="5,2.5,5,12">
|
||||
<Ellipse.Fill>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="White" Offset="0.2"/>
|
||||
<GradientStop Offset="1"/>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0.2" Color="White" />
|
||||
<GradientStop Offset="1" />
|
||||
</LinearGradientBrush>
|
||||
</Ellipse.Fill>
|
||||
</Ellipse>
|
||||
<Path Data="M0,0 L4,0 4,3.8890872 16.010408,3.8890872 16.010408,7.8890872 0.010407538,7.8890872 0.010407538,3.9999998 0,3.9999998 z" Fill="#FF005601" Margin="8,9.5,6,12.5" RenderTransformOrigin="0.500325027316656,0.746485246105757" Stretch="Fill">
|
||||
<Path
|
||||
Margin="8,9.5,6,12.5"
|
||||
Data="M0,0 L4,0 4,3.8890872 16.010408,3.8890872 16.010408,7.8890872 0.010407538,7.8890872 0.010407538,3.9999998 0,3.9999998 z"
|
||||
Fill="#FF005601"
|
||||
RenderTransformOrigin="0.500325027316656,0.746485246105757"
|
||||
Stretch="Fill">
|
||||
<Path.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform/>
|
||||
<SkewTransform/>
|
||||
<RotateTransform Angle="-50"/>
|
||||
<TranslateTransform/>
|
||||
<ScaleTransform />
|
||||
<SkewTransform />
|
||||
<RotateTransform Angle="-50" />
|
||||
<TranslateTransform />
|
||||
</TransformGroup>
|
||||
</Path.RenderTransform>
|
||||
</Path>
|
||||
</Grid>
|
||||
<Grid.Style>
|
||||
<Style>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed"/>
|
||||
<Setter Property="Grid.Visibility" Value="Collapsed" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding DialogType}" Value="CONFIRM">
|
||||
<Setter Property="Grid.Visibility" Value="Visible"/>
|
||||
<Setter Property="Grid.Visibility" Value="Visible" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Grid.Style>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<TextBlock Grid.Column="1" TextAlignment="Left" Text="{Binding Text}" VerticalAlignment="Top" Margin="0,10,0,0" TextWrapping="Wrap" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource Color_FG_Black}"></TextBlock>
|
||||
<TextBlock
|
||||
Grid.Column="1"
|
||||
Margin="0,10,0,0"
|
||||
VerticalAlignment="Top"
|
||||
FontFamily="Arial"
|
||||
FontSize="14"
|
||||
Foreground="{DynamicResource Color_FG_Black}"
|
||||
Text="{Binding Text}"
|
||||
TextAlignment="Left"
|
||||
TextWrapping="Wrap" />
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
<ListBox ItemsSource="{Binding Buttons}" BorderThickness="0" Grid.Row="1" Background="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,10">
|
||||
<ListBox
|
||||
Grid.Row="1"
|
||||
Margin="0,0,0,10"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Background="{x:Null}"
|
||||
BorderThickness="0"
|
||||
ItemsSource="{Binding Buttons}">
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<VirtualizingStackPanel Orientation="Horizontal"></VirtualizingStackPanel>
|
||||
<VirtualizingStackPanel Orientation="Horizontal" />
|
||||
</ItemsPanelTemplate>
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Button Content="{Binding Name}" Width="75" Height="30" IsCancel="{Binding IsCancel}" IsDefault="{Binding IsDefault}" Margin="5,0">
|
||||
<Button
|
||||
Width="75"
|
||||
Height="30"
|
||||
Margin="5,0"
|
||||
Content="{Binding Name}"
|
||||
IsCancel="{Binding IsCancel}"
|
||||
IsDefault="{Binding IsDefault}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<micro:ActionMessage MethodName="OnButtonClick">
|
||||
@ -242,7 +341,15 @@
|
||||
</Grid>
|
||||
</Border>
|
||||
</Border>
|
||||
<Path Data="M8,0 L8,4 4,0" Fill="{DynamicResource Color_BG_Dialog}" HorizontalAlignment="Right" Margin="0,-2,40,0" Stretch="Fill" Width="8" Grid.Row="2" Stroke="{DynamicResource Color_BG_Dialog_Shadow}"/>
|
||||
<Path
|
||||
Grid.Row="2"
|
||||
Width="8"
|
||||
Margin="0,-2,40,0"
|
||||
HorizontalAlignment="Right"
|
||||
Data="M8,0 L8,4 4,0"
|
||||
Fill="{DynamicResource Color_BG_Dialog}"
|
||||
Stretch="Fill"
|
||||
Stroke="{DynamicResource Color_BG_Dialog_Shadow}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user