X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fghb.ui;h=9f9df58ae2c0b19afa7393fb6cc2434efcc4c45f;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=a6b8e0c331dddf8211d996b024318f42435dc532;hpb=046a22daeaddf7c19ee34b9a8dae7c8392bee55a;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index a6b8e0c3..9f9df58a 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -227,15 +227,15 @@
   </object>
   <object class="GtkAdjustment" id="adjustment29">
     <property name="upper">2000</property>
-    <property name="lower">0</property>
+    <property name="lower">1</property>
     <property name="page_increment">16</property>
     <property name="step_increment">1</property>
     <property name="page_size">0</property>
     <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment30">
-    <property name="upper">1200</property>
-    <property name="lower">0</property>
+    <property name="upper">2000</property>
+    <property name="lower">1</property>
     <property name="page_increment">16</property>
     <property name="step_increment">1</property>
     <property name="page_size">0</property>
@@ -249,6 +249,22 @@
     <property name="page_size">0</property>
     <property name="value">0</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment32">
+    <property name="upper">99999</property>
+    <property name="lower">0</property>
+    <property name="page_increment">60</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">99999</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment33">
+    <property name="upper">99999</property>
+    <property name="lower">1</property>
+    <property name="page_increment">60</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
   <object class="GtkAdjustment" id="preview_progress_adj">
     <property name="upper">100</property>
     <property name="lower">0</property>
@@ -526,6 +542,7 @@
     <signal handler="window_delete_event_cb" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox48">
+        <property name="orientation">vertical</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>
@@ -544,6 +561,7 @@
             <child>
               <object class="GtkToolButton" id="sourcetoolbutton">
                 <property name="visible">True</property>
+                <property name="is_important">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">Choose Video Source</property>
                 <property name="label" translatable="yes">Source</property>
@@ -557,6 +575,7 @@
             <child>
               <object class="GtkToolButton" id="queue_start1">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">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="tooltip-text" translatable="yes">Start Encoding</property>
@@ -571,6 +590,7 @@
             <child>
               <object class="GtkToolButton" id="queue_pause1">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">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="tooltip-text" translatable="yes">Pause Encoding</property>
@@ -585,6 +605,7 @@
             <child>
               <object class="GtkToolButton" id="queue_add">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">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="tooltip-text" translatable="yes">Add to Queue</property>
@@ -599,6 +620,7 @@
             <child>
               <object class="GtkToggleToolButton" id="show_queue">
                 <property name="visible">True</property>
+                <property name="is_important">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">Show Queue</property>
                 <property name="label" translatable="yes">Show Queue</property>
@@ -612,6 +634,7 @@
             <child>
               <object class="GtkToggleToolButton" id="show_picture">
                 <property name="visible">True</property>
+                <property name="is_important">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">Open Picture Settings and Preview window.  Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
                 <property name="label" translatable="yes">Picture Settings</property>
@@ -625,6 +648,7 @@
             <child>
               <object class="GtkToggleToolButton" id="show_activity">
                 <property name="visible">True</property>
+                <property name="is_important">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">Show Activity Window</property>
                 <property name="label" translatable="yes">Activity Window</property>
@@ -648,9 +672,11 @@
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
           <object class="GtkVBox" id="vbox14">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <child>
               <object class="GtkVBox" id="vbox15">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
@@ -663,8 +689,9 @@
                     <property name="xscale">1</property>
                     <child>
                       <object class="GtkVBox" id="vbox16">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
-                        <property name="spacing">6</property>
+                        <property name="spacing">2</property>
                         <child>
                           <object class="GtkHBox" id="hbox54">
                             <property name="visible">True</property>
@@ -719,24 +746,44 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment65">
+                          <object class="GtkTable" id="table7">
                             <property name="visible">True</property>
-                            <property name="left_padding">6</property>
-                            <property name="bottom_padding">6</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <property name="column-spacing">5</property>
                             <child>
-                              <object class="GtkHBox" id="hbox5">
+                              <object class="GtkAlignment" id="alignment72">
                                 <property name="visible">True</property>
-                                <property name="spacing">4</property>
+                                <property name="top_padding">6</property>
+                                <property name="left_padding">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label20">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Title</property>
+                                    <property name="xalign">0.1</property>
+                                    <property name="label" translatable="yes">Title:</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox42">
+                                <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">5</property>
+
+                                <child>
+                                  <object class="GtkAlignment" id="alignment75">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="xscale">0</property>
+                                    <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkComboBox" id="title">
                                     <property name="visible">True</property>
