diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index a47b750..f8bc391 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -26,9 +26,9 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + @@ -53,7 +53,7 @@ - - + @@ -126,33 +121,23 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index a47b750..f8bc391 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -26,9 +26,9 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + @@ -53,7 +53,7 @@ - - + @@ -126,33 +121,23 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 1b216ef..b70c8f7 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -32,7 +32,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> @@ -99,8 +99,8 @@ @@ -108,9 +108,11 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 1b216ef..b70c8f7 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -32,7 +32,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> @@ -99,8 +99,8 @@ @@ -108,9 +108,11 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index a47b750..f8bc391 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -26,9 +26,9 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + @@ -53,7 +53,7 @@ - - + @@ -126,33 +121,23 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 1b216ef..b70c8f7 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -32,7 +32,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> @@ -99,8 +99,8 @@ @@ -108,9 +108,11 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 53cc5ed..4bf7aa2 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -37,7 +37,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index a47b750..f8bc391 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -26,9 +26,9 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + @@ -53,7 +53,7 @@ - - + @@ -126,33 +121,23 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 1b216ef..b70c8f7 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -32,7 +32,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> @@ -99,8 +99,8 @@ @@ -108,9 +108,11 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 53cc5ed..4bf7aa2 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -37,7 +37,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index 76c67d9..0e0e427 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -4,8 +4,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="400" - Height="80" + Width="500" + Height="90" AllowsTransparency="True" Background="Transparent" Closed="LoadingDialog_OnClosed" @@ -24,15 +24,19 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index a47b750..f8bc391 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -26,9 +26,9 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + @@ -53,7 +53,7 @@ - - + @@ -126,33 +121,23 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 1b216ef..b70c8f7 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -32,7 +32,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> @@ -99,8 +99,8 @@ @@ -108,9 +108,11 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 53cc5ed..4bf7aa2 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -37,7 +37,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index 76c67d9..0e0e427 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -4,8 +4,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="400" - Height="80" + Width="500" + Height="90" AllowsTransparency="True" Background="Transparent" Closed="LoadingDialog_OnClosed" @@ -24,15 +24,19 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 55f98c4..78a36ee 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -28,7 +28,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index a47b750..f8bc391 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -26,9 +26,9 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + @@ -53,7 +53,7 @@ - - + @@ -126,33 +121,23 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 1b216ef..b70c8f7 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -32,7 +32,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> @@ -99,8 +99,8 @@ @@ -108,9 +108,11 @@ + Width="150" + Height="35" + HorizontalAlignment="Left" + Content="取消" + FontSize="18" + Style="{StaticResource ButtonDefault}" /> + CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" + Content="确定" + FontSize="18" + Style="{StaticResource ButtonPrimary}" /> diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 53cc5ed..4bf7aa2 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -37,7 +37,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="LightGray" /> + Color="Blue" /> diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index 76c67d9..0e0e427 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -4,8 +4,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="400" - Height="80" + Width="500" + Height="90" AllowsTransparency="True" Background="Transparent" Closed="LoadingDialog_OnClosed" @@ -24,15 +24,19 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> - + diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 55f98c4..78a36ee 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -28,7 +28,7 @@ Direction="0" Opacity="0.5" ShadowDepth="0" - Color="Gray" /> + Color="Blue" /> diff --git a/Correlator/ViewModel/ImportResponseViewModel.cs b/Correlator/ViewModel/ImportResponseViewModel.cs index ef4a9a3..83d214f 100644 --- a/Correlator/ViewModel/ImportResponseViewModel.cs +++ b/Correlator/ViewModel/ImportResponseViewModel.cs @@ -11,6 +11,7 @@ using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Messaging; using Microsoft.Win32; +using MessageBox = HandyControl.Controls.MessageBox; namespace Correlator.ViewModel {