diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 5439deb..c115cc6 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -143,7 +143,7 @@ Command="{Binding DetermineParamCommand}" Content="确定" FontSize="18" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 5439deb..c115cc6 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -143,7 +143,7 @@ Command="{Binding DetermineParamCommand}" Content="确定" FontSize="18" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index 1a81bb0..cae115e 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -88,8 +88,7 @@ Margin="20" Command="{Binding AlertDetermineCommand}" Content="确定" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 5439deb..c115cc6 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -143,7 +143,7 @@ Command="{Binding DetermineParamCommand}" Content="确定" FontSize="18" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index 1a81bb0..cae115e 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -88,8 +88,7 @@ Margin="20" Command="{Binding AlertDetermineCommand}" Content="确定" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index 5d75932..88a046a 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -78,8 +78,7 @@ HorizontalAlignment="Right" Command="{Binding CloseAlertCommand}" Content="知道了" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> \ No newline at end of file diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 5439deb..c115cc6 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -143,7 +143,7 @@ Command="{Binding DetermineParamCommand}" Content="确定" FontSize="18" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index 1a81bb0..cae115e 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -88,8 +88,7 @@ Margin="20" Command="{Binding AlertDetermineCommand}" Content="确定" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index 5d75932..88a046a 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -78,8 +78,7 @@ HorizontalAlignment="Right" Command="{Binding CloseAlertCommand}" Content="知道了" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> \ No newline at end of file diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index 8af203e..aebf808 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -25,7 +25,7 @@ FontFamily="宋体" FontSize="50" FontWeight="Bold" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="相关仪" /> diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 5439deb..c115cc6 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -143,7 +143,7 @@ Command="{Binding DetermineParamCommand}" Content="确定" FontSize="18" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index 1a81bb0..cae115e 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -88,8 +88,7 @@ Margin="20" Command="{Binding AlertDetermineCommand}" Content="确定" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index 5d75932..88a046a 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -78,8 +78,7 @@ HorizontalAlignment="Right" Command="{Binding CloseAlertCommand}" Content="知道了" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> \ No newline at end of file diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index 8af203e..aebf808 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -25,7 +25,7 @@ FontFamily="宋体" FontSize="50" FontWeight="Bold" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="相关仪" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 38df797..288d3fd 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -40,7 +40,7 @@ ShadowDepth="0" Color="Blue" /> - + @@ -77,7 +77,6 @@ x:Name="ReCheckButton" Width="120" HorizontalAlignment="Right" - hc:BorderElement.CornerRadius="22" Content="检查" FontSize="18" IsEnabled="False" @@ -111,7 +110,6 @@ Height="35" Margin="0,10" VerticalAlignment="Top" - hc:BorderElement.CornerRadius="17.5" Content="下一步" Style="{StaticResource FunctionButtonStyle}" /> @@ -169,7 +167,6 @@ Height="35" Margin="0,10" VerticalAlignment="Top" - hc:BorderElement.CornerRadius="17.5" Content="下一步" IsEnabled="{Binding StepIndex, ElementName=RedSensorStepBar, Converter={StaticResource StateConverter}}" Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 9efeee8..ec7965c 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -18,6 +18,7 @@ + diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index df30666..7d21804 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -341,6 +341,10 @@ MSBuild:Compile + MSBuild:Compile + Designer + + Designer MSBuild:Compile diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 5439deb..c115cc6 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -143,7 +143,7 @@ Command="{Binding DetermineParamCommand}" Content="确定" FontSize="18" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index 1a81bb0..cae115e 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -88,8 +88,7 @@ Margin="20" Command="{Binding AlertDetermineCommand}" Content="确定" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index 5d75932..88a046a 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -78,8 +78,7 @@ HorizontalAlignment="Right" Command="{Binding CloseAlertCommand}" Content="知道了" - FontSize="16" - Style="{StaticResource ButtonPrimary}" /> + Style="{StaticResource FunctionButtonStyle}" /> \ No newline at end of file diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index 8af203e..aebf808 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -25,7 +25,7 @@ FontFamily="宋体" FontSize="50" FontWeight="Bold" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="相关仪" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 38df797..288d3fd 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -40,7 +40,7 @@ ShadowDepth="0" Color="Blue" /> - + @@ -77,7 +77,6 @@ x:Name="ReCheckButton" Width="120" HorizontalAlignment="Right" - hc:BorderElement.CornerRadius="22" Content="检查" FontSize="18" IsEnabled="False" @@ -111,7 +110,6 @@ Height="35" Margin="0,10" VerticalAlignment="Top" - hc:BorderElement.CornerRadius="17.5" Content="下一步" Style="{StaticResource FunctionButtonStyle}" /> @@ -169,7 +167,6 @@ Height="35" Margin="0,10" VerticalAlignment="Top" - hc:BorderElement.CornerRadius="17.5" Content="下一步" IsEnabled="{Binding StepIndex, ElementName=RedSensorStepBar, Converter={StaticResource StateConverter}}" Style="{StaticResource FunctionButtonStyle}" /> diff --git a/Correlator/Dialog/DetectNoiseDialog.xaml b/Correlator/Dialog/DetectNoiseDialog.xaml index ac882b1..59844b0 100644 --- a/Correlator/Dialog/DetectNoiseDialog.xaml +++ b/Correlator/Dialog/DetectNoiseDialog.xaml @@ -122,7 +122,7 @@ HorizontalAlignment="Center" FontFamily="{StaticResource DigitalFont}" FontSize="50" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="{Binding LeftNoiseValue, StringFormat={}{0:F2}}" /> @@ -162,7 +162,7 @@ HorizontalAlignment="Center" FontFamily="{StaticResource DigitalFont}" FontSize="50" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="{Binding RightNoiseValue, StringFormat={}{0:F2}}" /> @@ -180,7 +180,7 @@ @@ -787,12 +787,12 @@ VerticalAlignment="Center" FontFamily="{StaticResource DigitalFont}" FontSize="35" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="{Binding CorrelatorData.RightNoiseSumValue, StringFormat={}{0:F2}}" /> @@ -867,11 +867,11 @@ Margin="10,0" FontFamily="/Correlator;component/Fonts/#iconfont" FontSize="24" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="" /> @@ -893,11 +893,11 @@ Margin="10,0" FontFamily="/Correlator;component/Fonts/#iconfont" FontSize="24" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="" /> @@ -932,11 +932,11 @@ Margin="10,0" FontFamily="/Correlator;component/Fonts/#iconfont" FontSize="24" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="" /> @@ -984,11 +984,11 @@ Margin="10,0" FontFamily="/Correlator;component/Fonts/#iconfont" FontSize="24" - Foreground="{StaticResource MainThemeColor}" + Foreground="{StaticResource MainThemeBrush}" Text="" /> @@ -1133,7 +1133,7 @@ @@ -1162,7 +1162,7 @@