LinGui: move the picture filters to the preview window.

and tidy up the picture tab.

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

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 6e013342a0c527b4a03c0c0de1239a4da0b9a6b8..e1abfd492624b8622439f86ee60ab88e3ca63ad7 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -885,16 +885,24 @@
                     <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="spacing">3</property>
+
+                    <child>
+                      <object class="GtkAlignment" id="alignment_a">
+                        <property name="visible">True</property>
+                        <property name="top_padding">10</property>
+                        <property name="left_padding">10</property>
+
                     <child>
                       <object class="GtkVBox" id="vbox5">
                         <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="spacing">14</property>
                         <child>
                           <object class="GtkFrame" id="frame5">
                             <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="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <object class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
@@ -1020,7 +1028,7 @@
                             <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="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <object class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
@@ -1145,7 +1153,7 @@
                                 <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="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment7">
                                     <property name="visible">True</property>
@@ -1264,259 +1272,92 @@
                         </child>
                       </object>
                     </child>
+
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+
+                    <child>
+                      <object class="GtkAlignment" id="alignment_b">
+                        <property name="visible">True</property>
+                        <property name="right_padding">10</property>
+
                     <child>
                       <object class="GtkVBox" id="vbox9">
                         <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>
                         <child>
-                          <object class="GtkFrame" id="frame4">
+                          <object class="GtkLabel" id="label8">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+
+                        <child>
+                          <object class="GtkFrame" id="frame8">
                             <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="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                            <property name="shadow_type">etched-in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment8">
+                              <object class="GtkAlignment" id="alignment19">
                                 <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="top_padding">2</property>
-                                <property name="bottom_padding">2</property>
-                                <property name="left_padding">12</property>
+                                <property name="bottom_padding">4</property>
+                                <property name="left_padding">4</property>
+                                <property name="right_padding">4</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox10">
+                                  <object class="GtkImage" id="preview_button_image">
+                                    <property name="width_request">240</property>
+                                    <property name="height_request">120</property>
                                     <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>
-                                    <child>
-                                      <object class="GtkCheckButton" id="VideoGrayScale">
-                                        <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">This filter removes the color components of the picture.</property>
-                                        <property name="label" translatable="yes">Grayscale</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="PictureDetelecine">
-                                        <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">Remove interlacing artifacts caused by the telecine process often applied to movies.</property>
-                                        <property name="label" translatable="yes">Detelecine</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                        <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                      </object>
-                                      <packing>
-                                        <property name="position">1</property>
-                                        <property name="expand">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="PictureDecomb">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip-text" translatable="yes">Decomb is a selective deinterlacer. It will only deinterlace frames that appear to need it. It generally produces better quality than the normal deinterlacer.</property>
-                                        <property name="label" translatable="yes">De-Comb</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                        <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox25">
-                                        <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label41">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Deblock:</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment20">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0.55</property>
-                                            <child>
-                                              <object class="GtkHScale" id="PictureDeblock">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="tooltip-text" translatable="yes">This is a filter that gets applied before encoding.  If the source looks blocky before encoding, you may want to use this.</property>
-                                                <property name="adjustment">adjustment20</property>
-                                                <property name="digits">0</property>
-                                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="setting_widget_changed_cb" name="value_changed"/>
-                                                <signal handler="format_deblock_cb" name="format-value"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox12">
-                                        <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>
-                                        <child>
-                                          <object class="GtkLabel" id="label20">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="selectable">False</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="label" translatable="yes">Deinterlace:</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" id="PictureDeinterlace">
-                                            <property name="width_request">100</property>
-                                            <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="tooltip-text" translatable="yes">Removes interlacing artifacts. Since deinterlacing degrades picture quality, leave it off unless you know you need it.</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace">
-                                            <property name="visible">False</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <child internal-child="entry">
-                                              <object class="GtkEntry" id="comboboxentry-entry1">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="width_chars">15</property>
-                                                <signal handler="deint_tweak_focus_out_cb" name="focus_out_event"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="padding">2</property>
-                                        <property name="position">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox13">
-                                        <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>
-                                        <child>
-                                          <object class="GtkLabel" id="label21">
-                                            <property name="visible">True</property>
-                                            <property name="selectable">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="label" translatable="yes">Denoise:</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" id="PictureDenoise">
-                                            <property name="width_request">100</property>
-                                            <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="tooltip-text" translatable="yes">This filter removes noise or grain from the picture.</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxEntry" id="tweak_PictureDenoise">
-                                            <property name="visible">False</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <child internal-child="entry">
-                                              <object class="GtkEntry" id="comboboxentry-entry2">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="width_chars">15</property>
-                                                <signal handler="denoise_tweak_focus_out_cb" name="focus_out_event"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="padding">2</property>
-                                        <property name="position">5</property>
-                                      </packing>
-                                    </child>
+                                    <property name="icon_name">hb-icon</property>
+                                    <property name="icon-size">6</property>
+                                    <signal name="size_allocate" handler="preview_button_size_allocate_cb"/>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="label22">
+                              <object class="GtkLabel" id="label21">
                                 <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="label" translatable="yes">&lt;b&gt;Picture Cleanup&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
+
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="padding">2</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
+
+
                         <child>
-                          <object class="GtkVBox" id="vbox16">
+                          <object class="GtkButton" id="preview_button">
+                            <property name="width_request">118</property>
                             <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="relief">half</property>
+                            <signal name="clicked" handler="preview_button_clicked_cb"/>
                             <child>
-                              <object class="GtkHBox" id="hbox56">
+                              <object class="GtkHBox" id="hbox7">
                                 <property name="visible">True</property>
+                                <property name="spacing">4</property>
                                 <child>
-                                  <object class="GtkLabel" id="label69">
+                                  <object class="GtkLabel" id="previewlabel1">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.75999999046325684</property>
-                                    <property name="yalign">1</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Preview:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Full Size Preview:</property>
+                                    <property name="justify">right</property>
                                   </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="preview_dims">
@@ -1527,54 +1368,39 @@
                                     <property name="label" translatable="yes">--</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                             </child>
+
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">1</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox35">
+                          <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
-                            <child>
-                              <object class="GtkButton" id="preview_button">
-                                <property name="width_request">118</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip-text" translatable="yes">Open the full size preview</property>
-                                <property name="relief">GTK_RELIEF_HALF</property>
-                                <signal handler="preview_button_clicked_cb" name="clicked"/>
-                                <signal handler="preview_button_size_allocate_cb" name="size_allocate"/>
-                                <child>
-                                  <object class="GtkHBox" id="hbox49">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <object class="GtkImage" id="preview_button_image">
-                                        <property name="visible">True</property>
-                                        <property name="icon_size">6</property>
-                                        <property name="icon_name">hb-icon</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
                           </object>
                           <packing>
-                            <property name="position">2</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
+                    </child>
+
+                      </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
+
                   </object>
                 </child>
                 <child type="tab">
@@ -4185,6 +4011,40 @@ location as the movie.</property>
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Frame&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="preview_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">2</property>
+                    <property name="has_frame">False</property>
+                    <property name="shadow_type">none</property>
+                    <property name="adjustment">adjustment19</property>
+                    <property name="numeric">True</property>
+                    <signal name="value_changed" handler="preview_frame_value_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -4610,48 +4470,222 @@ the other to maintain the video's original aspect ratio.</property>
               <object class="GtkVBox" id="vbox42">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment6">
+                  <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
-                    <property name="xscale">0</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">etched-out</property>
                     <child>
-                      <object class="GtkHBox" id="hbox45">
+                      <object class="GtkAlignment" id="alignment8">
                         <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="top_padding">2</property>
+                        <property name="bottom_padding">2</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkLabel" id="label18">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Frame&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="preview_frame">
+                          <object class="GtkVBox" id="vbox10">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">View other frames</property>
-                            <property name="max_length">2</property>
-                            <property name="has_frame">False</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
-                            <property name="adjustment">adjustment19</property>
-                            <property name="numeric">True</property>
-                            <signal handler="preview_frame_value_changed_cb" name="value_changed"/>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <child>
+                              <object class="GtkCheckButton" id="VideoGrayScale">
+                                <property name="label" translatable="yes">Grayscale</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="PictureDetelecine">
+                                <property name="label" translatable="yes">Detelecine</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="PictureDecomb">
+                                <property name="label" translatable="yes">De-Comb</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox25">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label41">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Deblock:</property>
+                                    <property name="width_chars">10</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment20">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="xscale">0.55000001192092896</property>
+                                    <child>
+                                      <object class="GtkHScale" id="PictureDeblock">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="adjustment">adjustment20</property>
+                                        <property name="digits">0</property>
+                                        <property name="value_pos">right</property>
+                                        <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                                        <signal name="format_value" handler="format_deblock_cb"/>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox12">
+                                <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>
+                                <child>
+                                  <object class="GtkLabel" id="label20">
+                                    <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="xalign">0</property>
+                                    <property name="label" translatable="yes">Deinterlace:</property>
+                                    <property name="width_chars">10</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="PictureDeinterlace">
+                                    <property name="width_request">100</property>
+                                    <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>
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                    <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace">
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">2</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox13">
+                                <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>
+                                <child>
+                                  <object class="GtkLabel" id="label21">
+                                    <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="label" translatable="yes">Denoise:</property>
+                                    <property name="selectable">True</property>
+                                    <property name="width_chars">10</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="PictureDenoise">
+                                    <property name="width_request">100</property>
+                                    <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>
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                    <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBoxEntry" id="tweak_PictureDenoise">
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">2</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label22">
+                        <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="label" translatable="yes">&lt;b&gt;Picture Filters&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="padding">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="position">2</property>

diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index a4dfcdd5ac2014fa73e77ad34b5cf92308e90608..c598c123a58b4ff91e087d0005fbcc9356e999c7 100644 (file)
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -587,7 +587,7 @@ ghb_set_preview_image(signal_user_data_t *ud)
        g_free(text);
        
        g_debug("preview %d x %d", preview_width, preview_height);
-       target_height = MIN(ud->preview->button_height - 12, 128);
+       target_height = MIN(ud->preview->button_height, 128);
        height = target_height;
        width = preview_width * height / preview_height;
 

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 7631d0249bdec25bcf1cd6e62c1cf899512e6e6e..4392d75fc93175caec283665b3a9f5400002d0de 100644 (file)
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -1351,6 +1351,17 @@
 "DK_BUTTON_RELEASE_MASK</property>\n"
 "                    <property name="spacing">3</prop"
 "erty>\n"
+"\n"
+"                    <child>\n"
+"                      <object class="GtkAlignment" id=&quo"
+"t;alignment_a">\n"
+"                        <property name="visible">True&l"
+"t;/property>\n"
+"                        <property name="top_padding">10"
+"</property>\n"
+"                        <property name="left_padding">1"
+"0</property>\n"
+"\n"
 "                    <child>\n"
 "                      <object class="GtkVBox" id="vbo"
 "x5">\n"
@@ -1359,6 +1370,8 @@
 "                        <property name="events">GDK_POI"
 "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
 " | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                      <property name="spacing">14</pr"
+"operty>\n"
 "                        <child>\n"
 "                          <object class="GtkFrame" id=&quo"
 "t;frame5">\n"
@@ -1370,7 +1383,7 @@
 "                            <property name="label_xalign"&"
 "gt;0</property>\n"
 "                            <property name="shadow_type"&g"
-"t;GTK_SHADOW_ETCHED_OUT</property>\n"
+"t;GTK_SHADOW_NONE</property>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
 " id="alignment9">\n"
@@ -1579,7 +1592,7 @@
 "                            <property name="label_xalign"&"
 "gt;0</property>\n"
 "                            <property name="shadow_type"&g"
-"t;GTK_SHADOW_ETCHED_OUT</property>\n"
+"t;GTK_SHADOW_NONE</property>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
 " id="alignment5">\n"
@@ -1781,7 +1794,7 @@
 "                                <property name="label_xalign&qu"
 "ot;>0</property>\n"
 "                                <property name="shadow_type&quo"
-"t;>GTK_SHADOW_ETCHED_OUT</property>\n"
+"t;>GTK_SHADOW_NONE</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkAlignment&q"
 "uot; id="alignment7">\n"
@@ -1963,6 +1976,22 @@
 "                        </child>\n"
 "                      </object>\n"
 "                    </child>\n"
+"\n"
+"                      </object>\n"
+"                      <packing>\n"
+"                        <property name="position">0<"
+"/property>\n"
+"                      </packing>\n"
+"                    </child>\n"
+"\n"
+"                    <child>\n"
+"                      <object class="GtkAlignment" id=&quo"
+"t;alignment_b">\n"
+"                        <property name="visible">True&l"
+"t;/property>\n"
+"                        <property name="right_padding">"
+"10</property>\n"
+"\n"
 "                    <child>\n"
 "                      <object class="GtkVBox" id="vbo"
 "x9">\n"
@@ -1972,8 +2001,210 @@
 "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
 " | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                        <child>\n"
+"                          <object class="GtkLabel" id=&quo"
+"t;label8">\n"
+"                            <property name="visible">Tr"
+"ue</property>\n"
+"                          </object>\n"
+"                          <packing>\n"
+"                            <property name="position">0"
+"</property>\n"
+"                          </packing>\n"
+"                        </child>\n"
+"\n"
+"                        <child>\n"
+"                          <object class="GtkFrame" id=&quo"
+"t;frame8">\n"
+"                            <property name="visible">Tr"
+"ue</property>\n"
+"                            <property name="label_xalign"&"
+"gt;0</property>\n"
+"                            <property name="shadow_type"&g"
+"t;etched-in</property>\n"
+"                            <child>\n"
+"                              <object class="GtkAlignment""
+" id="alignment19">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="bottom_padding&"
+"quot;>4</property>\n"
+"                                <property name="left_padding&qu"
+"ot;>4</property>\n"
+"                                <property name="right_padding&q"
+"uot;>4</property>\n"
+"                                <child>\n"
+"                                  <object class="GtkImage""
+" id="preview_button_image">\n"
+"                                    <property name="width_reque"
+"st">240</property>\n"
+"                                    <property name="height_requ"
+"est">120</property>\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="icon_name&q"
+"uot;>hb-icon</property>\n"
+"                                    <property name="icon-size&q"
+"uot;>6</property>\n"
+"                                    <signal name="size_allocate"
+"" handler="preview_button_size_allocate_cb"/>\n"
+"                                  </object>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                            </child>\n"
+"                            <child type="label">\n"
+"                              <object class="GtkLabel" id="
+""label21">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="use_markup&quot"
+";>True</property>\n"
+"                              </object>\n"
+"                            </child>\n"
+"\n"
+"                          </object>\n"
+"                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
+"                            <property name="fill">False"
+"</property>\n"
+"                            <property name="position">1"
+"</property>\n"
+"                          </packing>\n"
+"                        </child>\n"
+"\n"
+"\n"
+"                        <child>\n"
+"                          <object class="GtkButton" id=&qu"
+"ot;preview_button">\n"
+"                            <property name="width_request""
+">118</property>\n"
+"                            <property name="visible">Tr"
+"ue</property>\n"
+"                            <property name="can_focus">"
+"True</property>\n"
+"                            <property name="receives_default&qu"
+"ot;>True</property>\n"
+"                            <property name="relief">hal"
+"f</property>\n"
+"                            <signal name="clicked" handler"
+"="preview_button_clicked_cb"/>\n"
+"                            <child>\n"
+"                              <object class="GtkHBox" id=&"
+"quot;hbox7">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="spacing"&g"
+"t;4</property>\n"
+"                                <child>\n"
+"                                  <object class="GtkLabel""
+" id="previewlabel1">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="label""
+" translatable="yes">Full Size Preview:</property>\n"
+"                                    <property name="justify&quo"
+"t;>right</property>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>True</property>\n"
+"                                    <property name="position&qu"
+"ot;>0</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkLabel""
+" id="preview_dims">\n"
+"                                    <property name="width_reque"
+"st">85</property>\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="xalign&quot"
+";>0.20999999344348907</property>\n"
+"                                    <property name="yalign&quot"
+";>0</property>\n"
+"                                    <property name="label""
+" translatable="yes">--</property>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>True</property>\n"
+"                                    <property name="position&qu"
+"ot;>1</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                            </child>\n"
+"\n"
+"                          </object>\n"
+"                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
+"                            <property name="fill">False"
+"</property>\n"
+"                            <property name="position">2"
+"</property>\n"
+"                          </packing>\n"
+"                        </child>\n"
+"                        <child>\n"
+"                          <object class="GtkLabel" id=&quo"
+"t;label8">\n"
+"                            <property name="visible">Tr"
+"ue</property>\n"
+"                          </object>\n"
+"                          <packing>\n"
+"                            <property name="position">3"
+"</property>\n"
+"                          </packing>\n"
+"                        </child>\n"
+"                      </object>\n"
+"                    </child>\n"
+"\n"
+"                      </object>\n"
+"                      <packing>\n"
+"                        <property name="expand">False&l"
+"t;/property>\n"
+"                        <property name="fill">False<"
+"/property>\n"
+"                        <property name="position">1<"
+"/property>\n"
+"                      </packing>\n"
+"                    </child>\n"
+"\n"
+"                  </object>\n"
+"                </child>\n"
+"                <child type="tab">\n"
+"                  <object class="GtkLabel" id="pictur"
+"e_label">\n"
+"                    <property name="visible">True</p"
+"roperty>\n"
+"                    <property name="label" translatable=&q"
+"uot;yes">Picture</property>\n"
+"                  </object>\n"
+"                  <packing>\n"
+"                    <property name="tab_fill">False<"
+"/property>\n"
+"                  </packing>\n"
+"                </child>\n"
+"                <child>\n"
+"                  <object class="GtkHBox" id="hbox17&"
+"quot;>\n"
+"                    <property name="visible">True</p"
+"roperty>\n"
+"                    <property name="events">GDK_POINTER"
+"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G"
+"DK_BUTTON_RELEASE_MASK</property>\n"
+"                    <child>\n"
+"                      <object class="GtkVBox" id="vbo"
+"x12">\n"
+"                        <property name="visible">True&l"
+"t;/property>\n"
+"                        <property name="events">GDK_POI"
+"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
+" | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                        <child>\n"
 "                          <object class="GtkFrame" id=&quo"
