X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fghb.ui;h=608743f4ade8b7ede844ea2d3ba23b8731c64809;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=77d989922a09ea538406eee8ef5630284051d83f;hpb=5e5b2b38317ee28f64baa0443b541d8f9c40d4e8;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 77d98992..608743f4 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -284,17 +284,17 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="source1">
+          <object class="GtkAction" id="source_action">
             <property name="stock_id">gtk-open</property>
-            <property name="name">source1</property>
+            <property name="name">source_action</property>
             <property name="label">_Source</property>
             <signal handler="source_button_clicked_cb" name="activate"/>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="source_single">
+          <object class="GtkAction" id="source_single_action">
             <property name="icon-name">gtk-open</property>
-            <property name="name">source_single</property>
+            <property name="name">source_single_action</property>
             <property name="label">Single _Title</property>
             <signal handler="single_title_source_cb" name="activate"/>
           </object>
@@ -426,8 +426,8 @@
     <ui>
       <menubar name="menubar1">
         <menu action="menuitem1">
-          <menuitem action="source1"/>
-          <menuitem action="source_single"/>
+          <menuitem action="source_action"/>
+          <menuitem action="source_single_action"/>
           <menuitem action="destination1"/>
           <separator/>
           <menuitem action="preferences"/>
@@ -459,6 +459,60 @@
       <column type="gchararray"/>
     </columns>
   </object>
+
+  <object class="GtkMenu" id="presets_menu">
+    <child>
+      <object class="GtkImageMenuItem" id="presets_default">
+        <property name="label">_Make Default</property>
+        <property name="image">image12</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="presets_default_clicked_cb"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="presets_new_folder">
+        <property name="label" translatable="yes">New _Folder</property>
+        <property name="use-underline">True</property>
+        <property name="visible">True</property>
+        <property name="use_stock">True</property>
+        <property name="image">image11</property>
+        <signal name="activate" handler="presets_new_folder_clicked_cb"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="preset_export">
+        <property name="label" translatable="yes">_Export</property>
+        <property name="use-underline">True</property>
+        <property name="visible">True</property>
+        <property name="image">image13</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="preset_export_clicked_cb"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="preset_import">
+        <property name="label" translatable="yes">_Import</property>
+        <property name="use-underline">True</property>
+        <property name="visible">True</property>
+        <property name="image">image14</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="preset_import_clicked_cb"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="presets_restore">
+        <property name="label" translatable="yes">_Update Built-in Presets</property>
+        <property name="image">image15</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="presets_restore_clicked_cb"/>
+      </object>
+    </child>
+  </object>
+
   <object class="GtkWindow" id="hb_window">
     <property name="visible">True</property>
     <property name="resizable">False</property>
@@ -488,7 +542,7 @@
             <property name="visible">True</property>
             <property name="icon_size">5</property>
             <child>
-              <object class="GtkToolButton" id="toolbutton1">
+              <object class="GtkToolButton" id="sourcetoolbutton">
                 <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">Choose Video Source</property>
@@ -1460,26 +1514,19 @@
                     <child>
                       <object class="GtkAlignment" id="alignment56">
                         <property name="visible">True</property>
-                        <property name="right_padding">10</property>
+                        <property name="right_padding">12</property>
+                        <property name="top_padding">12</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="GtkLabel" id="label73">
-                            <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="label_xalign">0</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment19">
                                 <property name="visible">True</property>
@@ -1488,8 +1535,8 @@
                                 <property name="right_padding">4</property>
                                 <child>
                                   <object class="GtkImage" id="preview_button_image">
-                                    <property name="width_request">240</property>
-                                    <property name="height_request">120</property>
+                                    <property name="width_request">400</property>
+                                    <property name="height_request">200</property>
                                     <property name="visible">True</property>
                                     <property name="icon_name">hb-icon</property>
                                     <property name="icon-size">6</property>
@@ -1498,13 +1545,6 @@
                                 </child>
                               </object>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label21">
-                                <property name="visible">True</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
-
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1513,6 +1553,11 @@
                           </packing>
                         </child>
 
+                    <child>
+                      <object class="GtkAlignment" id="alignment57">
+                        <property name="visible">True</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
                         <child>
                           <object class="GtkHBox" id="hbox7">
                             <property name="visible">True</property>
@@ -1524,7 +1569,7 @@
                                 <property name="justify">right</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -1537,26 +1582,22 @@
                                 <property name="label" translatable="yes">--</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
 
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                         </child>
+
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+
                       </object>
                     </child>
 
