diff options
author | sr55 <[email protected]> | 2012-08-05 15:02:10 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2012-08-05 15:02:10 +0000 |
commit | 7617bc4c41c7d79e1676e7edadd0ba71579c7ce3 (patch) | |
tree | a418ade8fd322997cd7ccc94dd96fdd91928796e /win/CS/HandBrakeWPF/Views | |
parent | 2418ee8d40fe9adde205a51dbe67bfb2b7cd660d (diff) |
WinGui: Add Audio Track Name option back in. For now, I've used a toggle button on the audio track to expand the row to show hidden audio options.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4890 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
-rw-r--r-- | win/CS/HandBrakeWPF/Views/AudioView.xaml | 62 |
1 files changed, 46 insertions, 16 deletions
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml index a014c4e68..4e9c6d92f 100644 --- a/win/CS/HandBrakeWPF/Views/AudioView.xaml +++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml @@ -20,6 +20,7 @@ <Audio:AudioBitrateConverter x:Key="audioBitrateConverter" />
<Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
</UserControl.Resources>
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -116,7 +117,14 @@ <ListBox.ItemTemplate>
<DataTemplate>
+
+
+
<Grid HorizontalAlignment="Stretch">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
@@ -124,14 +132,14 @@ </Grid.ColumnDefinitions>
<!-- Marker -->
- <Image Grid.Column="0"
+ <Image Grid.Column="0" Grid.Row="0"
Width="16"
Height="16"
Margin="10,0,10,0"
Source="Images/Movies.png" />
<!-- Settings -->
- <Grid Grid.Column="1" HorizontalAlignment="Stretch">
+ <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" MaxWidth="160" />
@@ -300,26 +308,48 @@ Value="{Binding Gain,
Mode=TwoWay}" />
+ <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="6" Grid.Row="1" Grid.ColumnSpan="2"
+ FontWeight="Bold" Height="22" Padding="4,0" HorizontalAlignment="Left" >
+ <ToggleButton.Style>
+ <Style TargetType="{x:Type ToggleButton}">
+ <Setter Property="Content" Value="Show Advanced"/>
+ <Style.Triggers>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter Property="Content" Value="Hide Advanced"/>
+ </Trigger>
+ <Trigger Property="IsChecked" Value="False">
+ <Setter Property="Content" Value="Show Advanced"/>
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </ToggleButton.Style>
+ </ToggleButton>
+
</Grid>
<!-- Delete -->
- <Image Grid.Column="2"
- Width="16"
- Height="16"
- Margin="10,0,10,0"
- Source="Images/delete.png">
- <i:Interaction.Triggers>
- <i:EventTrigger EventName="MouseDown">
- <cal:ActionMessage MethodName="Remove">
- <cal:Parameter Value="{Binding}" />
- </cal:ActionMessage>
- </i:EventTrigger>
- </i:Interaction.Triggers>
- </Image>
+ <StackPanel Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">
+ <Image Width="16" Height="16" Margin="10,0,10,0" Source="Images/delete.png">
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="MouseDown">
+ <cal:ActionMessage MethodName="Remove">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Image>
+ </StackPanel>
+ <!-- Hidden Row -->
+ <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">
+ <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >
+ <TextBlock Text="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="0,0,5,0" />
+ <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />
+ </StackPanel>
+
+ </Grid>
</Grid>
-
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
|