-"t;frame4">\n"
+"t;Encoding1">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -1985,7 +2216,7 @@
 "t;GTK_SHADOW_ETCHED_OUT</property>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
-" id="alignment8">\n"
+" id="alignment10">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -1999,113 +2230,96 @@
 "ot;>12</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkVBox" "
-"id="vbox10">\n"
+"id="vbox13">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
 ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                    <property name="spacing&quo"
+"t;>2</property>\n"
 "                                    <child>\n"
-"                                      <object class="GtkCheckBu"
-"tton" id="VideoGrayScale">\n"
+"                                      <object class="GtkHBox&qu"
+"ot; id="hbox18">\n"
 "                                        <property name="visible"
 "">True</property>\n"
-"                                        <property name="can_foc"
-"us">True</property>\n"
 "                                        <property name="events&"
 "quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="tooltip"
-"-text" translatable="yes">This filter removes the col"
-"or components of the picture.</property>\n"
-"                                        <property name="label&q"
-"uot; translatable="yes">Grayscale</property>\n"
-"                                        <property name="draw_in"
-"dicator">True</property>\n"
-"                                        <signal handler="settin"
-"g_widget_changed_cb" name="toggled"/>\n"
-"                                      </object>\n"
-"                                      <packing>\n"
-"                                        <property name="positio"
-"n">0</property>\n"
-"                                      </packing>\n"
-"                                    </child>\n"
-"                                    <child>\n"
-"                                      <object class="GtkCheckBu"
-"tton" id="PictureDetelecine">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="can_foc"
-"us">True</property>\n"
-"                                        <property name="events&"
-"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="tooltip"
-"-text" translatable="yes">Remove interlacing artifact"
-"s caused by the telecine process often applied to movies.</property&"
-"gt;\n"
-"                                        <property name="label&q"
-"uot; translatable="yes">Detelecine</property>\n"
-"                                        <property name="draw_in"
-"dicator">True</property>\n"
-"                                        <signal handler="settin"
-"g_widget_changed_cb" name="toggled"/>\n"
-"                                        <signal handler="tweak_"
-"setting_cb" name="button-press-event"/>\n"
-"                                      </object>\n"
-"                                      <packing>\n"
-"                                        <property name="positio"
-"n">1</property>\n"
-"                                        <property name="expand&"
-"quot;>False</property>\n"
-"                                      </packing>\n"
-"                                    </child>\n"
-"                                    <child>\n"
-"                                      <object class="GtkCheckBu"
-"tton" id="PictureDecomb">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="can_foc"
-"us">True</property>\n"
-"                                        <property name="tooltip"
-"-text" translatable="yes">Decomb is a selective deint"
-"erlacer. It will only deinterlace frames that appear to need it. It gen"
-"erally produces better quality than the normal deinterlacer.</proper"
-"ty>\n"
-"                                        <property name="label&q"
-"uot; translatable="yes">De-Comb</property>\n"
-"                                        <property name="active&"
-"quot;>True</property>\n"
-"                                        <property name="draw_in"
-"dicator">True</property>\n"
-"                                        <signal handler="settin"
-"g_widget_changed_cb" name="toggled"/>\n"
-"                                        <signal handler="tweak_"
-"setting_cb" name="button-press-event"/>\n"
+"                                        <child>\n"
+"                                          <object class="GtkLab"
+"el" id="label28">\n"
+"                                            <property name="vis"
+"ible">True</property>\n"
+"                                            <property name="xal"
+"ign">0</property>\n"
+"                                            <property name="lab"
+"el" translatable="yes">Video Codec:</property>\n"
+"                                            <property name="wid"
+"th_chars">11</property>\n"
+"                                          </object>\n"
+"                                          <packing>\n"
+"                                            <property name="exp"
+"and">False</property>\n"
+"                                          </packing>\n"
+"                                        </child>\n"
+"                                        <child>\n"
+"                                          <object class="GtkAli"
+"gnment" id="alignment11">\n"
+"                                            <property name="vis"
+"ible">True</property>\n"
+"                                            <property name="eve"
+"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
+"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                            <property name="xal"
+"ign">0</property>\n"
+"                                            <property name="xsc"
+"ale">0</property>\n"
+"                                            <child>\n"
+"                                              <object class="Gt"
+"kComboBox" id="VideoEncoder">\n"
+"                                                <property name=&quot"
+";visible">True</property>\n"
+"                                                <signal handler=&quo"
+"t;vcodec_changed_cb" name="changed"/>\n"
+"                                              </object>\n"
+"                                            </child>\n"
+"                                          </object>\n"
+"                                          <packing>\n"
+"                                            <property name="pad"
+"ding">4</property>\n"
+"                                            <property name="pos"
+"ition">1</property>\n"
+"                                          </packing>\n"
+"                                        </child>\n"
 "                                      </object>\n"
 "                                      <packing>\n"
 "                                        <property name="expand&"
 "quot;>False</property>\n"
-"                                        <property name="positio"
-"n">2</property>\n"
 "                                      </packing>\n"
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox25">\n"
+"ot; id="hbox19">\n"
 "                                        <property name="visible"
 "">True</property>\n"
+"                                        <property name="events&"
+"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
+"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
 "                                          <object class="GtkLab"
-"el" id="label41">\n"
+"el" id="label29">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
+"                                            <property name="eve"
+"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
+"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                            <property name="xal"
 "ign">0</property>\n"
 "                                            <property name="lab"
-"el" translatable="yes">Deblock:</property>\n"
+"el" translatable="yes">Framerate:</property>\n"
 "                                            <property name="wid"
-"th_chars">10</property>\n"
+"th_chars">11</property>\n"
 "                                          </object>\n"
 "                                          <packing>\n"
 "                                            <property name="exp"
@@ -2114,255 +2328,121 @@
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkAli"
-"gnment" id="alignment20">\n"
+"gnment" id="alignment12">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
+"                                            <property name="eve"
+"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
+"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                            <property name="xal"
 "ign">0</property>\n"
 "                                            <property name="xsc"
-"ale">0.55</property>\n"
+"ale">0</property>\n"
 "                                            <child>\n"
 "                                              <object class="Gt"
-"kHScale" id="PictureDeblock">\n"
+"kComboBox" id="VideoFramerate">\n"
 "                                                <property name=&quot"
 ";visible">True</property>\n"
 "                                                <property name=&quot"
-";can_focus">True</property>\n"
-"                                                <property name=&quot"
-";tooltip-text" translatable="yes">This is a filter th"
-"at gets applied before encoding.  If the source looks blocky before enc"
-"oding, you may want to use this.</property>\n"
-"                                                <property name=&quot"
-";adjustment">adjustment20</property>\n"
-"                                                <property name=&quot"
-";digits">0</property>\n"
-"                                                <property name=&quot"
-";value_pos">GTK_POS_RIGHT</property>\n"
-"                                                <signal handler=&quo"
-"t;setting_widget_changed_cb" name="value_changed"/>\n"
+";events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK"
+" | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                                <signal handler=&quo"
-"t;format_deblock_cb" name="format-value"/>\n"
+"t;setting_widget_changed_cb" name="changed"/>\n"
 "                                              </object>\n"
 "                                            </child>\n"
 "                                          </object>\n"
 "                                          <packing>\n"
+"                                            <property name="pad"
+"ding">4</property>\n"
 "                                            <property name="pos"
 "ition">1</property>\n"
 "                                          </packing>\n"
 "                                        </child>\n"
 "                                      </object>\n"
 "                                      <packing>\n"
+"                                        <property name="expand&"
+"quot;>False</property>\n"
 "                                        <property name="positio"
-"n">3</property>\n"
+"n">1</property>\n"
 "                                      </packing>\n"
 "                                    </child>\n"
 "                                    <child>\n"
-"                                      <object class="GtkHBox&qu"
-"ot; id="hbox12">\n"
+"                                      <object class="GtkCheckBu"
+"tton" id="VideoTwoPass">\n"
 "                                        <property name="visible"
 "">True</property>\n"
+"                                        <property name="can_foc"
+"us">True</property>\n"
 "                                        <property name="events&"
 "quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <child>\n"
