summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views/MainView.xaml
diff options
context:
space:
mode:
authorsr55 <[email protected]>2017-12-12 21:38:59 +0000
committersr55 <[email protected]>2017-12-12 21:38:59 +0000
commit02bb7c53bf68e0ba64ccd221b3435b444abb744b (patch)
treedfae39db91e22795d26db21f2bc0e250109505cb /win/CS/HandBrakeWPF/Views/MainView.xaml
parent462d4aa8d369266bbc8204148c6da85930893790 (diff)
WinGui: Initial Activation of the "modified" preset detection code. (Audio/Subtitle Tabs still to be done)
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/MainView.xaml')
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml25
1 files changed, 17 insertions, 8 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index cf6b45635..2bb8a6746 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -353,17 +353,26 @@
<Label Content="Presets" FontWeight="Bold" VerticalAlignment="Center" />
<StackPanel Orientation="Horizontal" Margin="8,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
- <Button x:Name="SelectPresetsButton" Margin="15,0,0,0" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="250">
+ <Button x:Name="SelectPresetsButton" Margin="15,0,0,0" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">
<Button.Content>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch">
- <TextBlock Margin="0,0,5,0" Padding="0"
- VerticalAlignment="Center" Width="215"
+ <Grid VerticalAlignment="Stretch" Width="235">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+ <TextBlock Margin="0,0,5,0" Padding="0" Grid.Column="0"
+ VerticalAlignment="Center"
Text="{Binding SelectedPreset.DisplayValue}" TextTrimming="CharacterEllipsis" />
- <Path Height="8" Margin="2,0,0,1" VerticalAlignment="Center" HorizontalAlignment="Center"
+ <TextBlock Text="(Modified)" Margin="0,0,5,0" FontStyle="Italic" VerticalAlignment="Center" Grid.Column="1"
+ Visibility="{Binding IsModifiedPreset, Converter={StaticResource boolToVisConverter}, TargetNullValue=Collapsed, FallbackValue=Collapsed}"/>
+
+ <Path Height="8" Margin="2,0,0,1" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="3"
Data="M 0 0 L 4 4 L 0 8 Z"
Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowSelectPreset" />
- </StackPanel>
+ </Grid>
</Button.Content>
<Button.ContextMenu>
@@ -407,9 +416,9 @@
</Button>
</StackPanel>
<StackPanel Margin="8,0,0,0" Orientation="Horizontal" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
- <TextBlock Text="Selected Preset:" Margin="5,0,0,0" />
+ <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_SelectedPreset}" Margin="5,0,0,0" />
<TextBlock Text="{Binding SelectedPreset.Name}" Margin="5,0,0,0" />
- <TextBlock Text="(Default)" Visibility="{Binding SelectedPreset.IsDefault, Converter={StaticResource boolToVisConverter}}" Margin="5,0,0,0" />
+ <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_ModifiedPreset}" FontStyle="Italic" Visibility="{Binding IsModifiedPreset, Converter={StaticResource boolToVisConverter}}" Margin="5,0,0,0" />
</StackPanel>