换电脑

Venus/Venus_MainPages/Views/OverKepler2300View.xaml

@@ -1197,12 +1197,12 @@
                 <customControls:PathButton PathData="{StaticResource Icon_Home}"  DefaultFillBrush="White"  Command="{Binding PMInitCommnad}"  Width="120" Height="30" Content="Initialize"    Margin="10,0,0,0"/>
                 <customControls:PathButton PathData="{StaticResource Icon_Abort}" DefaultFillBrush="White"  Command="{Binding PMAbortCommnad}" Width="120" Height="30" Content="Abort"   Margin="50,0,30,0"/>
                 <customControls:AduRadioButtonIcon Content="MF"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},Mode=TwoWay}" Height="40"  attach:IconElement.Margin="-20" />
-                <Border BorderThickness="1" Height="30" Width="2" BorderBrush="Black" Margin="10,0,10,0">
+                <Border BorderThickness="1" Height="30" Width="2" BorderBrush="Black" Margin="10,0,0,0">
                     <Border.RenderTransform>
                         <RotateTransform  Angle="15" CenterX="1" CenterY="15"></RotateTransform>
                     </Border.RenderTransform>
                 </Border>
-                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="5,0,50,0" Height="40"  attach:IconElement.Margin="-20" />
+                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="-10,0,30,0" Height="40"  attach:IconElement.Margin="-20" />
                 <customControls:PathButton  Width="130" Height="30" Content="Vent"          Command="{Binding VentCommand}"         IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Purge"    Command="{Binding PurgeCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Down"     Command="{Binding PumpCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>

Venus/Venus_MainPages/Views/OverVenusView.xaml

@@ -1212,13 +1212,13 @@
             <StackPanel Orientation="Horizontal">
                 <customControls:PathButton PathData="{StaticResource Icon_Home}"  DefaultFillBrush="White"  Command="{Binding PMInitCommnad}"  Width="120" Height="30" Content="Initialize"    Margin="10,0,0,0"/>
                 <customControls:PathButton PathData="{StaticResource Icon_Abort}" DefaultFillBrush="White"  Command="{Binding PMAbortCommnad}" Width="120" Height="30" Content="Abort"   Margin="50,0,30,0"/>
-                <customControls:AduRadioButtonIcon Content="MF"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},Mode=TwoWay}" Height="40"  attach:IconElement.Margin="-20" />
-                <Border BorderThickness="1" Height="30" Width="2" BorderBrush="Black" Margin="10,0,10,0">
+                <customControls:AduRadioButtonIcon Content="MF"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},Mode=TwoWay}" Height="40" />
+                <Border BorderThickness="1" Height="30" Width="2" BorderBrush="Black" Margin="10,0,0,0">
                     <Border.RenderTransform>
                         <RotateTransform  Angle="15" CenterX="1" CenterY="15"></RotateTransform>
                     </Border.RenderTransform>
                 </Border>
-                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="5,0,50,0" Height="40"  attach:IconElement.Margin="-20" />
+                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="-10,0,30,0" Height="40"   />
                 <customControls:PathButton  Width="130" Height="30" Content="Vent"          Command="{Binding VentCommand}"         IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Purge"    Command="{Binding PurgeCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Down"     Command="{Binding PumpCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>

Venus/Venus_Themes/CustomControls/AduRadioButton.xaml

@@ -16,7 +16,7 @@
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="FontWeight"  Value="DemiBold" />
         <Setter Property="Foreground" Value="White" />
-        <Setter Property="Opacity"  Value=".8" />
+        <!--<Setter Property="Opacity"  Value="1" />-->
 
         <!--<Setter Property="Effect">
             <Setter.Value>
@@ -43,20 +43,20 @@
                             VerticalAlignment="Center"
                             HorizontalAlignment="Center"
                             Orientation="Horizontal"
-                            Margin="-10,0,0,0"
+                            Margin="0"
                             SnapsToDevicePixels="True">
                             <Border>
-                                <Path x:Name="Icon" VerticalAlignment="Center" Width="{TemplateBinding Attach:IconElement.Width}" Margin="{TemplateBinding Attach:IconElement.Margin}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" Data="{TemplateBinding Attach:IconElement.PathData}" />
+                                <Path x:Name="Icon" VerticalAlignment="Center" Width="{TemplateBinding Attach:IconElement.Width}" Margin="0,0,10,0" Fill="{TemplateBinding Foreground}" Stretch="Uniform" Data="{TemplateBinding Attach:IconElement.PathData}" />
                             </Border>
                             <TextBlock
                                 x:Name="contentPresenter"
                                 Grid.Column="1"
                                 Foreground="{TemplateBinding Foreground}"
-                                Margin="0,0,5,0"
+                                Margin="0,0,3,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 Text="{TemplateBinding Content}"
-                                Padding="0,0,0,1"
+                                Padding="0,0,0,0"
                                 Focusable="False"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </StackPanel>
@@ -69,7 +69,8 @@
                         <Trigger Property="IsPressed" Value="True" />
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="templateRoot" Property="Background" Value="{Binding SelectBackground, RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter TargetName="templateRoot" Property="Opacity" Value="1" />
+                            <!--<Setter  Property="Opacity" Value="1" />-->
+                            <Setter Property="IsEnabled" Value="False" />
                             <Setter TargetName="templateRoot" Property="BorderThickness" Value="0" />
                             <Setter TargetName="Icon" Property="Fill" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
                             <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />

Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -83,8 +83,8 @@ namespace Venus_UI.Views
                 aduRadioButtonIcon.Click += AduRadioButtonIcon_Click;
                 aduRadioButtonIcon.SelectBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#6AD7FF"));
                 aduRadioButtonIcon.SelectColor = new SolidColorBrush((Colors.Black));
-                //aduRadioButtonIcon.DefaultBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#6AD7FF"));
-                aduRadioButtonIcon.DefaultBackground = new SolidColorBrush(Colors.DarkGray);
+                aduRadioButtonIcon.DefaultBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#94BCD7"));
+                //aduRadioButtonIcon.DefaultBackground = new SolidColorBrush(Colors.DarkGray);
                 
 
                 aduRadioButtonIcon.Width = 180;