Переглянути джерело

git-svn-id: http://10.4.3.168:50001/svn/Furnace@44 dbcde07d-dcf5-c148-8a84-ac3097b7778e

Xiongbing 2 місяців тому
батько
коміт
a08dca6175

+ 4 - 2
Branch/NTP02/Furnace/FurnaceGasPanelUI/Views/Maintenances/ELK/GasPanelView.xaml

@@ -211,7 +211,8 @@
                 Background="#FF7EB9F1"
                 Content="Monitor"
                 GroupName="_enable"
-                IsChecked="True">
+                IsChecked="True"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -228,7 +229,8 @@
                 Height="25"
                 Background="#FF7EB9F1"
                 Content="Recipe"
-                GroupName="_enable">
+                GroupName="_enable"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">

Різницю між файлами не показано, бо вона завелика
+ 3998 - 1229
Branch/NTP02/Furnace/FurnaceGasPanelUI/Views/Maintenances/NTP/GasPanelView.xaml


+ 4 - 2
Branch/NTP02/Furnace/FurnaceGasPanelUI/Views/Maintenances/NTP02/GasPanelView.xaml

@@ -7114,7 +7114,8 @@
                 Background="#FF7EB9F1"
                 Content="Monitor"
                 GroupName="_enable"
-                IsChecked="True">
+                IsChecked="True"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -7130,7 +7131,8 @@
                 Height="30"
                 Background="#FF7EB9F1"
                 Content="Recipe"
-                GroupName="_enable">
+                GroupName="_enable"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">

Різницю між файлами не показано, бо вона завелика
+ 7663 - 1592
Branch/NTP02/Furnace/FurnaceGasPanelUI/Views/Maintenances/SiBCN/GasPanelView.xaml


Різницю між файлами не показано, бо вона завелика
+ 2079 - 2077
Branch/NTP02/Furnace/FurnaceGasPanelUI/Views/Maintenances/TiN/GasPanelView.xaml


+ 6 - 3
Branch/NTP02/Furnace/FurnaceUI/Views/Editors/ELK/RecipeGasPanelSettingView.xaml

@@ -137,7 +137,8 @@
                     VerticalAlignment="Center"
                     Background="#FF7EB9F1"
                     Content="Recipe"
-                    GroupName="_enable">
+                    GroupName="_enable"
+                    Style="{StaticResource RadioButtonHightStyle}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -154,7 +155,8 @@
                     Background="#FF7EB9F1"
                     Content="Manual"
                     GroupName="_enable"
-                    IsChecked="True">
+                    IsChecked="True"
+                    Style="{StaticResource RadioButtonHightStyle}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -169,7 +171,8 @@
                     VerticalAlignment="Center"
                     Background="#FF7EB9F1"
                     Content="Monitor"
-                    GroupName="_enable">
+                    GroupName="_enable"
+                    Style="{StaticResource RadioButtonHightStyle}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">

Різницю між файлами не показано, бо вона завелика
+ 1483 - 1472
Branch/NTP02/Furnace/FurnaceUI/Views/Editors/NTP02/RecipeGasPanelSettingView.xaml


Різницю між файлами не показано, бо вона завелика
+ 7748 - 1614
Branch/NTP02/Furnace/FurnaceUI/Views/Editors/SiBCN/RecipeGasPanelSettingView.xaml


Різницю між файлами не показано, бо вона завелика
+ 8423 - 1235
Branch/NTP02/Furnace/FurnaceUI/Views/Editors/TiN/RecipeGasPanelSettingView.xaml


+ 6 - 3
Branch/NTP02/Furnace/FurnaceUI/Views/Maintenances/Maintenances/ELK/GasPanelView.xaml

@@ -79,7 +79,8 @@
                     Background="#FF7EB9F1"
                     Content="Manual"
                     GroupName="_enable"
-                    IsChecked="True">
+                    IsChecked="True"
+                    Style="{StaticResource RadioButtonHightStyle}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -94,7 +95,8 @@
                     Margin="10,0,0,0"
                     Background="#FF7EB9F1"
                     Content="Monitor"
