diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -66,7 +64,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -172,7 +169,6 @@ Grid.Row="1" HorizontalAlignment="Center" FontSize="14" - Foreground="#cecece" Text="正在听音" Visibility="{Binding IsBlueRecording, Converter={StaticResource ListenStateConverter}}" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -66,7 +64,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -172,7 +169,6 @@ Grid.Row="1" HorizontalAlignment="Center" FontSize="14" - Foreground="#cecece" Text="正在听音" Visibility="{Binding IsBlueRecording, Converter={StaticResource ListenStateConverter}}" /> diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 4727188..8d4bae8 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -47,25 +47,26 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - - - + + + + Text="User - Defined List of materials" /> @@ -80,11 +81,12 @@ HorizontalAlignment="Right" Command="{Binding DeleteSpeedCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -95,11 +97,12 @@ Command="{Binding AddSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -110,11 +113,12 @@ Command="{Binding EditSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -66,7 +64,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -172,7 +169,6 @@ Grid.Row="1" HorizontalAlignment="Center" FontSize="14" - Foreground="#cecece" Text="正在听音" Visibility="{Binding IsBlueRecording, Converter={StaticResource ListenStateConverter}}" /> diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 4727188..8d4bae8 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -47,25 +47,26 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - - - + + + + Text="User - Defined List of materials" /> @@ -80,11 +81,12 @@ HorizontalAlignment="Right" Command="{Binding DeleteSpeedCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -95,11 +97,12 @@ Command="{Binding AddSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -110,11 +113,12 @@ Command="{Binding EditSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 1039796..64cf7d4 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -66,7 +64,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -172,7 +169,6 @@ Grid.Row="1" HorizontalAlignment="Center" FontSize="14" - Foreground="#cecece" Text="正在听音" Visibility="{Binding IsBlueRecording, Converter={StaticResource ListenStateConverter}}" /> diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 4727188..8d4bae8 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -47,25 +47,26 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - - - + + + + Text="User - Defined List of materials" /> @@ -80,11 +81,12 @@ HorizontalAlignment="Right" Command="{Binding DeleteSpeedCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -95,11 +97,12 @@ Command="{Binding AddSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -110,11 +113,12 @@ Command="{Binding EditSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 1039796..64cf7d4 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Views/AudioFileView.xaml b/Correlator/Views/AudioFileView.xaml index 0010697..6fa3e7d 100644 --- a/Correlator/Views/AudioFileView.xaml +++ b/Correlator/Views/AudioFileView.xaml @@ -37,21 +37,22 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - + + Text="File List" /> @@ -141,11 +142,12 @@ HorizontalAlignment="Left" Command="{Binding DeleteItemCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -171,11 +173,12 @@ HorizontalAlignment="Left" Command="{Binding ReLoadDataCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -66,7 +64,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -172,7 +169,6 @@ Grid.Row="1" HorizontalAlignment="Center" FontSize="14" - Foreground="#cecece" Text="正在听音" Visibility="{Binding IsBlueRecording, Converter={StaticResource ListenStateConverter}}" /> diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 4727188..8d4bae8 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -47,25 +47,26 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - - - + + + + Text="User - Defined List of materials" /> @@ -80,11 +81,12 @@ HorizontalAlignment="Right" Command="{Binding DeleteSpeedCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -95,11 +97,12 @@ Command="{Binding AddSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -110,11 +113,12 @@ Command="{Binding EditSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 1039796..64cf7d4 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Views/AudioFileView.xaml b/Correlator/Views/AudioFileView.xaml index 0010697..6fa3e7d 100644 --- a/Correlator/Views/AudioFileView.xaml +++ b/Correlator/Views/AudioFileView.xaml @@ -37,21 +37,22 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - + + Text="File List" /> @@ -141,11 +142,12 @@ HorizontalAlignment="Left" Command="{Binding DeleteItemCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -171,11 +173,12 @@ HorizontalAlignment="Left" Command="{Binding ReLoadDataCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Views/AuditionView.xaml b/Correlator/Views/AuditionView.xaml index 8762a1f..40447f8 100644 --- a/Correlator/Views/AuditionView.xaml +++ b/Correlator/Views/AuditionView.xaml @@ -41,11 +41,12 @@ HorizontalAlignment="Left" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index f9d63ef..2c66627 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -50,15 +50,13 @@ diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 74a4d24..91f3b10 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -45,15 +45,13 @@ @@ -61,7 +59,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -66,7 +64,7 @@ Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Vertical"> - + @@ -172,7 +169,6 @@ Grid.Row="1" HorizontalAlignment="Center" FontSize="14" - Foreground="#cecece" Text="正在听音" Visibility="{Binding IsBlueRecording, Converter={StaticResource ListenStateConverter}}" /> diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml index 4727188..8d4bae8 100644 --- a/Correlator/Dialog/SoundSpeedDialog.xaml +++ b/Correlator/Dialog/SoundSpeedDialog.xaml @@ -47,25 +47,26 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - - - + + + + Text="User - Defined List of materials" /> @@ -80,11 +81,12 @@ HorizontalAlignment="Right" Command="{Binding DeleteSpeedCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -95,11 +97,12 @@ Command="{Binding AddSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -110,11 +113,12 @@ Command="{Binding EditSpeedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 1039796..64cf7d4 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Views/AudioFileView.xaml b/Correlator/Views/AudioFileView.xaml index 0010697..6fa3e7d 100644 --- a/Correlator/Views/AudioFileView.xaml +++ b/Correlator/Views/AudioFileView.xaml @@ -37,21 +37,22 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - + + Text="File List" /> @@ -141,11 +142,12 @@ HorizontalAlignment="Left" Command="{Binding DeleteItemCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -171,11 +173,12 @@ HorizontalAlignment="Left" Command="{Binding ReLoadDataCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Views/AuditionView.xaml b/Correlator/Views/AuditionView.xaml index 8762a1f..40447f8 100644 --- a/Correlator/Views/AuditionView.xaml +++ b/Correlator/Views/AuditionView.xaml @@ -41,11 +41,12 @@ HorizontalAlignment="Left" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> diff --git a/Correlator/Views/PictureFileView.xaml b/Correlator/Views/PictureFileView.xaml index a50dc31..c111e10 100644 --- a/Correlator/Views/PictureFileView.xaml +++ b/Correlator/Views/PictureFileView.xaml @@ -37,21 +37,22 @@ Margin="10,0" Command="{Binding GoBackCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> - + + Text="File List" /> @@ -141,11 +142,12 @@ HorizontalAlignment="Left" Command="{Binding DeleteItemCommand}"> - + VerticalAlignment="Center" + FontFamily="/Correlator;component/Fonts/#iconfont" + FontSize="20" + Text="" /> @@ -171,11 +173,12 @@ HorizontalAlignment="Left" Command="{Binding ReLoadDataCommand}"> - +