-"                                          <object class="GtkLab"
-"el" id="label20">\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="can"
-"_focus">True</property>\n"
-"                                            <property name="sel"
-"ectable">False</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="xal"
-"ign">0</property>\n"
-"                                            <property name="lab"
-"el" translatable="yes">Deinterlace:</property>\n"
-"                                            <property name="wid"
-"th_chars">10</property>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                        <child>\n"
-"                                          <object class="GtkCom"
-"boBox" id="PictureDeinterlace">\n"
-"                                            <property name="wid"
-"th_request">100</property>\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="tooltip"
-"-text" translatable="yes">Removes interlacing artifac"
-"ts. Since deinterlacing degrades picture quality, leave it off unless y"
-"ou know you need it.</property>\n"
-"                                            <signal handler="se"
-"tting_widget_changed_cb" name="changed"/>\n"
-"                                            <signal handler="tw"
-"eak_setting_cb" name="button-press-event"/>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                            <property name="pos"
-"ition">1</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                        <child>\n"
-"                                          <object class="GtkCom"
-"boBoxEntry" id="tweak_PictureDeinterlace">\n"
-"                                            <property name="vis"
-"ible">False</property>\n"
-"                                            <signal handler="se"
-"tting_widget_changed_cb" name="changed"/>\n"
-"                                            <child internal-child=&q"
-"uot;entry">\n"
-"                                              <object class="Gt"
-"kEntry" id="comboboxentry-entry1">\n"
-"                                                <property name=&quot"
-";visible">True</property>\n"
-"                                                <property name=&quot"
-";can_focus">True</property>\n"
-"                                                <property name=&quot"
-";width_chars">15</property>\n"
-"                                                <signal handler=&quo"
-"t;deint_tweak_focus_out_cb" name="focus_out_event"/>\n"
-"                                              </object>\n"
-"                                            </child>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                            <property name="pos"
-"ition">2</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
+"                                        <property name="label&q"
+"uot; translatable="yes">2-Pass Encoding</property>\n"
+"                                        <property name="draw_in"
+"dicator">True</property>\n"
+"                                        <signal handler="settin"
+"g_widget_changed_cb" name="toggled"/>\n"
 "                                      </object>\n"
 "                                      <packing>\n"
-"                                        <property name="expand&"
-"quot;>False</property>\n"
-"                                        <property name="padding"
-"">2</property>\n"
 "                                        <property name="positio"
-"n">4</property>\n"
+"n">2</property>\n"
 "                                      </packing>\n"
 "                                    </child>\n"
 "                                    <child>\n"
-"                                      <object class="GtkHBox&qu"
-"ot; id="hbox13">\n"
+"                                      <object class="GtkAlignme"
+"nt" id="alignment13">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
 "quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                        <property name="xscale&"
+"quot;>0.23999999463558197</property>\n"
 "                                        <child>\n"
-"                                          <object class="GtkLab"
-"el" id="label21">\n"
+"                                          <object class="GtkChe"
+"ckButton" id="VideoTurboTwoPass">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
-"                                            <property name="sel"
-"ectable">True</property>\n"
+"                                            <property name="can"
+"_focus">True</property>\n"
 "                                            <property name="eve"
 "nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
 "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="xal"
-"ign">0</property>\n"
 "                                            <property name="lab"
-"el" translatable="yes">Denoise:</property>\n"
-"                                            <property name="wid"
-"th_chars">10</property>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                        <child>\n"
-"                                          <object class="GtkCom"
-"boBox" id="PictureDenoise">\n"
-"                                            <property name="wid"
-"th_request">100</property>\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="tooltip"
-"-text" translatable="yes">This filter removes noise o"
-"r grain from the picture.</property>\n"
-"                                            <signal handler="se"
-"tting_widget_changed_cb" name="changed"/>\n"
-"                                            <signal handler="tw"
-"eak_setting_cb" name="button-press-event"/>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                            <property name="pos"
-"ition">1</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                        <child>\n"
-"                                          <object class="GtkCom"
-"boBoxEntry" id="tweak_PictureDenoise">\n"
-"                                            <property name="vis"
-"ible">False</property>\n"
+"el" translatable="yes">Turbo First Pass</property&"
+"gt;\n"
+"                                            <property name="act"
+"ive">True</property>\n"
+"                                            <property name="dra"
+"w_indicator">True</property>\n"
 "                                            <signal handler="se"
-"tting_widget_changed_cb" name="changed"/>\n"
-"                                            <child internal-child=&q"
-"uot;entry">\n"
-"                                              <object class="Gt"
-"kEntry" id="comboboxentry-entry2">\n"
-"                                                <property name=&quot"
-";visible">True</property>\n"
-"                                                <property name=&quot"
-";can_focus">True</property>\n"
-"                                                <property name=&quot"
-";width_chars">15</property>\n"
-"                                                <signal handler=&quo"
-"t;denoise_tweak_focus_out_cb" name="focus_out_event"/&gt"
-";\n"
-"                                              </object>\n"
-"                                            </child>\n"
+"tting_widget_changed_cb" name="toggled"/>\n"
 "                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                            <property name="pos"
-"ition">2</property>\n"
-"                                          </packing>\n"
 "                                        </child>\n"
 "                                      </object>\n"
 "                                      <packing>\n"
-"                                        <property name="expand&"
-"quot;>False</property>\n"
-"                                        <property name="padding"
-"">2</property>\n"
 "                                        <property name="positio"
-"n">5</property>\n"
+"n">3</property>\n"
 "                                      </packing>\n"
 "                                    </child>\n"
+"                                    <child>\n"
+"                                      <placeholder/>\n"
+"                                    </child>\n"
 "                                  </object>\n"
 "                                </child>\n"
 "                              </object>\n"
 "                            </child>\n"
 "                            <child type="label">\n"
 "                              <object class="GtkLabel" id="
-""label22">\n"
+""label30">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="label" tra"
-"nslatable="yes"><b>Picture Cleanup</b"
-"></property>\n"
+"nslatable="yes"><b>Encoding</b&gt"
+";</property>\n"
 "                                <property name="use_markup&quot"
 ";>True</property>\n"
 "                              </object>\n"
@@ -2376,151 +2456,27 @@
 "                          </packing>\n"
 "                        </child>\n"
 "                        <child>\n"
-"                          <object class="GtkVBox" id=&quot"
-";vbox16">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <child>\n"
-"                              <object class="GtkHBox" id=&"
-"quot;hbox56">\n"
-"                                <property name="visible"&g"
-"t;True</property>\n"
-"                                <child>\n"
-"                                  <object class="GtkLabel""
-" id="label69">\n"
-"                                    <property name="visible&quo"
-"t;>True</property>\n"
-"                                    <property name="xalign&quot"
-";>0.75999999046325684</property>\n"
-"                                    <property name="yalign&quot"
-";>1</property>\n"
-"                                    <property name="label""
-" translatable="yes"><b>Preview:</b&am"
-"p;gt;</property>\n"
-"                                    <property name="use_markup&"
-"quot;>True</property>\n"
-"                                  </object>\n"
-"                                </child>\n"
-"                                <child>\n"
-"                                  <object class="GtkLabel""
-" id="preview_dims">\n"
-"                                    <property name="width_reque"
-"st">85</property>\n"
-"                                    <property name="visible&quo"
-"t;>True</property>\n"
-"                                    <property name="xalign&quot"
-";>0.20999999344348907</property>\n"
-"                                    <property name="yalign&quot"
-";>0</property>\n"
-"                                    <property name="label""
-" translatable="yes">--</property>\n"
-"                                  </object>\n"
-"                                  <packing>\n"
-"                                    <property name="position&qu"
-"ot;>1</property>\n"
-"                                  </packing>\n"
-"                                </child>\n"
-"                              </object>\n"
-"                            </child>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                            <property name="position">1"
-"</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkHBox" id=&quot"
-";hbox35">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <child>\n"
-"                              <object class="GtkButton" id"
-"="preview_button">\n"
-"                                <property name="width_request&q"
-"uot;>118</property>\n"
-"                                <property name="visible"&g"
-"t;True</property>\n"
-"                                <property name="can_focus""
-">True</property>\n"
-"                                <property name="receives_defaul"
-"t">True</property>\n"
-"                                <property name="tooltip-text&qu"
-"ot; translatable="yes">Open the full size preview</prop"
-"erty>\n"
-"                                <property name="relief"&gt"
-";GTK_RELIEF_HALF</property>\n"
-"                                <signal handler="preview_button"
-"_clicked_cb" name="clicked"/>\n"
-"                                <signal handler="preview_button"
-"_size_allocate_cb" name="size_allocate"/>\n"
-"                                <child>\n"
-"                                  <object class="GtkHBox" "
-"id="hbox49">\n"
-"                                    <property name="visible&quo"
-"t;>True</property>\n"
-"                                    <child>\n"
-"                                      <object class="GtkImage&q"
-"uot; id="preview_button_image">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="icon_si"
-"ze">6</property>\n"
-"                                        <property name="icon_na"
-"me">hb-icon</property>\n"
-"                                      </object>\n"
-"                                    </child>\n"
-"                                  </object>\n"
-"                                </child>\n"
-"                              </object>\n"
-"                            </child>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="position">2"
-"</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                      </object>\n"
-"                      <packing>\n"
-"                        <property name="position">1<"
-"/property>\n"
-"                      </packing>\n"
-"                    </child>\n"
-"                  </object>\n"
-"                </child>\n"
-"                <child type="tab">\n"
-"                  <object class="GtkLabel" id="pictur"
-"e_label">\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                    <property name="label" translatable=&q"
-"uot;yes">Picture</property>\n"
-"                  </object>\n"
-"                  <packing>\n"
-"                    <property name="tab_fill">False<"
-"/property>\n"
-"                  </packing>\n"
-"                </child>\n"
-"                <child>\n"
-"                  <object class="GtkHBox" id="hbox17&"
-"quot;>\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                    <property name="events">GDK_POINTER"
-"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G"
-"DK_BUTTON_RELEASE_MASK</property>\n"
-"                    <child>\n"
-"                      <object class="GtkVBox" id="vbo"
-"x12">\n"
-"                        <property name="visible">True&l"
-"t;/property>\n"
-"                        <property name="events">GDK_POI"
-"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
-" | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                        <child>\n"
-"                          <object class="GtkFrame" id=&quo"
-"t;Encoding1">\n"
+"                          <placeholder/>\n"
+"                        </child>\n"
+"                      </object>\n"
+"                      <packing>\n"
+"                        <property name="expand">False&l"
+"t;/property>\n"
+"                        <property name="padding">4</"
+"property>\n"
+"                      </packing>\n"
+"                    </child>\n"
+"                    <child>\n"
+"                      <object class="GtkVBox" id="vbo"
+"x14">\n"
+"                        <property name="visible">True&l"
+"t;/property>\n"
+"                        <property name="events">GDK_POI"
+"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
+" | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                        <child>\n"
+"                          <object class="GtkFrame" id=&quo"
+"t;frame6">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -2532,7 +2488,7 @@
 "t;GTK_SHADOW_ETCHED_OUT</property>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
