]> granicus.if.org Git - handbrake/commitdiff
WinGui: Couple of UI Tweaks.
authorsr55 <sr55.hb@outlook.com>
Tue, 2 Feb 2016 19:41:36 +0000 (19:41 +0000)
committersr55 <sr55.hb@outlook.com>
Tue, 2 Feb 2016 19:41:36 +0000 (19:41 +0000)
win/CS/HandBrakeWPF/Converters/Options/LogLevelConverter.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
win/CS/HandBrakeWPF/Views/AudioView.xaml
win/CS/HandBrakeWPF/Views/MainView.xaml
win/CS/HandBrakeWPF/Views/OptionsView.xaml

diff --git a/win/CS/HandBrakeWPF/Converters/Options/LogLevelConverter.cs b/win/CS/HandBrakeWPF/Converters/Options/LogLevelConverter.cs
new file mode 100644 (file)
index 0000000..36fafef
--- /dev/null
@@ -0,0 +1,95 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogLevelConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the LogLevelConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Options
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    /// <summary>
+    /// The log level converter.
+    /// </summary>
+    public class LogLevelConverter : IValueConverter
+    {
+        /// <summary>
+        /// The convert.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The <see cref="object"/>.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value.GetType() == typeof(BindingList<int>))
+            {
+                return new List<string> { "Minimised", "Standard", "Extended" };
+            }
+            else if (value is int)
+            {
+                switch ((int)value)
+                {
+                    case 0:
+                        return "Minimised";
+                    case 2:
+                        return "Extended";
+                    default:
+                        return "Standard";
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// The convert back.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The <see cref="object"/>.
+        /// </returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            switch ((string)value)
+            {
+                case "Minimised":
+                    return 0;
+                case "Extended":
+                    return 2;
+                default:
+                case "Standard":
+                    return 1;
+            }
+        }
+    }
+}
index 4d09ded8fff2560db1b44a771674f2dfd0ea14e2..85328d6525f14f024bc2e0fcac82310da73aaf20 100644 (file)
     <Compile Include="Converters\Audio\AudioBehaviourConverter.cs" />\r
     <Compile Include="Converters\EnumToDescConverter.cs" />\r
     <Compile Include="Converters\Filters\DenoisePresetConverter.cs" />\r
+    <Compile Include="Converters\Options\LogLevelConverter.cs" />\r
     <Compile Include="Converters\Queue\PictureSettingsDescConveter.cs" />\r
     <Compile Include="Converters\Subtitles\SubtitleBurnInBehaviourConverter.cs" />\r
     <Compile Include="Converters\Subtitles\SubtitleBehaviourConverter.cs" />\r
index 7682123381460ddb72f55e832a32943087686532..0ecbb944653bb75cfb159d6c67489dfed8995858 100644 (file)
@@ -816,6 +816,15 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Open Source.\r
+        /// </summary>\r
+        public static string MainView_SourceOpen {\r
+            get {\r
+                return ResourceManager.GetString("MainView_SourceOpen", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Start Encode.\r
         /// </summary>\r
@@ -1078,7 +1087,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Enable DXVA Hardware Accelerated Decoding (Experimental)&quot;.\r
+        ///   Looks up a localized string similar to Enable DXVA Hardware Accelerated Decoding.\r
         /// </summary>\r
         public static string Options_DXVA {\r
             get {\r
index 79ef0cf6bb1c9300af07d86959c52b11badd569a..98acf368ec20557a69786b38d8a252981d83321e 100644 (file)
     <value>Disable LibDVDNav. (libdvdread will be used instead)</value>\r
   </data>\r
   <data name="Options_DXVA" xml:space="preserve">\r
-    <value>Enable DXVA Hardware Accelerated Decoding (Experimental)"</value>\r
+    <value>Enable DXVA Hardware Accelerated Decoding</value>\r
   </data>\r
   <data name="Options_Format" xml:space="preserve">\r
     <value>Format:</value>\r
   <data name="FiltersView_Rotate" xml:space="preserve">\r
     <value>Rotate:</value>\r
   </data>\r
+  <data name="MainView_SourceOpen" xml:space="preserve">\r
+    <value>Open Source</value>\r
+  </data>\r
 </root>
\ No newline at end of file
index 1fddda1bef0384da0694e05965d5a0bfa0b6441d..a0fa960f5d59dbbd6bd07c48b0377bc355975669 100644 (file)
 \r
                 <TextBlock Margin="15,0,5,0" Text="{x:Static Properties:ResourcesUI.AudioView_OtherwiseFallbackEncoder}" />\r
 \r
-                <ComboBox VerticalAlignment="Center" Width="105" Height="22" Margin="10,0,5,0">\r
+                <ComboBox VerticalAlignment="Center" Width="105" Height="22" Margin="5,0,5,0">\r
                     <ComboBox.SelectedItem>\r
                         <MultiBinding Converter="{StaticResource audioEncoderConverter}">\r
                             <Binding Path="Task.AllowedPassthruOptions.AudioEncoderFallback" />\r
index 7788275eb290788e927b6e537d4866f6fb122c7f..dc5256ed6d59badfa16af298e541e47b959c4246 100644 (file)
                                />\r
                         <Label Margin="8,0,0,0"\r
                                VerticalAlignment="Center"\r
-                               Content="{x:Static Properties:ResourcesUI.MainView_Source}"\r
+                               Content="{x:Static Properties:ResourcesUI.MainView_SourceOpen}"\r
                                />\r
                     </StackPanel>\r
                 </Button>\r
index 9766618d3dc178e50a8d8d095a84c9f5259781f0..61942c7f5109bfde159937eda5c24cd3764f0f36 100644 (file)
@@ -32,6 +32,8 @@
         <Options:OptionsTabConverter x:Key="tabConverter" />\r
         <Options:OptionsTabNameConverter x:Key="tabNameConverter" />\r
         <Converters:EnumComboConverter x:Key="enumComboConverter" />\r
+        <Options:LogLevelConverter x:Key="LogLevelConverter" />\r
+        \r
 \r
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />\r
 \r
                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
                             <StackPanel Orientation="Horizontal">\r
                                 <TextBlock Text="{x:Static Properties:ResourcesUI.Options_LogLevel}" Width="250" VerticalAlignment="Center" />\r
-                                <ComboBox Name="logVerbosityLevel" ItemsSource="{Binding LogVerbosityOptions}" SelectedItem="{Binding SelectedVerbosity}" Width="120" />\r
+                                <ComboBox Name="logVerbosityLevel" ItemsSource="{Binding LogVerbosityOptions, Converter={StaticResource LogLevelConverter}}" SelectedItem="{Binding SelectedVerbosity, Converter={StaticResource LogLevelConverter}}" Width="120" />\r
                             </StackPanel>\r
 \r
                             <CheckBox Content="{x:Static Properties:ResourcesUI.Options_CopyLogToEncDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToEncodeDirectory}" />\r
                             <CheckBox Content="{x:Static Properties:ResourcesUI.Options_CopyLogToDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToSepcficedLocation}" />\r
                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">\r
                                 <TextBlock Text="{x:Static Properties:ResourcesUI.Options_LogPath}" VerticalAlignment="Center" />\r
-                                <TextBox Width="120" Text="{Binding LogDirectory}" />\r
+                                <TextBox Width="380" Text="{Binding LogDirectory}" />\r
                                 <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseLogPath]" />\r
                             </StackPanel>\r
                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">\r