再次提交

Venus/Venus_MainPages/Views/MFCVerificationView.xaml

@@ -9,6 +9,7 @@
              prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:wf ="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
              xmlns:wfi ="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration"
+             xmlns:customControls="clr-namespace:Venus_Themes.CustomControls;assembly=Venus_Themes"
              mc:Ignorable="d" 
              xmlns:converters="clr-namespace:Venus_MainPages.Converters"
              d:DesignHeight="1450" d:DesignWidth="1400" x:Name="MFCVerificationView1">
@@ -73,24 +74,24 @@
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
                             <StackPanel Orientation="Horizontal">
-                                <Button Command="{Binding StartOnePointVerificationCommand}"  Content="Start One Point" Width="150" Height="25" FontSize="14" Margin="20,0,0,0" IsEnabled="{Binding IsVerificationButtonEnable}">
+                                <customControls:PathButton Command="{Binding StartOnePointVerificationCommand}"  Content="Start One Point" Width="150" Height="25" FontSize="14" Margin="20,0,0,0" IsEnabled="{Binding IsVerificationButtonEnable}">
                                     <Button.CommandParameter>
                                         <MultiBinding Converter="{StaticResource MultiBindingConverter}">
                                             <Binding ElementName="cb" Path="Text"/>
                                             <Binding ElementName="cbMFC1Setpoint" Path="Text"/>
                                         </MultiBinding>
                                     </Button.CommandParameter>
-                                </Button>
-                                <Button Command="{Binding StartTenPointVerificationCommand}" Content="Start Ten Points" Width="150" Height="25" FontSize="14" Margin="30,0,0,0" IsEnabled="{Binding IsVerificationButtonEnable}">
+                                </customControls:PathButton>
+                                <customControls:PathButton Command="{Binding StartTenPointVerificationCommand}" Content="Start Ten Points" Width="150" Height="25" FontSize="14" Margin="30,0,0,0" IsEnabled="{Binding IsVerificationButtonEnable}">
                                     <Button.CommandParameter>
                                         <MultiBinding Converter="{StaticResource MultiBindingConverter}">
                                             <Binding ElementName="cb" Path="Text"/>
                                             <Binding ElementName="cbMFC1Setpoint" Path="Text"/>
                                         </MultiBinding>
                                     </Button.CommandParameter>
-                                </Button>
+                                </customControls:PathButton>
 
-                                <Button Content="Abort" Width="150" Height="25" FontSize="14" Margin="30,0,0,0" Command="{Binding AbortCommand}"/>
+                                <customControls:PathButton Content="Abort" Width="150" Height="25" FontSize="14" Margin="30,0,0,0" Command="{Binding AbortCommand}"/>
 
                             </StackPanel>
                         </Border>
@@ -142,13 +143,13 @@
                     </Border>
                     <Border BorderBrush="{DynamicResource Table_BD}" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
                         <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsPermission}">
-                            <Button Content="Query" Width="120" Height="25" FontSize="14" Margin="5,0,0,0" Command="{Binding QueryCommand}">
+                            <customControls:PathButton Content="Query" Width="120" Height="25" FontSize="14" Margin="5,0,0,0" Command="{Binding QueryCommand}">
                                 <!--<i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
                                         <cal:ActionMessage MethodName="Query"/>
                                     </i:EventTrigger>
                                 </i:Interaction.Triggers>-->
-                            </Button>
+                            </customControls:PathButton>
                             <!--<Button Content="Set As Current" Width="120" Height="25" FontSize="14" Margin="10,0,0,0" IsEnabled="{Binding IsSetAsCurrentButtonEnable}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">