diff options
Diffstat (limited to 'win/CS')
-rw-r--r-- | win/CS/HandBrakeWPF/Services/Presets/PresetService.cs | 2 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs index ea948344b..16db5359a 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs @@ -48,7 +48,7 @@ namespace HandBrakeWPF.Services.Presets #region Private Variables
public const int ForcePresetReset = 3;
- public static string UserPresetCatgoryName = "User Presets";
+ public static string UserPresetCatgoryName = "Custom Presets";
private readonly string presetFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly()), "presets.json");
private readonly ObservableCollection<IPresetObject> presets = new ObservableCollection<IPresetObject>(); // Can store Presets and PresetDisplayCategory objects.
private readonly Dictionary<string, Preset> flatPresetList = new Dictionary<string, Preset>();
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index d9aed5c98..57f2cb518 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -333,10 +333,24 @@ <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
<ComboBox ItemsSource="{Binding PresetsCategories}" SelectedItem="{Binding SelectedPresetCategory}" Width="150" DisplayMemberPath="Category" Margin="5,0,0,0" VerticalAlignment="Center" />
<ComboBox ItemsSource="{Binding CategoryPresets}" SelectedItem="{Binding SelectedPreset}" Width="250" Margin="10,0,0,0" VerticalAlignment="Center">
-
+ <ComboBox.Resources>
+ <Style TargetType="ToolTip">
+ <Style.Resources>
+ <Style TargetType="ContentPresenter">
+ <Style.Resources>
+ <Style TargetType="TextBlock">
+ <Setter Property="TextWrapping" Value="Wrap" />
+ </Style>
+ </Style.Resources>
+ </Style>
+ </Style.Resources>
+ <Setter Property="MaxWidth" Value="400" />
+ </Style>
+ </ComboBox.Resources>
+
<ComboBox.ItemTemplate>
<DataTemplate>
- <StackPanel Orientation="Horizontal">
+ <StackPanel Orientation="Horizontal" ToolTip="{Binding Description}" ToolTipService.InitialShowDelay="1500">
<StackPanel.Resources>
<Style TargetType="TextBlock">
<Setter Property="FontStyle" Value="Normal" />
|