@@ -744,86 +791,17 @@
                                     <property name="tooltip-text" translatable="yes">Set the title to encode. By default the longest title is chosen.  This is often the feature title of a DVD.</property>
                                     <signal handler="title_changed_cb" name="changed"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkAlignment" id="chapter_box">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xscale">0</property>
-                                    <property name="left_padding">16</property>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox4">
-                                        <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="label4">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Chapters</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="start_chapter">
-                                            <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">Set the first chapter to encode.</property>
-                                            <property name="adjustment">adjustment1</property>
-                                            <signal handler="start_chapter_changed_cb" name="value_changed"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label5">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes"> through </property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="end_chapter">
-                                            <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">Set the last chapter to encode.</property>
-                                            <property name="adjustment">adjustment2</property>
-                                            <signal handler="end_chapter_changed_cb" name="value_changed"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">3</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
+
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
-                                  </packing>
                                 </child>
+
                                 <child>
-                                  <object class="GtkAlignment" id="alignment47">
+                                  <object class="GtkAlignment" id="alignment73">
                                     <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="xalign">1</property>
                                     <property name="xscale">0</property>
-                                    <property name="left_padding">16</property>
+                                    <property name="yscale">0</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox44">
                                         <property name="visible">True</property>
@@ -837,7 +815,7 @@
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="position">4</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -851,54 +829,111 @@
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="position">5</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">3</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                              </packing>
+                            </child>
+
+                            <child>
+                              <object class="GtkAlignment" id="alignment74">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment41">
+                                  <object class="GtkHBox" id="hbox48">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xscale">0</property>
-                                    <property name="left_padding">16</property>
+                                    <property name="spacing">5</property>
+
+                                    <child>
+                                      <object class="GtkComboBox" id="PtoPType">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">Format to mux encoded tracks to.</property>
+                                        <signal handler="ptop_widget_changed_cb" name="changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox42">
+                                      <object class="GtkSpinButton" id="start_point">
                                         <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="spacing">7</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label6">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0.10000000149011612</property>
-                                            <property name="label" translatable="yes">Duration:</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="title_duration">
-                                            <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">hh:mm:ss</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
+                                        <property name="tooltip-text" translatable="yes">Set the first chapter to encode.</property>
+                                        <property name="adjustment">adjustment1</property>
+                                        <signal handler="start_point_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                            		    <property name="expand">False</property>
+                            		    <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label56">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">through</property>
                                       </object>
+                                      <packing>
+                            		    <property name="expand">False</property>
+                            		    <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="end_point">
+                                        <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">Set the last chapter to encode.</property>
+                                        <property name="adjustment">adjustment2</property>
+                                        <signal handler="end_point_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                            		    <property name="expand">False</property>
+                            		    <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                <child>
+                                  <object class="GtkHBox" id="hbox47">
+                                    <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">7</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label6">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0.1</property>
+                                        <property name="label" translatable="yes">Duration:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="title_duration">
+                                        <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">hh:mm:ss</property>
+                                        <property name="width_chars">8</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
@@ -906,7 +941,15 @@
                                     <property name="position">4</property>
                                   </packing>
                                 </child>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -934,7 +977,7 @@
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
                             <child>
-                              <object class="GtkTable" id="table3">
+                              <object class="GtkTable" id="table4">
                                 <property name="visible">True</property>
                                 <property name="n_rows">2</property>
                                 <property name="n_columns">2</property>
@@ -944,6 +987,7 @@
                                 <child>
                                   <object class="GtkFileChooserButton" id="dest_dir">
                                     <property name="visible">True</property>
+                                    <property name="local-only">False</property>
                                     <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                     <property name="title" translatable="yes">Destination Directory</property>
                                     <property name="tooltip-text" translatable="yes">Destination directory for your encode.</property>
@@ -1063,7 +1107,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="Mp4LargeFile">
-                                    <property name="label" translatable="yes">Large file size (&gt;4GB)</property>
+                                    <property name="label" translatable="yes">Large file (&gt;4GB)</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1137,6 +1181,7 @@
 
                     <child>
                       <object class="GtkVBox" id="vbox43">