-" id="alignment10">\n"
+" id="alignment14">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -2546,33 +2502,37 @@
 "ot;>12</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkVBox" "
-"id="vbox13">\n"
+"id="vbox15">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
 ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                    <property name="spacing&quo"
-"t;>2</property>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox18">\n"
+"ot; id="hbox20">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
 "quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
-"                                          <object class="GtkLab"
-"el" id="label28">\n"
+"                                          <object class="GtkRad"
+"ioButton" id="vquality_type_bitrate">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
-"                                            <property name="xal"
-"ign">0</property>\n"
+"                                            <property name="can"
+"_focus">True</property>\n"
+"                                            <property name="eve"
+"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
+"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                            <property name="lab"
-"el" translatable="yes">Video Codec:</property>\n"
-"                                            <property name="wid"
-"th_chars">11</property>\n"
+"el" translatable="yes">Bitrate (kbps):    </proper"
+"ty>\n"
+"                                            <property name="dra"
+"w_indicator">True</property>\n"
+"                                            <signal handler="se"
+"tting_widget_changed_cb" name="toggled"/>\n"
 "                                          </object>\n"
 "                                          <packing>\n"
 "                                            <property name="exp"
@@ -2581,61 +2541,67 @@
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkAli"
-"gnment" id="alignment11">\n"
+"gnment" id="alignment15">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="eve"
 "nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
 "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                            <property name="xal"
-"ign">0</property>\n"
+"ign">0.11999999731779099</property>\n"
 "                                            <property name="xsc"
-"ale">0</property>\n"
+"ale">0.10000000149011612</property>\n"
 "                                            <child>\n"
 "                                              <object class="Gt"
-"kComboBox" id="VideoEncoder">\n"
+"kSpinButton" id="VideoAvgBitrate">\n"
 "                                                <property name=&quot"
 ";visible">True</property>\n"
+"                                                <property name=&quot"
+";can_focus">True</property>\n"
+"                                                <property name=&quot"
+";events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK"
+" | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                                <property name=&quot"
+";adjustment">adjustment3</property>\n"
 "                                                <signal handler=&quo"
-"t;vcodec_changed_cb" name="changed"/>\n"
+"t;setting_widget_changed_cb" name="value_changed"/>\n"
 "                                              </object>\n"
 "                                            </child>\n"
 "                                          </object>\n"
 "                                          <packing>\n"
-"                                            <property name="pad"
-"ding">4</property>\n"
 "                                            <property name="pos"
 "ition">1</property>\n"
 "                                          </packing>\n"
 "                                        </child>\n"
 "                                      </object>\n"
-"                                      <packing>\n"
-"                                        <property name="expand&"
-"quot;>False</property>\n"
-"                                      </packing>\n"
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox19">\n"
+"ot; id="hbox21">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
 "quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
-"                                          <object class="GtkLab"
-"el" id="label29">\n"
+"                                          <object class="GtkRad"
+"ioButton" id="vquality_type_target">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
+"                                            <property name="can"
+"_focus">True</property>\n"
 "                                            <property name="eve"
 "nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
 "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="xal"
-"ign">0</property>\n"
 "                                            <property name="lab"
-"el" translatable="yes">Framerate:</property>\n"
-"                                            <property name="wid"
-"th_chars">11</property>\n"
+"el" translatable="yes">Target Size (MB):</property"
+">\n"
+"                                            <property name="dra"
+"w_indicator">True</property>\n"
+"                                            <property name="gro"
+"up">vquality_type_bitrate</property>\n"
+"                                            <signal handler="ta"
+"rget_size_changed_cb" name="toggled"/>\n"
 "                                          </object>\n"
 "                                          <packing>\n"
 "                                            <property name="exp"
@@ -2644,79 +2610,55 @@
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkAli"
-"gnment" id="alignment12">\n"
+"gnment" id="alignment16">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="eve"
 "nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
 "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                            <property name="xal"
-"ign">0</property>\n"
+"ign">0.11999999731779099</property>\n"
 "                                            <property name="xsc"
-"ale">0</property>\n"
+"ale">0.10000000149011612</property>\n"
 "                                            <child>\n"
 "                                              <object class="Gt"
-"kComboBox" id="VideoFramerate">\n"
+"kSpinButton" id="VideoTargetSize">\n"
 "                                                <property name=&quot"
 ";visible">True</property>\n"
 "                                                <property name=&quot"
+";can_focus">True</property>\n"
+"                                                <property name=&quot"
 ";events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK"
 " | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                                <property name=&quot"
+";adjustment">adjustment4</property>\n"
 "                                                <signal handler=&quo"
-"t;setting_widget_changed_cb" name="changed"/>\n"
+"t;target_size_changed_cb" name="value_changed"/>\n"
 "                                              </object>\n"
 "                                            </child>\n"
 "                                          </object>\n"
 "                                          <packing>\n"
-"                                            <property name="pad"
-"ding">4</property>\n"
 "                                            <property name="pos"
 "ition">1</property>\n"
 "                                          </packing>\n"
 "                                        </child>\n"
 "                                      </object>\n"
 "                                      <packing>\n"
-"                                        <property name="expand&"
-"quot;>False</property>\n"
 "                                        <property name="positio"
 "n">1</property>\n"
 "                                      </packing>\n"
 "                                    </child>\n"
 "                                    <child>\n"
-"                                      <object class="GtkCheckBu"
-"tton" id="VideoTwoPass">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="can_foc"
-"us">True</property>\n"
-"                                        <property name="events&"
-"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="label&q"
-"uot; translatable="yes">2-Pass Encoding</property>\n"
-"                                        <property name="draw_in"
-"dicator">True</property>\n"
-"                                        <signal handler="settin"
-"g_widget_changed_cb" name="toggled"/>\n"
-"                                      </object>\n"
-"                                      <packing>\n"
-"                                        <property name="positio"
-"n">2</property>\n"
-"                                      </packing>\n"
-"                                    </child>\n"
-"                                    <child>\n"
-"                                      <object class="GtkAlignme"
-"nt" id="alignment13">\n"
+"                                      <object class="GtkHBox&qu"
+"ot; id="hbox22">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
 "quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="xscale&"
-"quot;>0.23999999463558197</property>\n"
 "                                        <child>\n"
-"                                          <object class="GtkChe"
-"ckButton" id="VideoTurboTwoPass">\n"
+"                                          <object class="GtkRad"
+"ioButton" id="vquality_type_constant">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="can"
@@ -2725,278 +2667,20 @@
 "nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
 "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                            <property name="lab"
-"el" translatable="yes">Turbo First Pass</property&"
-"gt;\n"
+"el" translatable="yes">Quality:</property>\n"
 "                                            <property name="act"
 "ive">True</property>\n"
 "                                            <property name="dra"
 "w_indicator">True</property>\n"
+"                                            <property name="gro"
+"up">vquality_type_target</property>\n"
 "                                            <signal handler="se"
 "tting_widget_changed_cb" name="toggled"/>\n"
 "                                          </object>\n"
