LinGui: add 8x8dct checkbox to match the other ui's

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1607 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 47 insertions, 8 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 752b4de95..33ecd5264 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -2025,6 +2025,10 @@ presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_
 		// truncated when set.  The range will be readjusted below
 		GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
 		gtk_range_set_range (GTK_RANGE(qp), 0, 100);
+		// Clear the audio list prior to changing the preset.  Existing audio
+		// can cause the container extension to be automatically changed when
+		// it shouldn't be
+		clear_audio_list(ud);
 		ghb_set_preset(ud, preset);
 		gint titleindex = ghb_settings_get_int(ud->settings, "title");
 		set_pref_audio(titleindex, ud);
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 4d7b03f1e..c51e04be7 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -3112,9 +3112,33 @@
                                             </child>
                                           </object>
                                           <packing>
+                                            <property name="expand">False</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment34">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="xscale">0</property>
+                                            <child>
+                                              <object class="GtkCheckButton" id="x264_8x8dct">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="tooltip-text" translatable="yes">High profile feature. Breaks picture into 8x8 blocks for analysis. Improves coding efficiency.</property>
+                                                <property name="label" translatable="yes">8x8dct</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
+                                                <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="position">3</property>
@@ -3833,7 +3857,7 @@ this setting.</property>
           <placeholder/>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkScrolledWindow" id="activity_scroll">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -3847,6 +3871,7 @@ this setting.</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="editable">False</property>
+                <property name="cursor-visible">False</property>
                 <property name="wrap_mode">GTK_WRAP_CHAR</property>
               </object>
             </child>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 2c1b09555..95d6b2df8 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1518,6 +1518,10 @@ ghb_build_x264opts_string(GHashTable *settings)
 		g_string_append_printf(x264opts, "analyse=%s:", 
 							   ghb_settings_get_string(settings, "x264_analyse"));
 	}
+	if (ghb_settings_get_bool(settings, "x264_8x8dct"))
+	{
+		g_string_append(x264opts, "8x8dct:");
+	}
 	if (analyse != 1) // != none
 	{
 		gint direct = ghb_settings_get_int(settings, "x264_direct");
diff --git a/gtk/src/internal_defaults b/gtk/src/internal_defaults
index 9c0731eef..4206e64c2 100644
--- a/gtk/src/internal_defaults
+++ b/gtk/src/internal_defaults
@@ -50,6 +50,7 @@ x264_options=
 x264_cabac=enable
 x264_deblock_beta=0
 x264_analyse=some
+x264_8x8dct=disable
 x264_bframes=0
 x264_no_dct_decimate=disable
 x264_subme=5
diff --git a/gtk/src/internal_defaults.h b/gtk/src/internal_defaults.h
index 2097454f5..ea62833f7 100644
--- a/gtk/src/internal_defaults.h
+++ b/gtk/src/internal_defaults.h
@@ -50,6 +50,7 @@
 "x264_cabac=enable\n"
 "x264_deblock_beta=0\n"
 "x264_analyse=some\n"
+"x264_8x8dct=disable\n"
 "x264_bframes=0\n"
 "x264_no_dct_decimate=disable\n"
 "x264_subme=5\n"
diff --git a/gtk/src/standard_presets b/gtk/src/standard_presets
index 0b4949648..3d1562495 100755
--- a/gtk/src/standard_presets
+++ b/gtk/src/standard_presets
@@ -51,9 +51,10 @@ x264_bpyramid=enable
 x264_me=umh
 x264_subme=5
 x264_analyse=all
+x264_8x8dct=enable
 x264_trellis=fmb
 x264_no_fast_pskip=enable
-x264_options=nr=150:filter=2,2:8x8dct
+x264_options=nr=150:filter=2,2
 vquality_type_bitrate=enable
 video_bitrate=1000
 video_target_size=700
@@ -128,10 +129,11 @@ x264_me=esa
 x264_merange=64
 x264_subme=7
 x264_analyse=all
+x264_8x8dct=enable
 x264_trellis=fmb
 x264_no_fast_pskip=enable
 x264_no_dct_decimate=enable
-x264_options=filter=-2,-1:8x8dct
+x264_options=filter=-2,-1
 vquality_type_bitrate=enable
 video_bitrate=1800
 video_target_size=700
@@ -198,8 +200,8 @@ x264_me=umh
 x264_subme=6
 x264_trellis=fmb
 x264_analyse=all
+x264_8x8dct=enable
 x264_no_fast_pskip=enable
-x264_options=8x8dct
 vquality_type_target=enable
 video_bitrate=1600
 video_target_size=695
@@ -264,7 +266,8 @@ x264_bpyramid=enable
 x264_me=umh
 x264_subme=6
 x264_analyse=all
-x264_options=filter=-2,-1:8x8dct
+x264_8x8dct=enable
+x264_options=filter=-2,-1
 vquality_type_constant=enable
 video_bitrate=2000
 video_target_size=700
@@ -301,9 +304,9 @@ x264_bpyramid=enable
 x264_me=umh
 x264_subme=7
 x264_analyse=all
+x264_8x8dct=enable
 x264_trellis=fmb
 x264_no_fast_pskip=enable
-x264_options=8x8dct
 vquality_type_bitrate=enable
 video_bitrate=1600
 video_target_size=700
@@ -342,9 +345,9 @@ x264_bpyramid=enable
 x264_me=umh
 x264_subme=7
 x264_analyse=all
+x264_8x8dct=enable
 x264_trellis=fmb
 x264_no_fast_pskip=enable
-x264_options=8x8dct
 vquality_type_bitrate=enable
 video_bitrate=1800
 video_target_size=700
@@ -617,9 +620,10 @@ x264_bpyramid=enable
 x264_me=umh
 x264_subme=6
 x264_analyse=all
+x264_8x8dct=enable
 x264_trellis=fmb
 x264_no_fast_pskip=enable
-x264_options=nr=150:8x8dct
+x264_options=nr=150
 vquality_type_bitrate=enable
 video_bitrate=1300
 video_target_size=700