+                        <property name="orientation">vertical</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="spacing">14</property>
@@ -1155,6 +1200,7 @@
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox11">
+                                    <property name="orientation">vertical</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>
@@ -1282,6 +1328,7 @@
                                 <property name="right_padding">2</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox44">
+                                    <property name="orientation">vertical</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>
@@ -1389,6 +1436,7 @@
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox45">
+                            <property name="orientation">vertical</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>
@@ -1407,6 +1455,7 @@
                                     <property name="right_padding">2</property>
                                     <child>
                                       <object class="GtkVBox" id="vbox46">
+                                        <property name="orientation">vertical</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>
@@ -1530,6 +1579,7 @@
 
                     <child>
                       <object class="GtkVBox" id="vbox9">
+                        <property name="orientation">vertical</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>
 
@@ -1645,6 +1695,7 @@
                         <property name="left_padding">24</property>
                         <child>
                           <object class="GtkVBox" id="vbox13">
+                            <property name="orientation">vertical</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="spacing">4</property>
@@ -1782,6 +1833,7 @@
                         <property name="right_padding">24</property>
                         <child>
                           <object class="GtkVBox" id="vbox47">
+                            <property name="orientation">vertical</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>
@@ -1948,6 +2000,7 @@ FFmpeg's and Theora's scale is more linear.  These encoders do not have a lossle
                 </child>
                 <child>
                   <object class="GtkVBox" id="audio_tab">
+                    <property name="orientation">vertical</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>
@@ -1960,6 +2013,7 @@ FFmpeg's and Theora's scale is more linear.  These encoders do not have a lossle
                         <property name="right_padding">2</property>
                         <child>
                           <object class="GtkVBox" id="vbox17">
+                            <property name="orientation">vertical</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="spacing">2</property>
@@ -2024,7 +2078,7 @@ FFmpeg's and Theora's scale is more linear.  These encoders do not have a lossle
                                 <property name="n_columns">7</property>
                                 <child>
                                   <object class="GtkComboBox" id="AudioTrack">
-                                    <property name="width_request">215</property>
+                                    <property name="width_request">180</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">List of audio tracks available from your source.</property>
@@ -2204,6 +2258,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2250,6 +2305,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                 </child>
                 <child>
                   <object class="GtkVBox" id="subtitle_tab">
+                    <property name="orientation">vertical</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>
@@ -2262,6 +2318,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                         <property name="right_padding">2</property>
                         <child>
                           <object class="GtkVBox" id="vbox12">
+                            <property name="orientation">vertical</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="spacing">2</property>
@@ -2464,6 +2521,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                                 <child>
                                   <object class="GtkFileChooserButton" id="SrtFile">
                                     <property name="visible">True</property>
+                                    <property name="local-only">False</property>
                                     <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
                                     <property name="title" translatable="yes">Srt File</property>
                                     <property name="tooltip-text" translatable="yes">Select the SRT file to import.</property>
@@ -2545,6 +2603,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                     <property name="spacing">2</property>
                     <child>
                       <object class="GtkVBox" id="vbox21">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <property name="spacing">10</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2562,6 +2621,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox22">
+                                    <property name="orientation">vertical</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>
@@ -2845,9 +2905,9 @@ This option can improve compression efficiency. Use 'Optimal' if you can afford
 You can edit these and add additional options.  
 
 Default values will not be shown. The defaults are:
-ref=1:mixed-refs=0:bframes=0:direct=spatial:b-pyramid=0:
-weightb=0:me=hex:merange=16:subme=6:analyse=some:8x8dct=0:
-deblock=0,0:trellis=0:psy-rd=1,0:no-fast-pskip=0:
+ref=3:mixed-refs=1:bframes=3:direct=spatial:b-pyramid=0:
+weightb=1:me=hex:merange=16:subme=7:analyse=some:8x8dct=1:
+deblock=0,0:trellis=1:psy-rd=1,0:no-fast-pskip=0:
 no-dct-decimate=0:cabac=1</property>
                                         <property name="wrap_mode">GTK_WRAP_CHAR</property>
                                         <property name="accepts_tab">False</property>
@@ -2889,6 +2949,7 @@ no-dct-decimate=0:cabac=1</property>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox25">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <property name="spacing">10</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -3155,6 +3216,7 @@ no-dct-decimate=0:cabac=1</property>
                                 <property name="right_padding">2</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox27">