-"                                        </child>\n"
-"                                      </object>\n"
-"                                      <packing>\n"
-"                                        <property name="positio"
-"n">3</property>\n"
-"                                      </packing>\n"
-"                                    </child>\n"
-"                                    <child>\n"
-"                                      <placeholder/>\n"
-"                                    </child>\n"
-"                                  </object>\n"
-"                                </child>\n"
-"                              </object>\n"
-"                            </child>\n"
-"                            <child type="label">\n"
-"                              <object class="GtkLabel" id="
-""label30">\n"
-"                                <property name="visible"&g"
-"t;True</property>\n"
-"                                <property name="events"&gt"
-";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
-"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                <property name="label" tra"
-"nslatable="yes"><b>Encoding</b&gt"
-";</property>\n"
-"                                <property name="use_markup&quot"
-";>True</property>\n"
-"                              </object>\n"
-"                            </child>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                            <property name="padding">2&"
-"lt;/property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <placeholder/>\n"
-"                        </child>\n"
-"                      </object>\n"
-"                      <packing>\n"
-"                        <property name="expand">False&l"
-"t;/property>\n"
-"                        <property name="padding">4</"
-"property>\n"
-"                      </packing>\n"
-"                    </child>\n"
-"                    <child>\n"
-"                      <object class="GtkVBox" id="vbo"
-"x14">\n"
-"                        <property name="visible">True&l"
-"t;/property>\n"
-"                        <property name="events">GDK_POI"
-"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
-" | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                        <child>\n"
-"                          <object class="GtkFrame" id=&quo"
-"t;frame6">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="label_xalign"&"
-"gt;0</property>\n"
-"                            <property name="shadow_type"&g"
-"t;GTK_SHADOW_ETCHED_OUT</property>\n"
-"                            <child>\n"
-"                              <object class="GtkAlignment""
-" id="alignment14">\n"
-"                                <property name="visible"&g"
-"t;True</property>\n"
-"                                <property name="events"&gt"
-";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
-"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                <property name="top_padding&quo"
-"t;>2</property>\n"
-"                                <property name="bottom_padding&"
-"quot;>2</property>\n"
-"                                <property name="left_padding&qu"
-"ot;>12</property>\n"
-"                                <child>\n"
-"                                  <object class="GtkVBox" "
-"id="vbox15">\n"
-"                                    <property name="visible&quo"
-"t;>True</property>\n"
-"                                    <property name="events&quot"
-";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
-"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                    <child>\n"
-"                                      <object class="GtkHBox&qu"
-"ot; id="hbox20">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="events&"
-"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <child>\n"
-"                                          <object class="GtkRad"
-"ioButton" id="vquality_type_bitrate">\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="can"
-"_focus">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="lab"
-"el" translatable="yes">Bitrate (kbps):    </proper"
-"ty>\n"
-"                                            <property name="dra"
-"w_indicator">True</property>\n"
-"                                            <signal handler="se"
-"tting_widget_changed_cb" name="toggled"/>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                        <child>\n"
-"                                          <object class="GtkAli"
-"gnment" id="alignment15">\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="xal"
-"ign">0.11999999731779099</property>\n"
-"                                            <property name="xsc"
-"ale">0.10000000149011612</property>\n"
-"                                            <child>\n"
-"                                              <object class="Gt"
-"kSpinButton" id="VideoAvgBitrate">\n"
-"                                                <property name=&quot"
-";visible">True</property>\n"
-"                                                <property name=&quot"
-";can_focus">True</property>\n"
-"                                                <property name=&quot"
-";events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK"
-" | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                                <property name=&quot"
-";adjustment">adjustment3</property>\n"
-"                                                <signal handler=&quo"
-"t;setting_widget_changed_cb" name="value_changed"/>\n"
-"                                              </object>\n"
-"                                            </child>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="pos"
-"ition">1</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                      </object>\n"
-"                                    </child>\n"
-"                                    <child>\n"
-"                                      <object class="GtkHBox&qu"
-"ot; id="hbox21">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="events&"
-"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <child>\n"
-"                                          <object class="GtkRad"
-"ioButton" id="vquality_type_target">\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="can"
-"_focus">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="lab"
-"el" translatable="yes">Target Size (MB):</property"
-">\n"
-"                                            <property name="dra"
-"w_indicator">True</property>\n"
-"                                            <property name="gro"
-"up">vquality_type_bitrate</property>\n"
-"                                            <signal handler="ta"
-"rget_size_changed_cb" name="toggled"/>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                        <child>\n"
-"                                          <object class="GtkAli"
-"gnment" id="alignment16">\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="xal"
-"ign">0.11999999731779099</property>\n"
-"                                            <property name="xsc"
-"ale">0.10000000149011612</property>\n"
-"                                            <child>\n"
-"                                              <object class="Gt"
-"kSpinButton" id="VideoTargetSize">\n"
-"                                                <property name=&quot"
-";visible">True</property>\n"
-"                                                <property name=&quot"
-";can_focus">True</property>\n"
-"                                                <property name=&quot"
-";events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK"
-" | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                                <property name=&quot"
-";adjustment">adjustment4</property>\n"
-"                                                <signal handler=&quo"
-"t;target_size_changed_cb" name="value_changed"/>\n"
-"                                              </object>\n"
-"                                            </child>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="pos"
-"ition">1</property>\n"
-"                                          </packing>\n"
-"                                        </child>\n"
-"                                      </object>\n"
-"                                      <packing>\n"
-"                                        <property name="positio"
-"n">1</property>\n"
-"                                      </packing>\n"
-"                                    </child>\n"
-"                                    <child>\n"
-"                                      <object class="GtkHBox&qu"
-"ot; id="hbox22">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="events&"
-"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <child>\n"
-"                                          <object class="GtkRad"
-"ioButton" id="vquality_type_constant">\n"
-"                                            <property name="vis"
-"ible">True</property>\n"
-"                                            <property name="can"
-"_focus">True</property>\n"
-"                                            <property name="eve"
-"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G"
-"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                            <property name="lab"
-"el" translatable="yes">Quality:</property>\n"
-"                                            <property name="act"
-"ive">True</property>\n"
-"                                            <property name="dra"
-"w_indicator">True</property>\n"
-"                                            <property name="gro"
-"up">vquality_type_target</property>\n"
-"                                            <signal handler="se"
-"tting_widget_changed_cb" name="toggled"/>\n"
-"                                          </object>\n"
-"                                          <packing>\n"
-"                                            <property name="exp"
-"and">False</property>\n"
-"                                          </packing>\n"
+"                                          <packing>\n"
+"                                            <property name="exp"
+"and">False</property>\n"
+"                                          </packing>\n"
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkHSc"
@@ -6837,6 +6521,60 @@
 "y>\n"
 "              </packing>\n"
 "            </child>\n"
+"            <child>\n"
+"              <object class="GtkHBox" id="hbox1""
+">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <child>\n"
+"                  <object class="GtkLabel" id="label3"
+"">\n"
+"                    <property name="visible">True</p"
+"roperty>\n"
+"                    <property name="label" translatable=&q"
+"uot;yes"><b>Frame</b></property&"
+"gt;\n"
+"                    <property name="use_markup">True&lt"
+";/property>\n"
+"                  </object>\n"
+"                  <packing>\n"
+"                    <property name="position">0</pro"
+"perty>\n"
+"                  </packing>\n"
+"                </child>\n"
+"                <child>\n"
+"                  <object class="GtkSpinButton" id="p"
+"review_frame">\n"
+"                    <property name="visible">True</p"
+"roperty>\n"
+"                    <property name="can_focus">True<"
+"/property>\n"
+"                    <property name="max_length">2</p"
+"roperty>\n"
+"                    <property name="has_frame">False&lt"
+";/property>\n"
+"                    <property name="shadow_type">none&l"
+"t;/property>\n"
+"                    <property name="adjustment">adjustm"
+"ent19</property>\n"
+"                    <property name="numeric">True</p"
+"roperty>\n"
+"                    <signal name="value_changed" handler=&"
+"quot;preview_frame_value_changed_cb"/>\n"
+"                  </object>\n"
+"                  <packing>\n"
+"                    <property name="position">1</pro"
+"perty>\n"
+"                  </packing>\n"
+"                </child>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"                <property name="position">3</propert"
+"y>\n"
+"              </packing>\n"
+"            </child>\n"
 "          </object>\n"
 "          <packing>\n"
 "            <property name="expand">False</property&"
@@ -7527,70 +7265,365 @@
 "                <property name="visible">True</prope"
 "rty>\n"
 "                <child>\n"
-"                  <object class="GtkAlignment" id="al"
-"ignment6">\n"
+"                  <object class="GtkFrame" id="frame4"
+"">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
-"                    <property name="xscale">0</prope"
-"rty>\n"
+"                    <property name="events">GDK_POINTER"
+"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G"
+"DK_BUTTON_RELEASE_MASK</property>\n"
+"                    <property name="label_xalign">0<"
+"/property>\n"
+"                    <property name="shadow_type">etched"
+"-out</property>\n"
 "                    <child>\n"
-"                      <object class="GtkHBox" id="hbo"
-"x45">\n"
+"                      <object class="GtkAlignment" id=&quo"
+"t;alignment8">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
+"                        <property name="events">GDK_POI"
+"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
+" | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                        <property name="top_padding">2&"
+"lt;/property>\n"
+"                        <property name="bottom_padding"&gt"
+";2</property>\n"
+"                        <property name="left_padding">1"
+"2</property>\n"
 "                        <child>\n"
