diamond-cut
/
SparkClient
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	SparkClient.csproj
master
sunhonglei 7 months ago
parent d00b0f1e4f a6dde3c987
commit 10dea3aa44
2 changed files with 127 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      SparkClient.csproj
  2. 129
      Views/Grading/GradingResult.xaml

7
SparkClient.csproj
Unescape View File

@ -49,7 +49,12 @@
<None Remove="Resource\Images\UIResource\round_P8-P8.png" />
<None Remove="Resource\Images\UIResource\round_select.png" />
<None Remove="Resource\Images\ze-add-o 1%403x.png" />
<Resource Include="ffmpeg.exe" />
<Resource Include="ffmpeg.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resource\Images\Cushion-shaped.png" />
<Resource Include="Resource\Images\Emerald-shape.png" />
<Resource Include="Resource\Images\Heart-shaped.png" />
<None Remove="Resource\Images\homebg.png" />
<Resource Include="Resource\Images\round_P8-P8.png" />
<Resource Include="Resource\Images\UIResource\Cushion.png" />

129
Views/Grading/GradingResult.xaml
Unescape View File

@ -258,6 +258,7 @@
HeadersVisibility="Column"
Background="Transparent"
BorderThickness="0"
CanUserSortColumns="False"
GridLinesVisibility="None"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden"
@ -424,7 +425,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="1"
FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item1}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="0">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="0">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="6" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -438,7 +453,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="2"
FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item2}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="1">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="1">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="7" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -452,7 +481,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="3"
FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item3}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="2">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="2">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="8" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -466,7 +509,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="4"
FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item4}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="3">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="3">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="9" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -480,7 +537,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="5"
FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item5}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="4">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="4">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="10" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -494,7 +565,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="6"
FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item6}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="5">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="5">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="11" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -508,7 +593,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="7"
FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item7}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="6">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="6">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
<Border Grid.Column="12" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
@ -522,7 +621,21 @@
<TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="8"
FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
<TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item8}"
FontSize="20" Foreground="#0063FF"/>
FontSize="20" Foreground="#0063FF">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="FontWeight" Value="Normal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="7">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="7">
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
</Border>
</Grid>

Write Preview
Loading…
Cancel
Save