diff options
| author | sr55 <[email protected]> | 2015-04-18 14:08:09 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-04-18 14:08:09 +0000 |
| commit | d26d290873503259f71d7c09d3fb3377cc2c9ae8 (patch) | |
| tree | a752dde3e04f2ad55555e1e5f6c9bf628a649fa8 /win/CS/HandBrakeWPF/Views/MainView.xaml | |
| parent | 18ec5828ba1d6fcea88b6109d114efd8dac53206 (diff) | |
WinGui: Misc UI fixes and fixes to the logging code for scanning that could sometimes cause a crash.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7094 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/MainView.xaml')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 44a46b195..8e365891a 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -641,24 +641,26 @@ <!-- Source Selection-->
<Controls:SourceSelection Grid.Row="1" MinWidth="300" HorizontalAlignment="Left" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"
- Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}" Panel.ZIndex="1"
+ Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, TargetNullValue=Collapsed, FallbackValue=Collapsed}" Panel.ZIndex="1"
/>
- <DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"
+ <!--<DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"
Grid.Row="1"
- Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+ Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />-->
- <!-- StatusPanel -->
+ <!-- StatusPanel Height="70" -->
<Controls:StatusPanel x:Name="loadingPanel"
- Grid.Row="1"
- Grid.RowSpan="2"
- Height="70"
- VerticalAlignment="Bottom"
+ Grid.Row="0"
+ Grid.RowSpan="3"
+ Visibility="{Binding ShowStatusWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
+ VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
Panel.ZIndex="10"
IsLoading="{Binding ShowStatusWindow}"
- Message="{Binding StatusLabel}"
- SubMessage="Please Wait ..."
+ Message="Please wait ..."
+ SubMessage="{Binding StatusLabel}"
+ ActionText="Cancel"
+ CancelAction="{Binding CancelAction}"
/>
<!-- Status Bar -->
|