-"                          <object class="GtkLabel" id=&quo"
-"t;label18">\n"
+"                          <object class="GtkVBox" id=&quot"
+";vbox10">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
-"                            <property name="label" transla"
-"table="yes"><b>Frame</b></p"
-"roperty>\n"
-"                            <property name="use_markup"&gt"
+"                            <property name="events">GDK"
+"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
+"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                            <child>\n"
+"                              <object class="GtkCheckButton&quo"
+"t; id="VideoGrayScale">\n"
+"                                <property name="label" tra"
+"nslatable="yes">Grayscale</property>\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="can_focus""
+">True</property>\n"
+"                                <property name="receives_defaul"
+"t">False</property>\n"
+"                                <property name="events"&gt"
+";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
+"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                <property name="draw_indicator&"
+"quot;>True</property>\n"
+"                                <signal name="toggled" han"
+"dler="setting_widget_changed_cb"/>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="position"&"
+"gt;0</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
+"                            <child>\n"
+"                              <object class="GtkCheckButton&quo"
+"t; id="PictureDetelecine">\n"
+"                                <property name="label" tra"
+"nslatable="yes">Detelecine</property>\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="can_focus""
+">True</property>\n"
+"                                <property name="receives_defaul"
+"t">False</property>\n"
+"                                <property name="events"&gt"
+";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
+"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                <property name="draw_indicator&"
+"quot;>True</property>\n"
+"                                <signal name="button_press_even"
+"t" handler="tweak_setting_cb"/>\n"
+"                                <signal name="toggled" han"
+"dler="setting_widget_changed_cb"/>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="expand"&gt"
+";False</property>\n"
+"                                <property name="position"&"
+"gt;1</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
+"                            <child>\n"
+"                              <object class="GtkCheckButton&quo"
+"t; id="PictureDecomb">\n"
+"                                <property name="label" tra"
+"nslatable="yes">De-Comb</property>\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="can_focus""
+">True</property>\n"
+"                                <property name="receives_defaul"
+"t">False</property>\n"
+"                                <property name="active"&gt"
 ";True</property>\n"
+"                                <property name="draw_indicator&"
+"quot;>True</property>\n"
+"                                <signal name="button_press_even"
+"t" handler="tweak_setting_cb"/>\n"
+"                                <signal name="toggled" han"
+"dler="setting_widget_changed_cb"/>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="expand"&gt"
+";False</property>\n"
+"                                <property name="position"&"
+"gt;2</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
+"                            <child>\n"
+"                              <object class="GtkHBox" id=&"
+"quot;hbox25">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <child>\n"
+"                                  <object class="GtkLabel""
+" id="label41">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="xalign&quot"
+";>0</property>\n"
+"                                    <property name="label""
+" translatable="yes">Deblock:</property>\n"
+"                                    <property name="width_chars"
+"">10</property>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>0</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkAlignment&q"
+"uot; id="alignment20">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="xalign&quot"
+";>0</property>\n"
+"                                    <property name="xscale&quot"
+";>0.55000001192092896</property>\n"
+"                                    <child>\n"
+"                                      <object class="GtkHScale&"
+"quot; id="PictureDeblock">\n"
+"                                        <property name="visible"
+"">True</property>\n"
+"                                        <property name="can_foc"
+"us">True</property>\n"
+"                                        <property name="adjustm"
+"ent">adjustment20</property>\n"
+"                                        <property name="digits&"
+"quot;>0</property>\n"
+"                                        <property name="value_p"
+"os">right</property>\n"
+"                                        <signal name="value_cha"
+"nged" handler="setting_widget_changed_cb"/>\n"
+"                                        <signal name="format_va"
+"lue" handler="format_deblock_cb"/>\n"
+"                                      </object>\n"
+"                                    </child>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="position&qu"
+"ot;>1</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="position"&"
+"gt;3</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
+"                            <child>\n"
+"                              <object class="GtkHBox" id=&"
+"quot;hbox12">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="events"&gt"
+";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
+"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                <child>\n"
+"                                  <object class="GtkLabel""
+" id="label20">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="can_focus&q"
+"uot;>True</property>\n"
+"                                    <property name="events&quot"
+";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
+"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                    <property name="xalign&quot"
+";>0</property>\n"
+"                                    <property name="label""
+" translatable="yes">Deinterlace:</property>\n"
+"                                    <property name="width_chars"
+"">10</property>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>0</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkComboBox&qu"
+"ot; id="PictureDeinterlace">\n"
+"                                    <property name="width_reque"
+"st">100</property>\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="events&quot"
+";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
+"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                    <signal name="changed""
+" handler="setting_widget_changed_cb"/>\n"
+"                                    <signal name="button_press_"
+"event" handler="tweak_setting_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>1</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkComboBoxEnt"
+"ry" id="tweak_PictureDeinterlace">\n"
+"                                    <signal name="changed""
+" handler="setting_widget_changed_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>2</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="expand"&gt"
+";False</property>\n"
+"                                <property name="padding"&g"
+"t;2</property>\n"
+"                                <property name="position"&"
+"gt;4</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
+"                            <child>\n"
+"                              <object class="GtkHBox" id=&"
+"quot;hbox13">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="events"&gt"
+";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
+"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                <child>\n"
+"                                  <object class="GtkLabel""
+" id="label21">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="events&quot"
+";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
+"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                    <property name="xalign&quot"
+";>0</property>\n"
+"                                    <property name="label""
+" translatable="yes">Denoise:</property>\n"
+"                                    <property name="selectable&"
+"quot;>True</property>\n"
+"                                    <property name="width_chars"
+"">10</property>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>0</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkComboBox&qu"
+"ot; id="PictureDenoise">\n"
+"                                    <property name="width_reque"
+"st">100</property>\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="events&quot"
+";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
+"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                    <signal name="changed""
+" handler="setting_widget_changed_cb"/>\n"
+"                                    <signal name="button_press_"
+"event" handler="tweak_setting_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>1</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkComboBoxEnt"
+"ry" id="tweak_PictureDenoise">\n"
+"                                    <signal name="changed""
+" handler="setting_widget_changed_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>2</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="expand"&gt"
+";False</property>\n"
+"                                <property name="padding"&g"
+"t;2</property>\n"
+"                                <property name="position"&"
+"gt;5</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
 "                          </object>\n"
 "                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkSpinButton" id"
-"="preview_frame">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="can_focus">"
-"True</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">View other frames</property>\n"
-"                            <property name="max_length"&gt"
-";2</property>\n"
-"                            <property name="has_frame">"
-"False</property>\n"
-"                            <property name="shadow_type"&g"
-"t;GTK_SHADOW_NONE</property>\n"
-"                            <property name="adjustment"&gt"
-";adjustment19</property>\n"
-"                            <property name="numeric">Tr"
-"ue</property>\n"
-"                            <signal handler="preview_frame_valu"
-"e_changed_cb" name="value_changed"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="position">1"
+"                      </object>\n"
+"                    </child>\n"
+"                    <child type="label">\n"
+"                      <object class="GtkLabel" id="la"
+"bel22">\n"
+"                        <property name="visible">True&l"
+"t;/property>\n"
+"                        <property name="events">GDK_POI"
+"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
+" | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                        <property name="label" translatabl"
+"e="yes"><b>Picture Filters</b>"
 "</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
+"                        <property name="use_markup">Tru"
+"e</property>\n"
 "                      </object>\n"
 "                    </child>\n"
 "                  </object>\n"
 "                  <packing>\n"
 "                    <property name="expand">False</p"
 "roperty>\n"
+"                    <property name="padding">2</prop"
+"erty>\n"
+"                    <property name="position">0</pro"
+"perty>\n"
 "                  </packing>\n"
 "                </child>\n"
-"                <child>\n"
-"                  <placeholder/>\n"
-"                </child>\n"
-"                <child>\n"
-"                  <placeholder/>\n"
-"                </child>\n"
 "              </object>\n"
 "              <packing>\n"
 "                <property name="position">2</propert"

diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index 72771ba72e2ca8b1665f7ae20bb263b4d4ce202e..6ad8a9e087d93387bb9e83e5731a5d32797e5538 100644 (file)
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -890,16 +890,24 @@
                     <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="spacing">3</property>
+
+                    <child>
+                      <object class="GtkAlignment" id="alignment_a">
+                        <property name="visible">True</property>
+                        <property name="top_padding">10</property>
+                        <property name="left_padding">10</property>
+
                     <child>
                       <object class="GtkVBox" id="vbox5">
                         <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="spacing">14</property>
                         <child>
                           <object class="GtkFrame" id="frame5">
                             <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="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <object class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
@@ -1025,7 +1033,7 @@
                             <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="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <object class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
@@ -1150,7 +1158,7 @@
                                 <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="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment7">
                                     <property name="visible">True</property>
@@ -1269,259 +1277,92 @@
                         </child>
                       </object>
                     </child>