@@ -2562,132 +2603,116 @@ audio-volume-medium</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox24">
+                                  <object class="GtkTable" id="table6">
                                     <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="n_rows">4</property>
+                                    <property name="n_columns">2</property>
+                                    <property name="column-spacing">4</property>
+                                    <property name="row-spacing">2</property>
                                     <child>
-                                      <object class="GtkTable" id="table4">
+                                      <object class="GtkLabel" id="label51">
                                         <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="n_rows">3</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="column-spacing">4</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label51">
-                                            <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">Number:</property>
-                                          </object>
-                                          <packing>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment38">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0</property>
-                                            <child>
-                                              <object class="GtkSpinButton" id="x264_bframes">
-                                                <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">Sane values are 1-6. B-Frames are smaller than other frames, so they let you pack in more quality at the same bitrate. Use more of them with animated material: 9-16.</property>
-                                                <property name="adjustment">adjustment9</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
-                                        </child>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Number:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment38">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xscale">0</property>
                                         <child>
-                                          <object class="GtkLabel" id="label52">
+                                          <object class="GtkSpinButton" id="x264_bframes">
                                             <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">Direct Prediction:</property>
+                                            <property name="tooltip-text" translatable="yes">Sane values are 1-6. B-Frames are smaller than other frames, so they let you pack in more quality at the same bitrate. Use more of them with animated material: 9-16.</property>
+                                            <property name="adjustment">adjustment9</property>
+                                            <signal handler="x264_widget_changed_cb" name="value_changed"/>
                                           </object>
-                                          <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment39">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0</property>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_direct">
-                                                <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 option can improve compression efficiency. </property>
-                                                <signal handler="x264_widget_changed_cb" name="changed"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
                                         </child>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label52">
+                                        <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">Direct Prediction:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment39">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xscale">0</property>
                                         <child>
-                                          <object class="GtkLabel" id="label84">
+                                          <object class="GtkComboBox" id="x264_direct">
                                             <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">Adaptive B-Frames:</property>
+                                            <property name="tooltip-text" translatable="yes">This option can improve compression efficiency. </property>
+                                            <signal handler="x264_widget_changed_cb" name="changed"/>
                                           </object>
-                                          <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
                                         </child>
+                                      </object>
+                                      <packing>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label84">
+                                        <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">Adaptive B-Frames:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment40">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xscale">0</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment40">
+                                          <object class="GtkComboBox" id="x264_b_adapt">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0</property>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_b_adapt">
-                                                <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 option can improve compression efficiency. </property>
-                                                <signal handler="x264_widget_changed_cb" name="changed"/>
-                                              </object>
-                                            </child>
+                                            <property name="tooltip-text" translatable="yes">This option can improve compression efficiency. </property>
+                                            <signal handler="x264_widget_changed_cb" name="changed"/>
                                           </object>
-                                          <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">0</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
                                       </packing>
                                     </child>
-
-                                    <child>
-                                      <object class="GtkTable" id="table8">
-                                        <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="n_rows">2</property>
-                                        <property name="n_columns">2</property>
-
                                     <child>
                                       <object class="GtkCheckButton" id="x264_bpyramid">
                                         <property name="visible">True</property>
@@ -2699,6 +2724,13 @@ audio-volume-medium</property>
                                         <property name="draw_indicator">True</property>
                                         <signal handler="x264_widget_changed_cb" name="toggled"/>
                                       </object>
+                                      <packing>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="x264_weighted_bframes">
@@ -2712,17 +2744,12 @@ audio-volume-medium</property>
                                         <signal handler="x264_widget_changed_cb" name="toggled"/>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                       </packing>
                                     </child>
-
-                                      </object>
-                                      <packing>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-
                                   </object>
                                 </child>
                               </object>
@@ -2746,7 +2773,7 @@ audio-volume-medium</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="label_xalign">0</property>
-                            <property name="shadow_type">out</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment29">
                                 <property name="visible">True</property>
@@ -2756,10 +2783,17 @@ audio-volume-medium</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkTextView" id="x264Option">
+                                  <object class="GtkScrolledWindow" id="scrolledwindow6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                        <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">etched-in</property>
+                                    <child>
+                                      <object class="GtkTextView" id="x264Option">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                            <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
 You can edit these and add additional options.  
 
 Default values will not be shown. The defaults are:
@@ -2767,9 +2801,11 @@ 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:
 no-dct-decimate=0:cabac=1</property>
