WinGui: Code tidyup / tweaks around presets.

diff --git a/win/CS/HandBrakeWPF/Converters/PresetsMenuConverter.cs b/win/CS/HandBrakeWPF/Converters/PresetsMenuConverter.cs
index bbcfd891d7084f45961543b5d6caf4db2a03accd..d3a114376b391b18656e0f1687d33d6254962054 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/PresetsMenuConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/PresetsMenuConverter.cs
@@ -79,6 +79,7 @@ namespace HandBrakeWPF.Converters
                 if (preset.IsDefault)
                 {
                     newMeuItem.FontStyle = FontStyles.Italic;
+                    newMeuItem.FontSize = 14;
                 }
 
                 groupedMenu[preset.Category].Items.Add(newMeuItem);
@@ -92,6 +93,7 @@ namespace HandBrakeWPF.Converters
                 if (preset.IsDefault)
                 {
                     newMeuItem.FontStyle = FontStyles.Italic;
+                    newMeuItem.FontSize = 14;
                 }
 
                 group.Items.Add(newMeuItem);

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 06e1904f4b94853f5ffa363d7fed8fd6bb7f5536..89fcb38304a4dedbb4f007f700afa4c652b50cbf 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -22,7 +22,6 @@
 \r
         <Style TargetType="Button">\r
             <Setter Property="Padding" Value="8,2" />\r
-            <Setter Property="FontSize" Value="11.5" />\r
             <Setter Property="VerticalAlignment" Value="Center" />\r
             <Setter Property="MinHeight" Value="22" />\r
         </Style>\r
@@ -360,50 +359,10 @@
                         </Button.Content>\r
 \r
                         <Button.ContextMenu>\r
-                            <ContextMenu x:Name="PresetSelectContextMenu" \r
-                                         PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}" \r
-                                         ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}">\r
+                            <ContextMenu x:Name="PresetSelectContextMenu" ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}">\r
                             </ContextMenu>\r
                         </Button.ContextMenu>\r
                     </Button>\r
-                    \r
-                    <!--<ComboBox ItemsSource="{Binding PresetsCategories}" SelectedItem="{Binding SelectedPresetCategory}" Width="150" DisplayMemberPath="Category"  Margin="5,0,0,0" VerticalAlignment="Center" />\r
-                    <ComboBox ItemsSource="{Binding CategoryPresets}" SelectedItem="{Binding SelectedPreset}" Width="250" Margin="10,0,0,0" VerticalAlignment="Center">\r
-                        <ComboBox.Resources>\r
-                            <Style TargetType="ToolTip">\r
-                                <Style.Resources>\r
-                                    <Style TargetType="ContentPresenter">\r
-                                        <Style.Resources>\r
-                                            <Style TargetType="TextBlock">\r
-                                                <Setter Property="TextWrapping" Value="Wrap" />\r
-                                            </Style>\r
-                                        </Style.Resources>\r
-                                    </Style>\r
-                                </Style.Resources>\r
-                                <Setter Property="MaxWidth" Value="400" />\r
-                            </Style>\r
-                        </ComboBox.Resources>\r
-                        \r
-                        <ComboBox.ItemTemplate>\r
-                            <DataTemplate>\r
-                                <StackPanel Orientation="Horizontal" ToolTip="{Binding Description}" ToolTipService.InitialShowDelay="1500">\r
-                                    <StackPanel.Resources>\r
-                                        <Style TargetType="TextBlock">\r
-                                            <Setter Property="FontStyle" Value="Normal" />\r
-                                            <Style.Triggers>\r
-                                                <DataTrigger Binding="{Binding Path=IsDefault}" Value="True">\r
-                                                    <Setter Property="FontStyle" Value="Italic" />\r
-                                                </DataTrigger>\r
-                                            </Style.Triggers>\r
-                                        </Style>\r
-\r
-                                    </StackPanel.Resources>\r
-                                    <TextBlock Text="{Binding Name}" />\r
-                                    <TextBlock Text="(Default)" Visibility="{Binding IsDefault, Converter={StaticResource boolToVisConverter}}" Margin="5,0,0,0" />\r
-                                </StackPanel>\r
-                            </DataTemplate>\r
-                        </ComboBox.ItemTemplate>\r
-                    </ComboBox>-->\r
 \r
                     <Button Content="Reload" cal:Message.Attach="[Event Click] = [Action PresetSelect]"  Margin="15,0,0,0" VerticalAlignment="Center" />\r
                     <Button Content="Save Custom Preset" cal:Message.Attach="[Event Click] = [Action PresetAdd]"  Margin="5,0,0,0" VerticalAlignment="Center" />\r
@@ -422,7 +381,7 @@
                         </Button.Content>\r
 \r
                         <Button.ContextMenu>\r
-                            <ContextMenu x:Name="MainContextMenu" PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}">\r
+                            <ContextMenu x:Name="MainContextMenu">\r
                                 <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
                                 <Separator />\r
                                 <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r