+
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+
+                    <child>
+                      <object class="GtkAlignment" id="alignment_b">
+                        <property name="visible">True</property>
+                        <property name="right_padding">10</property>
+
                     <child>
                       <object class="GtkVBox" id="vbox9">
                         <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>
                         <child>
-                          <object class="GtkFrame" id="frame4">
+                          <object class="GtkLabel" id="label8">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+
+                        <child>
+                          <object class="GtkFrame" id="frame8">
                             <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="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                            <property name="shadow_type">etched-in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment8">
+                              <object class="GtkAlignment" id="alignment19">
                                 <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="top_padding">2</property>
-                                <property name="bottom_padding">2</property>
-                                <property name="left_padding">12</property>
+                                <property name="bottom_padding">4</property>
+                                <property name="left_padding">4</property>
+                                <property name="right_padding">4</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox10">
+                                  <object class="GtkImage" id="preview_button_image">
+                                    <property name="width_request">240</property>
+                                    <property name="height_request">120</property>
                                     <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>
-                                    <child>
-                                      <object class="GtkCheckButton" id="VideoGrayScale">
-                                        <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">This filter removes the color components of the picture.</property>
-                                        <property name="label" translatable="yes">Grayscale</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="PictureDetelecine">
-                                        <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">Remove interlacing artifacts caused by the telecine process often applied to movies.</property>
-                                        <property name="label" translatable="yes">Detelecine</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                        <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                      </object>
-                                      <packing>
-                                        <property name="position">1</property>
-                                        <property name="expand">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="PictureDecomb">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip-text" translatable="yes">Decomb is a selective deinterlacer. It will only deinterlace frames that appear to need it. It generally produces better quality than the normal deinterlacer.</property>
-                                        <property name="label" translatable="yes">De-Comb</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                        <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox25">
-                                        <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label41">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Deblock:</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment20">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0.55</property>
-                                            <child>
-                                              <object class="GtkHScale" id="PictureDeblock">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="tooltip-text" translatable="yes">This is a filter that gets applied before encoding.  If the source looks blocky before encoding, you may want to use this.</property>
-                                                <property name="adjustment">adjustment20</property>
-                                                <property name="digits">0</property>
-                                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="setting_widget_changed_cb" name="value_changed"/>
-                                                <signal handler="format_deblock_cb" name="format-value"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox12">
-                                        <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>
-                                        <child>
-                                          <object class="GtkLabel" id="label20">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="selectable">False</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="label" translatable="yes">Deinterlace:</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" id="PictureDeinterlace">
-                                            <property name="width_request">100</property>
-                                            <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="tooltip-text" translatable="yes">Removes interlacing artifacts. Since deinterlacing degrades picture quality, leave it off unless you know you need it.</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace">
-                                            <property name="visible">False</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <child internal-child="entry">
-                                              <object class="GtkEntry" id="comboboxentry-entry1">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="width_chars">15</property>
-                                                <signal handler="deint_tweak_focus_out_cb" name="focus_out_event"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="padding">2</property>
-                                        <property name="position">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox13">
-                                        <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>
-                                        <child>
-                                          <object class="GtkLabel" id="label21">
-                                            <property name="visible">True</property>
-                                            <property name="selectable">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="label" translatable="yes">Denoise:</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" id="PictureDenoise">
-                                            <property name="width_request">100</property>
-                                            <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="tooltip-text" translatable="yes">This filter removes noise or grain from the picture.</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <signal handler="tweak_setting_cb" name="button-press-event"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxEntry" id="tweak_PictureDenoise">
-                                            <property name="visible">False</property>
-                                            <signal handler="setting_widget_changed_cb" name="changed"/>
-                                            <child internal-child="entry">
-                                              <object class="GtkEntry" id="comboboxentry-entry2">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="width_chars">15</property>
-                                                <signal handler="denoise_tweak_focus_out_cb" name="focus_out_event"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="padding">2</property>
-                                        <property name="position">5</property>
-                                      </packing>
-                                    </child>
+                                    <property name="icon_name">hb-icon</property>
+                                    <property name="icon-size">6</property>
+                                    <signal name="size_allocate" handler="preview_button_size_allocate_cb"/>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="label22">
+                              <object class="GtkLabel" id="label21">
                                 <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="label" translatable="yes"><b>Picture Cleanup</b></property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
+
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="padding">2</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
+
+
                         <child>
-                          <object class="GtkVBox" id="vbox16">
+                          <object class="GtkButton" id="preview_button">
+                            <property name="width_request">118</property>
                             <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="relief">half</property>
+                            <signal name="clicked" handler="preview_button_clicked_cb"/>
                             <child>
-                              <object class="GtkHBox" id="hbox56">
+                              <object class="GtkHBox" id="hbox7">
                                 <property name="visible">True</property>
+                                <property name="spacing">4</property>
                                 <child>
-                                  <object class="GtkLabel" id="label69">
+                                  <object class="GtkLabel" id="previewlabel1">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.75999999046325684</property>
-                                    <property name="yalign">1</property>
-                                    <property name="label" translatable="yes"><b>Preview:</b></property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Full Size Preview:</property>
+                                    <property name="justify">right</property>
                                   </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="preview_dims">
@@ -1532,54 +1373,39 @@
                                     <property name="label" translatable="yes">--</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                             </child>
+
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">1</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox35">
+                          <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
-                            <child>
-                              <object class="GtkButton" id="preview_button">
-                                <property name="width_request">118</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip-text" translatable="yes">Open the full size preview</property>
-                                <property name="relief">GTK_RELIEF_HALF</property>
-                                <signal handler="preview_button_clicked_cb" name="clicked"/>
-                                <signal handler="preview_button_size_allocate_cb" name="size_allocate"/>
-                                <child>
-                                  <object class="GtkHBox" id="hbox49">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <object class="GtkImage" id="preview_button_image">
-                                        <property name="visible">True</property>
-                                        <property name="icon_size">6</property>
-                                        <property name="icon_name">hb-icon</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
                           </object>
                           <packing>
-                            <property name="position">2</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
+                    </child>
+
+                      </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
+
                   </object>
                 </child>
                 <child type="tab">
@@ -4190,6 +4016,40 @@ location as the movie.</property>
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes"><b>Frame</b></property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="preview_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">2</property>
+                    <property name="has_frame">False</property>
+                    <property name="shadow_type">none</property>
+                    <property name="adjustment">adjustment19</property>
+                    <property name="numeric">True</property>
+                    <signal name="value_changed" handler="preview_frame_value_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -4615,48 +4475,222 @@ the other to maintain the video's original aspect ratio.</property>
               <object class="GtkVBox" id="vbox42">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment6">
+                  <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
-                    <property name="xscale">0</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">etched-out</property>
                     <child>
-                      <object class="GtkHBox" id="hbox45">
+                      <object class="GtkAlignment" id="alignment8">
                         <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="top_padding">2</property>
+                        <property name="bottom_padding">2</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkLabel" id="label18">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes"><b>Frame</b></property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="preview_frame">
+                          <object class="GtkVBox" id="vbox10">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">View other frames</property>
-                            <property name="max_length">2</property>
-                            <property name="has_frame">False</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
-                            <property name="adjustment">adjustment19</property>
-                            <property name="numeric">True</property>
-                            <signal handler="preview_frame_value_changed_cb" name="value_changed"/>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <child>
+                              <object class="GtkCheckButton" id="VideoGrayScale">
+                                <property name="label" translatable="yes">Grayscale</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="PictureDetelecine">
+                                <property name="label" translatable="yes">Detelecine</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="PictureDecomb">
+                                <property name="label" translatable="yes">De-Comb</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox25">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label41">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Deblock:</property>
+                                    <property name="width_chars">10</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment20">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="xscale">0.55000001192092896</property>
+                                    <child>
+                                      <object class="GtkHScale" id="PictureDeblock">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="adjustment">adjustment20</property>
+                                        <property name="digits">0</property>
+                                        <property name="value_pos">right</property>
+                                        <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                                        <signal name="format_value" handler="format_deblock_cb"/>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox12">
+                                <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>
+                                <child>
+                                  <object class="GtkLabel" id="label20">
+                                    <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="xalign">0</property>
+                                    <property name="label" translatable="yes">Deinterlace:</property>
+                                    <property name="width_chars">10</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="PictureDeinterlace">
+                                    <property name="width_request">100</property>
+                                    <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>
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                    <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace">
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">2</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox13">
+                                <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>
+                                <child>
+                                  <object class="GtkLabel" id="label21">
+                                    <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="label" translatable="yes">Denoise:</property>
+                                    <property name="selectable">True</property>
+                                    <property name="width_chars">10</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="PictureDenoise">
+                                    <property name="width_request">100</property>
+                                    <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>
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                    <signal name="button_press_event" handler="tweak_setting_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBoxEntry" id="tweak_PictureDenoise">
+                                    <signal name="changed" handler="setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">2</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label22">
+                        <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="label" translatable="yes"><b>Picture Filters</b></property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="padding">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="position">2</property>