-                                    <property name="wrap_mode">GTK_WRAP_CHAR</property>
-                                    <property name="accepts_tab">False</property>
-                                    <signal handler="x264_focus_out_cb" name="focus_out_event"/>
+                                        <property name="wrap_mode">GTK_WRAP_CHAR</property>
+                                        <property name="accepts_tab">False</property>
+                                        <signal handler="x264_focus_out_cb" name="focus_out_event"/>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -2823,127 +2859,149 @@ no-dct-decimate=0:cabac=1</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox26">
+                                  <object class="GtkTable" id="table5">
                                     <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>
+                                    <property name="n_rows">4</property>
+                                    <property name="n_columns">2</property>
+                                    <property name="row-spacing">2</property>
+                                    <property name="column-spacing">4</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox34">
+                                      <object class="GtkLabel" id="label55">
                                         <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="label55">
-                                            <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">Method: </property>
-                                            <property name="width_chars">14</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment31">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0</property>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_me">
-                                                <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 sets the shape of the area x264 searches when estimating motion. Your choices are a diamond, a hexagon, a more complex hexagonal shape, or searching the entire frame. You are best off using Uneven Multi-Hexagonal searching.</property>
-                                                <signal handler="x264_me_changed_cb" name="changed"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Method: </property>
                                       </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox36">
+                                      <object class="GtkAlignment" id="alignment31">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xscale">0</property>
                                         <child>
-                                          <object class="GtkLabel" id="label57">
+                                          <object class="GtkComboBox" id="x264_me">
                                             <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">Range: </property>
-                                            <property name="width_chars">14</property>
+                                            <property name="tooltip-text" translatable="yes">This sets the shape of the area x264 searches when estimating motion. Your choices are a diamond, a hexagon, a more complex hexagonal shape, or searching the entire frame. You are best off using Uneven Multi-Hexagonal searching.</property>
+                                            <signal handler="x264_me_changed_cb" name="changed"/>
                                           </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment32">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="xscale">0</property>
-                                            <child>
-                                              <object class="GtkSpinButton" id="x264_merange">
-                                                <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 range is the radius, in pixels, x264 should use for motion estimation searches. It only has an effect when you use Uneven Multi-Hexagonal or Exhaustive searching. 24, 32, and 64 are good values.</property>
-                                                <property name="adjustment">adjustment10</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">1</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <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="GtkLabel" id="label57">
+                                        <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">Range: </property>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox37">
+                                      <object class="GtkAlignment" id="alignment32">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xscale">0</property>
                                         <child>
-                                          <object class="GtkLabel" id="label58">
+                                          <object class="GtkSpinButton" id="x264_merange">
                                             <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">Subpixel Method:</property>
-                                            <property name="width_chars">14</property>
+                                            <property name="tooltip-text" translatable="yes">This range is the radius, in pixels, x264 should use for motion estimation searches. It only has an effect when you use Uneven Multi-Hexagonal or Exhaustive searching. 24, 32, and 64 are good values.</property>
+                                            <property name="adjustment">adjustment10</property>
+                                            <signal handler="x264_widget_changed_cb" name="value_changed"/>
                                           </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
                                         </child>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <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>
+                                    <child>
+                                      <object class="GtkLabel" id="label58">
+                                        <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">Subpixel Method:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment33">
+                                        <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.05000000074505806</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment33">
+                                          <object class="GtkComboBox" id="x264_subme">
                                             <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.05000000074505806</property>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_subme">
-                                                <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">Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 9 is highest quality and slowest.  5 or 6 are commonly used values.</property>
-                                                <signal handler="x264_widget_changed_cb" name="changed"/>
-                                              </object>
-                                            </child>
+                                            <property name="tooltip-text" translatable="yes">Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 9 is highest quality and slowest.  5 or 6 are commonly used values.</property>
+                                            <signal handler="x264_widget_changed_cb" name="changed"/>
                                           </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label59">
+                                        <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">Analysis:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -2951,18 +3009,6 @@ no-dct-decimate=0:cabac=1</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="GtkLabel" id="label59">
-                                            <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">Analysis:</property>
-                                            <property name="width_chars">14</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
                                           <object class="GtkAlignment" id="alignment37">
                                             <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>
@@ -2980,7 +3026,7 @@ no-dct-decimate=0:cabac=1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="position">1</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -3003,12 +3049,17 @@ no-dct-decimate=0:cabac=1</property>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="position">2</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">3</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -3258,7 +3309,7 @@ no-dct-decimate=0:cabac=1</property>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -3392,7 +3443,7 @@ no-dct-decimate=0:cabac=1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment66">
+              <object class="GtkAlignment" id="alignment71">
                 <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="left_padding">12</property>