-                    GroupName="_enable">
+                    GroupName="_enable"
+                    Style="{StaticResource RadioButtonHightStyle}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -110,7 +112,8 @@
                     Margin="10,0,0,0"
                     Background="#FF7EB9F1"
                     Content="Recipe"
-                    GroupName="_enable">
+                    GroupName="_enable"
+                    Style="{StaticResource RadioButtonHightStyle}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">

+ 23 - 12
Branch/NTP02/Furnace/FurnaceUI/Views/Maintenances/Maintenances/NTP02/GasPanelView.xaml

@@ -1834,21 +1834,24 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontSize="12">
-                    BG-1</TextBlock>
+                    BG-1
+                </TextBlock>
                 <TextBlock
                     Canvas.Left="317"
                     Canvas.Top="169"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontSize="12">
-                    BG-2</TextBlock>
+                    BG-2
+                </TextBlock>
                 <TextBlock
                     Canvas.Left="317"
                     Canvas.Top="189"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontSize="12">
-                    BG-3</TextBlock>
+                    BG-3
+                </TextBlock>
                 <Border
                     Canvas.Left="344"
                     Canvas.Top="-86"
@@ -7226,7 +7229,8 @@
                 Background="#FF7EB9F1"
                 Content="Manual"
                 GroupName="_enable"
-                IsChecked="True">
+                IsChecked="True"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -7242,7 +7246,8 @@
                 Height="25"
                 Background="#FF7EB9F1"
                 Content="Monitor"
-                GroupName="_enable">
+                GroupName="_enable"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -7259,7 +7264,8 @@
                 Height="25"
                 Background="#FF7EB9F1"
                 Content="Recipe"
-                GroupName="_enable">
+                GroupName="_enable"
+                Style="{StaticResource RadioButtonHightStyle}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Checked">
                         <cal:ActionMessage MethodName="SelectedGasStateTypeCmd">
@@ -7286,14 +7292,16 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
                 FontSize="9">
-                EXHAUST-2</TextBlock>
+                EXHAUST-2
+            </TextBlock>
             <TextBlock
                 Canvas.Left="116"
                 Canvas.Top="606"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
                 FontSize="9">
-                EXHAUST-2</TextBlock>
+                EXHAUST-2
+            </TextBlock>
             <Canvas Canvas.Left="600" Canvas.Top="616">
                 <StackPanel Orientation="Horizontal" Visibility="{Binding IsManualSetView, Converter={StaticResource bool2VisibilityConverter}}">
                     <Button
@@ -7430,9 +7438,9 @@
                     </i:Interaction.Triggers>
                 </Button>
                 <Button
+                    Margin="5,0,13,0"
                     Background="{Binding CEXHBrush}"
                     Content="C.EXH"
-                      Margin="5,0,13,0"
                     FontFamily="Calibri"
                     FontSize="12">
                     <i:Interaction.Triggers>
@@ -9738,21 +9746,24 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
                 FontSize="12">
-                BG-1</TextBlock>
+                BG-1
+            </TextBlock>
             <TextBlock
                 Canvas.Left="68"
                 Canvas.Top="400"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
                 FontSize="12">
-                BG-3</TextBlock>
+                BG-3
+            </TextBlock>
             <TextBlock
                 Canvas.Left="69"
                 Canvas.Top="349"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
                 FontSize="12">
-                BG-2</TextBlock>
+                BG-2
+            </TextBlock>
             <unitControls:VGPartText
                 Canvas.Left="75"
                 Canvas.Top="314"

Різницю між файлами не показано, бо вона завелика
+ 7672 - 1606
Branch/NTP02/Furnace/FurnaceUI/Views/Maintenances/Maintenances/SiBCN/GasPanelView.xaml


Різницю між файлами не показано, бо вона завелика
+ 2086 - 2083
Branch/NTP02/Furnace/FurnaceUI/Views/Maintenances/Maintenances/TiN/GasPanelView.xaml