+                                    <property name="orientation">vertical</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="spacing">2</property>
@@ -3394,6 +3456,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                 </child>
                 <child>
                   <object class="GtkVBox" id="chapters_tab">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkHBox" id="hbox30">
@@ -3559,6 +3622,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                 <property name="left_padding">8</property>
                 <child>
                   <object class="GtkVBox" id="presets_vbox">
+                    <property name="orientation">vertical</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>
@@ -3584,14 +3648,15 @@ Requires subme >= 6 and trellis >= 1.</property>
                       <object class="GtkToolbar" id="presets_toolbar">
                         <property name="icon-size">2</property>
                         <property name="visible">True</property>
-                        <property name="toolbar_style">both-horiz</property>
                         <property name="show_arrow">False</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="GtkToolButton" id="presets_save">
                             <property name="visible">True</property>
                             <property name="sensitive">True</property>
-                            <property name="is_important">True</property>
+                            <property name="is_important">False</property>
+                            <property name="label" translatable="yes">_Save</property>
+                            <property name="use_underline">True</property>
                             <property name="tooltip-text" translatable="yes">Save current settings to new preset.</property>
                             <property name="icon_name">gtk-save</property>
                             <signal name="clicked" handler="presets_save_clicked_cb"/>
@@ -3604,7 +3669,9 @@ Requires subme >= 6 and trellis >= 1.</property>
                           <object class="GtkToolButton" id="presets_remove">
                             <property name="visible">True</property>
                             <property name="sensitive">True</property>
-                            <property name="is_important">True</property>
+                            <property name="is_important">False</property>
+                            <property name="label" translatable="yes">_Delete</property>
+                            <property name="use_underline">True</property>
                             <property name="tooltip-text" translatable="yes">Delete the currently selected preset.</property>
                             <property name="icon_name">gtk-delete</property>
                             <signal name="clicked" handler="presets_remove_clicked_cb"/>
@@ -3687,6 +3754,7 @@ Requires subme >= 6 and trellis >= 1.</property>
     <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox6">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
@@ -3694,6 +3762,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <property name="visible">True</property>
             <child>
               <object class="GtkVBox" id="vbox20">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEventBox" id="eventbox1">
@@ -3734,9 +3803,10 @@ Requires subme >= 6 and trellis >= 1.</property>
                     <property name="show-border">False</property>
                     <child>
                       <object class="GtkVBox" id="vbox42">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment60">
+                          <object class="GtkAlignment" id="check_updates_box">
                             <property name="visible">True</property>
                             <property name="left_padding">12</property>
                             <property name="top_padding">6</property>
@@ -3822,6 +3892,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                             <property name="bottom_padding">6</property>
                             <child>
                               <object class="GtkVBox" id="vbox5">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
                                   <object class="GtkCheckButton" id="use_source_name">
@@ -3843,6 +3914,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                                     <property name="left_padding">18</property>
                                     <child>
                                       <object class="GtkVBox" id="vbox29">
+                                        <property name="orientation">vertical</property>
                                         <property name="visible">True</property>
                                         <child>
                                           <object class="GtkCheckButton" id="chapters_in_destination">
@@ -3984,6 +4056,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox18">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkAlignment" id="alignment61">
@@ -3995,6 +4068,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkVBox" id="vbox7">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox81">
@@ -4036,6 +4110,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                                     <property name="left_padding">17</property>
                                     <child>
                                       <object class="GtkVBox" id="vbox49">
+                                        <property name="orientation">vertical</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>
@@ -4125,6 +4200,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox1">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkAlignment" id="alignment3">
@@ -4134,59 +4210,34 @@ Requires subme >= 6 and trellis >= 1.</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkVBox" id="vbox3">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="constant_rate_factor">
-                                    <property name="label" translatable="yes">Use CRF (Instead of CQP) for Constant Quality encodes</property>
+                                  <object class="GtkHBox" id="hbox6">
                                     <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="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="pref_changed_cb"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment59">
-                                    <property name="visible">True</property>
-                                    <property name="left_padding">22</property>
+                                    <property name="spacing">4</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox6">
+                                      <object class="GtkComboBox" id="VideoQualityGranularity">
+                                        <property name="width_request">55</property>
                                         <property name="visible">True</property>