@@ -3462,105 +3513,62 @@ no-dct-decimate=0:cabac=1</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox31">
+                      <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="GtkHBox" id="hbox29">
+                          <object class="GtkToolButton" id="presets_save">
+                            <property name="visible">True</property>
+                            <property name="sensitive">True</property>
+                            <property name="is_important">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"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="presets_remove">
                             <property name="visible">True</property>
+                            <property name="sensitive">True</property>
+                            <property name="is_important">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"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparatorToolItem" id="toolbutton2">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="presets_menu_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">True</property>
+                            <property name="is_important">True</property>
+                            <property name="label" translatable="yes">_Options</property>
+                            <property name="use_underline">True</property>
+                            <property name="tooltip-text" translatable="yes">Preset Options</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="GtkButton" id="presets_save">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">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">Save current settings as new preset</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
-                                <signal handler="presets_save_clicked_cb" name="clicked"/>
-                                <child>
-                                  <object class="GtkImage" id="image5">
-                                    <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="stock">gtk-add</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="presets_remove">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">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 the selected preset</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
-                                <signal handler="presets_remove_clicked_cb" name="clicked"/>
-                                <child>
-                                  <object class="GtkImage" id="image6">
-                                    <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="stock">gtk-remove</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label78">
-                                <property name="width_request">41</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>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="presets_default">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip-text" translatable="yes">Make the current preset the default.</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
-                                <signal handler="presets_default_clicked_cb" name="clicked"/>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-apply</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="presets_restore">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip-text" translatable="yes">Reload HandBrakes standard presets</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
-                                <signal handler="presets_restore_clicked_cb" name="clicked"/>
-                                <child>
-                                  <object class="GtkImage" id="image7">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-refresh</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
+                            <property name="icon_name">gtk-execute</property>
+                            <signal handler="presets_menu_clicked_cb" name="clicked"/>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -4008,15 +4016,23 @@ no-dct-decimate=0:cabac=1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox63">
+                          <object class="GtkAlignment" id="alignment70">
                             <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>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="yscale">0</property>
+                            <property name="left_padding">12</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
                             <child>
-                              <placeholder/>
+                              <object class="GtkCheckButton" id="AddCC">
+                                <property name="label" translatable="yes">Add Closed Captions when available</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="active">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="pref_changed_cb"/>
+                              </object>
                             </child>
                           </object>
                           <packing>
@@ -4032,7 +4048,7 @@ no-dct-decimate=0:cabac=1</property>
                     <child type="tab">
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Audio</property>
+                        <property name="label" translatable="yes">Audio/Subtitles</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -4261,6 +4277,29 @@ no-dct-decimate=0:cabac=1</property>
                           </packing>
                         </child>
                         <child>
+                          <object class="GtkAlignment" id="alignment48">
+                            <property name="visible">True</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkCheckButton" id="AutoScan">
+                                <property name="label" translatable="yes">Automatically Scan DVD when loaded</property>
+                                <property name="tooltip-text" translatable="yes">Scans the DVD whenever a new disc is loaded</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="pref_changed_cb"/>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkAlignment" id="hidden_prefs">
                             <property name="visible">True</property>
                             <property name="top_padding">6</property>
@@ -4300,7 +4339,7 @@ no-dct-decimate=0:cabac=1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">4</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
                       </object>
@@ -4492,7 +4531,6 @@ no-dct-decimate=0:cabac=1</property>
                     <property name="activates_default">True</property>
                     <property name="width_chars">30</property>
                     <property name="truncate_multiline">True</property>
-                    <signal handler="preset_name_changed_cb" name="changed"/>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -4543,43 +4581,6 @@ no-dct-decimate=0:cabac=1</property>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkHBox" id="hbox43">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkRadioButton" id="preset_type_folder">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Folder</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="preset_type_changed_cb"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="preset_type_normal">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Preset</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">preset_type_folder</property>
-                    <signal name="toggled" handler="preset_type_changed_cb"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="position">1</property>
@@ -6584,4 +6585,24 @@ libx264 authors:
       <action-widget response="-3">source_ok</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkImage" id="image11">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="image12">
+    <property name="visible">True</property>
+    <property name="stock">gtk-apply</property>
+  </object>
+  <object class="GtkImage" id="image13">
+    <property name="visible">True</property>
+    <property name="stock">gtk-save-as</property>
+  </object>
+  <object class="GtkImage" id="image14">
+    <property name="visible">True</property>
+    <property name="stock">gtk-open</property>
+  </object>
+  <object class="GtkImage" id="image15">
+    <property name="visible">True</property>
+    <property name="stock">gtk-refresh</property>
+  </object>
 </interface>