summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2014-09-17 17:55:46 +0000
committersr55 <[email protected]>2014-09-17 17:55:46 +0000
commitfa6c4b1ef02762536340c79bb4f9cee238fe4d53 (patch)
tree9f21e48b0ee440d95e5be2959540f4b009260e09
parent5a01b1b808c875e0524b412edcc913aa6575f771 (diff)
WinGui: Re-add Transparent background to toolbar.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6414 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml1
-rw-r--r--win/CS/HandBrakeWPF/Views/SubtitlesView.xaml13
2 files changed, 14 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index dc14d29e2..945835524 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -581,6 +581,7 @@
SnapsToDevicePixels="False"
UseLayoutRounding="False"
ToolBar.OverflowMode="Never"
+ Background="Transparent"
ToolBarTray.IsLocked="True"
Loaded="ToolBarLoaded"
KeyboardNavigation.TabNavigation="Continue"
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 3e1db6857..48a411026 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -201,6 +201,8 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
@@ -237,6 +239,17 @@
</i:Interaction.Triggers>
</CheckBox>
+ <TextBlock Grid.Column="10" VerticalAlignment="Center" FontWeight="Bold" Text="Burn In" />
+ <CheckBox Grid.Column="11" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}">
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="Click">
+ <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </CheckBox>
+
</Grid>
<!-- Delete -->