-                                        <property name="spacing">4</property>
-                                        <child>
-                                          <object class="GtkComboBox" id="VideoQualityGranularity">
-                                            <property name="width_request">55</property>
-                                            <property name="visible">True</property>
-                                            <signal name="changed" handler="vqual_granularity_changed_cb"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label85">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Constant Quality fractional granularity</property>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
+                                        <signal name="changed" handler="vqual_granularity_changed_cb"/>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label85">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Constant Quality fractional granularity</property>
+                                      </object>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
@@ -4226,6 +4277,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkVBox" id="vbox2">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
                                   <object class="GtkCheckButton" id="EncodeLogLocation">
@@ -4375,6 +4427,7 @@ Requires subme >= 6 and trellis >= 1.</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkVBox" id="vbox4">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
                                   <object class="GtkCheckButton" id="allow_tweaks">
@@ -4478,6 +4531,7 @@ Requires subme >= 6 and trellis >= 1.</property>
     <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox7">
+        <property name="orientation">vertical</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="spacing">2</property>
@@ -4569,11 +4623,13 @@ Requires subme >= 6 and trellis >= 1.</property>
     <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
+        <property name="orientation">vertical</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="spacing">2</property>
         <child>
           <object class="GtkVBox" id="vbox28">
+            <property name="orientation">vertical</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>
@@ -4701,9 +4757,11 @@ Requires subme >= 6 and trellis >= 1.</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="transient-for">hb_window</property>
     <signal handler="activity_window_delete_cb" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox37">
+        <property name="orientation">vertical</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>
@@ -4715,6 +4773,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <property name="visible">True</property>
           </object>
           <packing>
+            <property name="padding">5</property>
             <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
@@ -4728,8 +4787,8 @@ Requires subme >= 6 and trellis >= 1.</property>
             <property name="shadow_type">GTK_SHADOW_IN</property>
             <child>
               <object class="GtkTextView" id="activity_view">
-                <property name="width_request">400</property>
-                <property name="height_request">500</property>
+                <property name="width_request">600</property>
+                <property name="height_request">600</property>
                 <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>
@@ -4757,9 +4816,11 @@ Requires subme >= 6 and trellis >= 1.</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="transient-for">hb_window</property>
     <signal handler="queue_window_delete_cb" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox34">
+        <property name="orientation">vertical</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>
@@ -4770,6 +4831,7 @@ Requires subme >= 6 and trellis >= 1.</property>
               <object class="GtkToolButton" id="queue_start2">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="is_important">True</property>
                 <property name="label" translatable="yes">Start</property>
                 <property name="icon_name">hb-play</property>
                 <signal handler="queue_start_clicked_cb" name="clicked"/>
@@ -4781,6 +4843,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <child>
               <object class="GtkToolButton" id="queue_pause2">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">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="label" translatable="yes">Pause</property>
@@ -4794,6 +4857,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <child>
               <object class="GtkToolButton" id="queue_edit">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">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="label" translatable="yes">Edit</property>
@@ -4811,6 +4875,7 @@ Requires subme >= 6 and trellis >= 1.</property>
         </child>
         <child>
           <object class="GtkVBox" id="vbox38">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <child>
               <object class="GtkLabel" id="current_encode">
@@ -4893,6 +4958,7 @@ Requires subme >= 6 and trellis >= 1.</property>
     <signal handler="settings_window_delete_cb" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox40">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
@@ -4938,6 +5004,7 @@ Requires subme >= 6 and trellis >= 1.</property>
 
                     <child>
                       <object class="GtkVBox" id="vbox6">
+                        <property name="orientation">vertical</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>
@@ -5172,6 +5239,7 @@ the required multiple.</property>
                         <property name="right_padding">2</property>
                         <child>
                           <object class="GtkVBox" id="vbox30">
+                            <property name="orientation">vertical</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="spacing">2</property>
@@ -5373,6 +5441,7 @@ Encoders are most effecient when the video dimensions are aligned to some specif
                         <property name="right_padding">2</property>
                         <child>
                           <object class="GtkVBox" id="vbox10">
+                            <property name="orientation">vertical</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="spacing">2</property>
@@ -5597,6 +5666,7 @@ Encoders are most effecient when the video dimensions are aligned to some specif
                 <property name="spacing">16</property>
                         <child>
                           <object class="GtkVBox" id="vbox8">
