|
13 | 13 | </Window.DataContext> |
14 | 14 | <Window.Resources> |
15 | 15 | <mvvm:NegateBoolConverter x:Key="NegateBool" /> |
| 16 | + <mvvm:SizeToStringConverter x:Key="SizeToString" /> |
16 | 17 | </Window.Resources> |
17 | 18 | <Grid> |
18 | 19 | <TabControl> |
|
436 | 437 | </ListBox> |
437 | 438 | </Grid> |
438 | 439 |
|
439 | | - <Grid Grid.Row="3"> |
440 | | - <StackPanel Orientation="Horizontal"> |
| 440 | + <Grid Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Stretch"> |
| 441 | + <Grid.RowDefinitions> |
| 442 | + <RowDefinition Height="Auto" /> |
| 443 | + <RowDefinition Height="Auto" /> |
| 444 | + </Grid.RowDefinitions> |
| 445 | + <Grid.ColumnDefinitions> |
| 446 | + <ColumnDefinition Width="Auto" /> |
| 447 | + <ColumnDefinition Width="Auto" /> |
| 448 | + <ColumnDefinition Width="Auto" /> |
| 449 | + <ColumnDefinition Width="Auto" /> |
| 450 | + <ColumnDefinition Width="Auto" /> |
| 451 | + <ColumnDefinition /> |
| 452 | + </Grid.ColumnDefinitions> |
| 453 | + <StackPanel Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Stretch" Grid.ColumnSpan="6" MaxHeight="100"> |
441 | 454 | <ProgressBar |
| 455 | + Height="30" |
442 | 456 | Name="PbScanProgress" |
443 | 457 | MinWidth="100" |
444 | 458 | Maximum="{Binding ScanProgressMaxValue, Mode=OneWay}" |
445 | 459 | Value="{Binding ScanProgressValue, Mode=OneWay}" /> |
446 | | - <TextBlock Margin="10,0,0,0" Text="{Binding TimeElapsed, Mode=OneWay, StringFormat=Elapsed time: \{0:hh\}:\{0:mm\}:\{0:ss\}}" /> |
447 | | - <Separator /> |
448 | | - <TextBlock Margin="10,0,0,0" Text="{Binding RemainingTime, Mode=OneWay, StringFormat=Remaining time: ~\{0:hh\}:\{0:mm\}:\{0:ss\}}" /> |
449 | | - <Separator /> |
450 | | - <TextBlock Margin="10,0,0,0" Text="{Binding ScanProgressText, Mode=OneWay}" /> |
451 | 460 | </StackPanel> |
| 461 | + <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,0,0" Text="Dupes" /> |
| 462 | + <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,0,0" Text="{Binding TotalDuplicates, Mode=OneWay}" /> |
| 463 | + <TextBlock Grid.Row="0" Grid.Column="1" Margin="10,0,0,0" Text="Groups" /> |
| 464 | + <TextBlock Grid.Row="1" Grid.Column="1" Margin="10,0,0,0" Text="{Binding TotalGroups, Mode=OneWay}" /> |
| 465 | + |
| 466 | + <TextBlock Grid.Row="0" Grid.Column="2" Margin="10,0,0,0" Text="Size" /> |
| 467 | + <TextBlock Grid.Row="1" Grid.Column="2" Margin="10,0,0,0" Text="{Binding TotalSize, Mode=OneWay, Converter={StaticResource SizeToString}}" /> |
| 468 | + |
| 469 | + <TextBlock Grid.Row="0" Grid.Column="3" Margin="10,0,0,0" Text="Elapsed" /> |
| 470 | + <TextBlock Grid.Row="0" Grid.Column="4" Margin="10,0,0,0" Text="Remaining" /> |
| 471 | + <TextBlock Grid.Row="1" Grid.Column="3" Margin="10,0,0,0" Text="{Binding TimeElapsed, Mode=OneWay, StringFormat=\{0:hh\}:\{0:mm\}:\{0:ss\}}" /> |
| 472 | + <TextBlock Grid.Row="1" Grid.Column="4" Margin="10,0,0,0" Text="{Binding RemainingTime, Mode=OneWay, StringFormat=~\{0:hh\}:\{0:mm\}:\{0:ss\}}" /> |
| 473 | + <TextBlock Grid.RowSpan="2" Grid.Row="0" Grid.Column="5" Margin="10,0,0,0" Text="{Binding ScanProgressText, Mode=OneWay}" TextWrapping="Wrap" /> |
| 474 | + <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="2"> |
| 475 | + <Grid.RowDefinitions> |
| 476 | + <RowDefinition /> |
| 477 | + <RowDefinition /> |
| 478 | + </Grid.RowDefinitions> |
| 479 | + <Grid.ColumnDefinitions> |
| 480 | + <ColumnDefinition /> |
| 481 | + <ColumnDefinition /> |
| 482 | + <ColumnDefinition /> |
| 483 | + </Grid.ColumnDefinitions> |
| 484 | + </Grid> |
452 | 485 | </Grid> |
453 | 486 | </Grid> |
454 | 487 | </TabItem> |
|
0 commit comments