WinGui: Remove left over Advanced Tab checkbox

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index fe783e3b57fe1fa8275569aa618481f1df744342..438ccc251345103d247f81cc6a9b0bf19a4dc664 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -622,15 +622,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Use advanced options Tab for x264 settings..\r
-        /// </summary>\r
-        public static string Video_AdvancedOptions {\r
-            get {\r
-                return ResourceManager.GetString("Video_AdvancedOptions", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Set the average bitrate.\r
         ///\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.de.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.de.resx
index 71357544ef9288187a94db407d820b3b451fa8c3..05fe3fa0843047f81bbed1f155bb19e2f7cd106c 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.de.resx
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -218,9 +218,6 @@ Die tatsächlichen Abmessungen der Anzeige unterscheiden sich, wenn das Pixelsei
   <data name="QueueView_SendJobBack" xml:space="preserve">
     <value>Die Aufgabe an das Hauptfenster zur Bearbeitung zurücksenden.</value>
   </data>
-  <data name="Video_AdvancedOptions" xml:space="preserve">
-    <value>Den Tab der erweiterten x264-Einstellungen verwenden.</value>
-  </data>
   <data name="Video_AvgBitrate" xml:space="preserve">
     <value>Aktiviert durchschnittliche Bitrate.
 
@@ -462,4 +459,4 @@ Lapsharp's Abstimmung Sprite: Ist nützlich für 1-/4-/8-/16-bit 2D-Spiele. Spri
   <data name="MainView_StartPoint" xml:space="preserve">
     <value>Der Startpunkt für diesen Bereich.</value>
   </data>
-</root>
+</root>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
index 2d7d992187f92dd782e10a662da92ca60588ce30..5c8c2967adbdd7d5417d4fa864d1666bfb5005b7 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
@@ -219,9 +219,6 @@ The actual display dimensions will differ if the pixel aspect ratio is not 1:1.<
   <data name="QueueView_SendJobBack" xml:space="preserve">\r
     <value>Send the job back to the main window for editing.</value>\r
   </data>\r
-  <data name="Video_AdvancedOptions" xml:space="preserve">\r
-    <value>Use advanced options Tab for x264 settings.</value>\r
-  </data>\r
   <data name="Video_AvgBitrate" xml:space="preserve">\r
     <value>Set the average bitrate.\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 8aae5c9b8dad16ae63be3a18fbfc69be51046cba..ec0056f622ff4c4258e3e12adff6df2e05f448d6 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -124,18 +124,13 @@
             <!-- H264 settings -->\r
             <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,5,0,0">\r
                 <Grid.RowDefinitions>\r
-                    <RowDefinition Height="Auto" />\r
                     <RowDefinition Height="Auto" />\r
                     <RowDefinition Height="*" />\r
                 </Grid.RowDefinitions>\r
 \r
                 <TextBlock Text="{x:Static Properties:Resources.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />\r
 \r
-                <CheckBox Content="Use Legacy Advanced Tab" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"\r
-                          Visibility="{Binding IsAdvancedTabOptionEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"\r
-                          ToolTip="{x:Static Properties:ResourcesTooltips.Video_AdvancedOptions}" />\r
-\r
-                <Grid Grid.Row="2" Margin="0,8,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}">\r
+                <Grid Grid.Row="1" Margin="0,8,0,0">\r
                     <Grid.RowDefinitions>\r
                         <RowDefinition Height="Auto" />\r
                         <RowDefinition Height="Auto" />\r