+                            <property name="orientation">vertical</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>
@@ -5712,6 +5782,7 @@ Encoders are most effecient when the video dimensions are aligned to some specif
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox39">
+                            <property name="orientation">vertical</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>
@@ -5758,7 +5829,7 @@ Encoders are most effecient when the video dimensions are aligned to some specif
                                   <object class="GtkEntry" id="PictureDetelecineCustom">
                                     <property name="width_chars">8</property>
                                     <property name="tooltip-text" translatable="yes">Custom detelecine filter string format
-	JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane</property>
+	JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
                                     <signal name="changed" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
@@ -5843,7 +5914,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                                   <object class="GtkEntry" id="PictureDecombCustom">
                                     <property name="width_chars">8</property>
                                     <property name="tooltip-text" translatable="yes">Custom decomb filter string format
-	Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight</property>
+	Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity</property>
                                     <signal name="changed" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
@@ -5887,7 +5958,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                                   <object class="GtkEntry" id="PictureDeinterlaceCustom">
                                     <property name="width_chars">8</property>
                                     <property name="tooltip-text" translatable="yes">Custom deinterlace filter string format
-	YadifMode:YadifParity:McdintMode:McdeintOp</property>
+	YadifMode:YadifParity:McdintMode:McdeintQp</property>
                                     <signal name="changed" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
@@ -5978,6 +6049,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
             <property name="bottom_padding">5</property>
             <child>
               <object class="GtkVBox" id="vbox35">
+                <property name="orientation">vertical</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>
@@ -5996,7 +6068,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox70">
+                  <object class="GtkHBox" id="live_preview_box">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <child>
@@ -6034,6 +6106,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                     </child>
                     <child>
                       <object class="GtkVBox" id="live_progress_box">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkLabel" id="label71">
@@ -6079,7 +6152,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                     <property name="visible">True</property>
                     <property name="spacing">10</property>
                     <child>
-                      <object class="GtkHBox" id="hbox60">
+                      <object class="GtkHBox" id="live_preview_duration_box">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
@@ -6139,11 +6212,11 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="settings_button">
+                      <object class="GtkToggleButton" id="hide_settings">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Open Picture Settings and Preview window.  Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
-                        <property name="label" translatable="yes">Settings</property>
+                        <property name="tooltip-text" translatable="yes">Hide the picture settings window while leaving the preview visible.</property>
+                        <property name="label" translatable="yes">Hide Settings</property>
                         <signal handler="picture_settings_alt2_clicked_cb" name="clicked"/>
                       </object>
                       <packing>
@@ -6172,6 +6245,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="resizable">False</property>
+    <property name="transient-for">hb_window</property>
     <property name="events">GDK_STRUCTURE_MASK | GDK_POINTER_MOTION_MASK</property>
     <signal handler="preview_configure_cb" name="configure-event"/>
     <signal handler="preview_window_delete_cb" name="delete_event"/>
@@ -6379,6 +6453,7 @@ libx264 authors:
     <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
@@ -6412,6 +6487,7 @@ libx264 authors:
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox8">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
@@ -6419,6 +6495,7 @@ libx264 authors:
             <property name="visible">True</property>
             <child>
               <object class="GtkVBox" id="vbox19">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEventBox" id="eventbox2">
@@ -6451,6 +6528,7 @@ libx264 authors:
             </child>
             <child>
               <object class="GtkVBox" id="vbox41">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label22">
@@ -6565,7 +6643,9 @@ libx264 authors:
   </object>
   <object class="GtkFileChooserDialog" id="source_dialog">
     <property name="border_width">5</property>
+    <property name="local-only">False</property>
     <property name="modal">True</property>
+    <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
@@ -6573,10 +6653,12 @@ libx264 authors:
     <signal handler="chooser_file_selected_cb" name="selection-changed"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox9">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkVBox" id="source_extra">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <child>
               <object class="GtkHBox" id="single_title_box">
@@ -6618,7 +6700,7 @@ libx264 authors:
             </child>
             <child>
               <object class="GtkCheckButton" id="source_folder_flag">
-                <property name="label" translatable="yes">Open VIDEO_TS folder</property>
+                <property name="label" translatable="yes">Open folder (DVD or batch)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>