LinGui: variable number of preview frames. preference option to set

the number of frames

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

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index c5234e59bb1c23b740e225a14c963a9cd57b50ee..0eeae277d0f05d74ada1cf5fd643195c38a43127 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -576,7 +576,9 @@ ghb_do_scan(signal_user_data_t *ud, const gchar *filename, gboolean force)
                        gtk_progress_bar_set_text (progress, "Scanning ...");
                        ghb_hb_cleanup(TRUE);
                        prune_logs(ud);
-                       ghb_backend_scan (path, 0);
+                       gint preview_count;
+                       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                       ghb_backend_scan(path, 0, preview_count);
                        g_free(path);
                }
                else
@@ -1026,10 +1028,15 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        }
 
        // Unfortunately, there is no way to query how many frames were
-       // actually generated during the scan.  It attempts to make 10.
+       // actually generated during the scan.
        // If I knew how many were generated, I would adjust the spin
        // control range here.
-       ghb_ui_update(ud, "preview_frame", ghb_int64_value(1));
+       // I do know how many were asked for.
+       gint preview_count;
+       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+       widget = GHB_WIDGET(ud->builder, "preview_frame");
+       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, preview_count);
+       ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
 
        ghb_set_preview_image (ud);
 }
@@ -2476,13 +2483,15 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
                        update_source_label(ud, device);
                        ghb_hb_cleanup(TRUE);
                        prune_logs(ud);
-                       ghb_backend_scan(device, 0);
+                       gint preview_count;
+                       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                       ghb_backend_scan(device, 0, preview_count);
                }
                else
                {
                        ghb_hb_cleanup(TRUE);
                        prune_logs(ud);
-                       ghb_backend_scan("/dev/null", 0);
+                       ghb_backend_scan("/dev/null", 0, 1);
                }
        }
        g_free(device);

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 8995bbeb7578d3cd1f07ddde4641318a885d232e..489c8b7dc2442b6aa3cf91a0a022da636e2d3e93 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -168,6 +168,14 @@
     <property name="page_increment">10</property>
     <property name="value">0</property>
   </object>
+  <object class="GtkAdjustment" id="preview_count_adj">
+    <property name="upper">30</property>
+    <property name="lower">5</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">5</property>
+    <property name="page_size">0</property>
+    <property name="value">10</property>
+  </object>
   <object class="GtkUIManager" id="uimanager1">
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
@@ -266,7 +274,7 @@
         <child>
           <object class="GtkToggleAction" id="show_presets">
             <property name="visible">True</property>
-            <property name="active">False</property>
+            <property name="active">True</property>
             <property name="name">show_presets</property>
             <property name="label" translatable="yes">Show Presets</property>
             <signal handler="show_presets_toggled_cb" name="toggled"/>
@@ -456,6 +464,7 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -479,6 +488,8 @@
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
@@ -519,7 +530,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="title">
-                                               <property name="height_request">16</property>
                                     <property name="width_request">150</property>
                                     <property name="visible">True</property>
                                     <property name="has_frame">False</property>
@@ -657,15 +667,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
@@ -675,141 +676,142 @@
                       <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
                         <child>
-                          <object class="GtkVBox" id="vbox4">
+                          <object class="GtkHBox" id="hbox_j4">
                             <property name="visible">True</property>
+                            <property name="spacing">12</property>
                             <child>
-                              <object class="GtkHBox" id="hbox6">
+                              <object class="GtkTable" id="table3">
                                 <property name="visible">True</property>
-                                <property name="spacing">5</property>
-
-
-
-
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                                 <child>
                                   <object class="GtkFileChooserButton" id="dest_dir">
                                     <property name="visible">True</property>
-                                    <property name="action">select-folder</property>
+                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                     <property name="title" translatable="yes">Destination Directory</property>
                                     <signal name="selection_changed" handler="dest_dir_set_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label18">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">File:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</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="GtkEntry" id="dest_file">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="width_chars">20</property>
-                                    <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
+                                    <property name="width_chars">30</property>
                                     <signal name="changed" handler="dest_file_changed_cb"/>
                                     <signal name="grab_focus" handler="destination_grab_cb" after="yes"/>
+                                    <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
                                   </object>
                                   <packing>
-                                    <property name="position">2</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                   </packing>
                                 </child>
-
-
-
-
-
-
-
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="container_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="spacing">8</property>
                                 <child>
-                                  <object class="GtkLabel" id="label10">
+                                  <object class="GtkLabel" id="label18">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Container:</property>
+                                    <property name="label" translatable="yes">File:</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkTable" id="table1">
+                                <property name="visible">True</property>
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">4</property>
                                 <child>
-                                  <object class="GtkComboBox" id="FileFormat">
+                                  <object class="GtkHBox" id="hbox3">
                                     <property name="visible">True</property>
-                                    <property name="tooltip-text" translatable="yes">Output file container type</property>
-                                    <signal handler="container_changed_cb" name="changed"/>
+                                    <child>
+                                      <object class="GtkLabel" id="label27">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Container:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBox" id="FileFormat">
+                                        <property name="visible">True</property>
+                                        <signal name="changed" handler="container_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">1</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment39">
+                                  <object class="GtkCheckButton" id="Mp4iPodCompatible">
+                                    <property name="label" translatable="yes">iPod 5G Support</property>
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0.10000000149011612</property>
-                                    <property name="xscale">0</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="Mp4iPodCompatible">
-                                        <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="label" translatable="yes">iPod 5G Support</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                    </child>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="Mp4HttpOptimize">
+                                    <property name="label" translatable="yes">Web optimized</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Web optimized</property>
-                                    <property name="tooltip-text" translatable="yes">Tunes the MP4 to be better suited for streaming</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="http_opt_changed_cb" name="toggled"/>
+                                    <signal name="toggled" handler="http_opt_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="Mp4LargeFile">
+                                    <property name="label" translatable="yes">Large file size (&gt;4GB)</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Caution: This option will likely break device compatiblity with all but the AppleTV Take 2. Checking this box enables a 64 bit mp4 file which can be over 4 GB.</property>
-                                    <property name="label" translatable="yes">Large file size (&gt;4GB)</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                    <signal name="toggled" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="position">4</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>
                               </object>
                               <packing>
                                 <property name="position">1</property>
+                                <property name="expand">False</property>
                               </packing>
                             </child>
                           </object>
@@ -826,7 +828,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
@@ -865,7 +867,7 @@
                               <object class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <child>
@@ -991,7 +993,7 @@
                               <object class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -1116,7 +1118,7 @@
                                   <object class="GtkAlignment" id="alignment7">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="top_padding">2</property>
+                                    <property name="top_padding">6</property>
                                     <property name="bottom_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <property name="right_padding">2</property>
@@ -1389,7 +1391,7 @@
                               <object class="GtkAlignment" id="alignment10">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <child>
@@ -1708,7 +1710,7 @@
                           <object class="GtkAlignment" id="alignment18">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="top_padding">2</property>
+                            <property name="top_padding">6</property>
                             <property name="bottom_padding">2</property>
                             <property name="left_padding">12</property>
                             <property name="right_padding">2</property>
@@ -1990,7 +1992,7 @@
                               <object class="GtkAlignment" id="alignmentj01">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2032,7 +2034,7 @@
                               <object class="GtkAlignment" id="alignmentj02">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2119,6 +2121,7 @@
                               <object class="GtkAlignment" id="alignment25">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="top_padding">6</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox22">
@@ -2198,7 +2201,7 @@
                               <object class="GtkAlignment" id="alignment26">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2428,7 +2431,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                               <object class="GtkAlignment" id="alignment30">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2649,7 +2652,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                               <object class="GtkAlignment" id="alignment35">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2916,7 +2919,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
         </child>
         <child>
           <object class="GtkFrame" id="presets_frame">
-            <property name="visible">False</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="border_width">3</property>
             <property name="label_xalign">0</property>
@@ -2926,6 +2929,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
               <object class="GtkAlignment" id="alignment21">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="top_padding">6</property>
                 <property name="left_padding">8</property>
                 <child>
                   <object class="GtkVBox" id="presets_vbox">
@@ -3085,6 +3089,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
   </object>
   <object class="GtkDialog" id="prefs_dialog">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Preferences</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -3127,11 +3132,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkFrame" id="frame16">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+
                 <child>
                   <object class="GtkAlignment" id="alignment6">
                     <property name="visible">True</property>
@@ -3232,6 +3233,48 @@ location as the movie.</property>
                             <property name="position">5</property>
                           </packing>
                         </child>
+
+                        <child>
+                          <object class="GtkAlignment" id="alignment_j6">
+                            <property name="visible">True</property>
+                            <property name="left_padding">4</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox_j3">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkSpinButton" id="preview_count">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="max_length">2</property>
+                                    <property name="shadow_type">none</property>
+                                    <property name="adjustment">preview_count_adj</property>
+                                    <property name="numeric">True</property>
+                                    <signal name="value_changed" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_j3">
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes"> Number of previews </property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">6</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkCheckButton" id="allow_tweaks">
                             <property name="can_focus">True</property>
@@ -3240,7 +3283,7 @@ location as the movie.</property>
                             <signal name="toggled" handler="tweaks_changed_cb"/>
                           </object>
                           <packing>
-                            <property name="position">6</property>
+                            <property name="position">7</property>
                           </packing>
                         </child>
                         <child>
@@ -3251,25 +3294,17 @@ location as the movie.</property>
                             <signal name="toggled" handler="hbfd_feature_changed_cb"/>
                           </object>
                           <packing>
-                            <property name="position">7</property>
+                            <property name="position">8</property>
                           </packing>
                         </child>
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label18">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Preferences&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
+
           </object>
           <packing>
             <property name="position">1</property>
@@ -3452,7 +3487,7 @@ location as the movie.</property>
                   <object class="GtkAlignment" id="alignment36">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="top_padding">2</property>
+                    <property name="top_padding">6</property>
                     <property name="bottom_padding">4</property>
                     <property name="left_padding">12</property>
                     <property name="right_padding">4</property>
@@ -3891,7 +3926,6 @@ location as the movie.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="max_length">2</property>
-                    <property name="has_frame">False</property>
                     <property name="shadow_type">none</property>
                     <property name="adjustment">adjustment19</property>
                     <property name="numeric">True</property>
@@ -4163,7 +4197,7 @@ location as the movie.</property>
                   <object class="GtkAlignment" id="alignment43">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="top_padding">2</property>
+                    <property name="top_padding">6</property>
                     <property name="bottom_padding">2</property>
                     <property name="left_padding">12</property>
                     <property name="right_padding">2</property>
@@ -4358,7 +4392,7 @@ the other to maintain the video's original aspect ratio.</property>
                       <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="top_padding">2</property>
+                        <property name="top_padding">6</property>
                         <property name="bottom_padding">2</property>
                         <property name="left_padding">12</property>
                         <child>

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 5c874141144d680425c4a14dd7b7a95d16382239..252d96f9e0211b39d59341e32fb7bad555345c4a 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1996,9 +1996,9 @@ ghb_backend_close()
 }
 
 void
-ghb_backend_scan(const gchar *path, gint titleindex)
+ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count)
 {
-    hb_scan( h_scan, path, titleindex );
+    hb_scan( h_scan, path, titleindex, preview_count, 1 );
        hb_status.scan.state |= GHB_STATE_SCANNING;
        // initialize count and cur to something that won't cause FPE
        // when computing progress
@@ -2010,7 +2010,7 @@ void
 ghb_backend_queue_scan(const gchar *path, gint titlenum)
 {
        g_debug("ghb_backend_queue_scan()");
-       hb_scan( h_queue, path, titlenum );
+       hb_scan( h_queue, path, titlenum, 10, 0 );
        hb_status.queue.state |= GHB_STATE_SCANNING;
 }
 

diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index 16165d61b0bb7186ab4787d07283539c942b6bfa..8fa0ddc829c378122e090e4c751b07d432445e43 100644 (file)
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -113,7 +113,7 @@ gint ghb_get_scan_state();
 gint ghb_get_queue_state();
 void ghb_get_status(ghb_status_t *status);
 void ghb_track_status(void);
-void ghb_backend_scan(const gchar *path, gint titleindex);
+void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count);
 void ghb_backend_queue_scan(const gchar *path, gint titleindex);
 gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
 void ghb_set_scale(signal_user_data_t *ud, gint mode);

diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index bdb599afe729c25585ff811da57d4489c56d5920..d531a0c3698dd31d1943cd4106b4ffa7e0dad6d4 100644 (file)
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -112,6 +112,8 @@
                <true />
                <key>noscale</key>
                <false />
+               <key>preview_count</key>
+               <integer>10</integer>
                <key>show_presets</key>
                <true />
                <key>use_source_name</key>

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index bc77de007fdd656f07a0c9de7b8ac84d3bace985..a085d2ca2031acee6079f76118c7f08b9f177106 100644 (file)
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -215,6 +215,16 @@
 "\n"
 "    <property name="value">0</property>\n"
 "  </object>\n"
+"  <object class="GtkAdjustment" id="preview_count_adj"
+"">\n"
+"    <property name="upper">30</property>\n"
+"    <property name="lower">5</property>\n"
+"    <property name="page_increment">10</property>"
+"\n"
+"    <property name="step_increment">5</property>\n"
+"    <property name="page_size">0</property>\n"
+"    <property name="value">10</property>\n"
+"  </object>\n"
 "  <object class="GtkUIManager" id="uimanager1"&g"
 "t;\n"
 "    <child>\n"
@@ -373,8 +383,8 @@
 "esets">\n"
 "            <property name="visible">True</property&"
 "gt;\n"
-"            <property name="active">False</property&"
-"gt;\n"
+"            <property name="active">True</property&g"
+"t;\n"
 "            <property name="name">show_presets</prop"
 "erty>\n"
 "            <property name="label" translatable="yes&"
@@ -665,6 +675,8 @@
 "            </child>\n"
 "          </object>\n"
 "          <packing>\n"
+"            <property name="expand">False</property&"
+"gt;\n"
 "            <property name="position">1</property&gt"
 ";\n"
 "          </packing>\n"
@@ -702,6 +714,10 @@
 "t;/property>\n"
 "                        <property name="left_padding">1"
 "2</property>\n"
+"                        <property name="top_padding">6&"
+"lt;/property>\n"
+"                        <property name="bottom_padding"&gt"
+";6</property>\n"
 "                        <child>\n"
 "                          <object class="GtkVBox" id=&quot"
 ";vbox3">\n"
@@ -764,8 +780,6 @@
 "                                <child>\n"
 "                                  <object class="GtkComboBox&qu"
 "ot; id="title">\n"
-"                                              <property name="height_request"&gt"
-";16</property>\n"
 "                                    <property name="width_reque"
 "st">150</property>\n"
 "                                    <property name="visible&quo"
@@ -984,19 +998,6 @@
 "                  </packing>\n"
 "                </child>\n"
 "                <child>\n"
-"                  <object class="GtkHSeparator" id="h"
-"separator1">\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                  </object>\n"
-"                  <packing>\n"
-"                    <property name="expand">False</p"
-"roperty>\n"
-"                    <property name="position">1</pro"
-"perty>\n"
-"                  </packing>\n"
-"                </child>\n"
-"                <child>\n"
 "                  <object class="GtkFrame" id="frame2"
 "">\n"
 "                    <property name="visible">True</p"
@@ -1012,29 +1013,36 @@
 "t;/property>\n"
 "                        <property name="left_padding">1"
 "2</property>\n"
+"                        <property name="top_padding">6&"
+"lt;/property>\n"
+"                        <property name="bottom_padding"&gt"
+";6</property>\n"
 "                        <child>\n"
-"                          <object class="GtkVBox" id=&quot"
-";vbox4">\n"
+"                          <object class="GtkHBox" id=&quot"
+";hbox_j4">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
+"                            <property name="spacing">12"
+"</property>\n"
 "                            <child>\n"
-"                              <object class="GtkHBox" id=&"
-"quot;hbox6">\n"
+"                              <object class="GtkTable" id="
+""table3">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
-"                                <property name="spacing"&g"
-"t;5</property>\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"                                <property name="n_rows"&gt"
+";2</property>\n"
+"                                <property name="n_columns""
+">2</property>\n"
+"                                <child>\n"
+"                                  <placeholder/>\n"
+"                                </child>\n"
 "                                <child>\n"
 "                                  <object class="GtkFileChooser"
 "Button" id="dest_dir">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="action&quot"
-";>select-folder</property>\n"
+";>GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>\n"
 "                                    <property name="title""
 " translatable="yes">Destination Directory</property>"
 "\n"
@@ -1042,25 +1050,14 @@
 "nged" handler="dest_dir_set_cb"/>\n"
 "                                  </object>\n"
 "                                  <packing>\n"
-"                                    <property name="position&qu"
-"ot;>0</property>\n"
-"                                  </packing>\n"
-"                                </child>\n"
-"                                <child>\n"
-"                                  <object class="GtkLabel""
-" id="label18">\n"
-"                                    <property name="visible&quo"
-"t;>True</property>\n"
-"                                    <property name="label""
-" translatable="yes">File:</property>\n"
-"                                  </object>\n"
-"                                  <packing>\n"
-"                                    <property name="expand&quot"
-";>False</property>\n"
-"                                    <property name="fill"&"
-"gt;False</property>\n"
-"                                    <property name="position&qu"
-"ot;>1</property>\n"
+"                                    <property name="left_attach"
+"">1</property>\n"
+"                                    <property name="right_attac"
+"h">2</property>\n"
+"                                    <property name="top_attach&"
+"quot;>1</property>\n"
+"                                    <property name="bottom_atta"
+"ch">2</property>\n"
 "                                  </packing>\n"
 "                                </child>\n"
 "                                <child>\n"
@@ -1071,168 +1068,175 @@
 "                                    <property name="can_focus&q"
 "uot;>True</property>\n"
 "                                    <property name="width_chars"
-"">20</property>\n"
-"                                    <accelerator key="d" s"
-"ignal="grab-focus" modifiers="GDK_MOD1_MASK"/>\n"
+"">30</property>\n"
 "                                    <signal name="changed""
 " handler="dest_file_changed_cb"/>\n"
 "                                    <signal name="grab_focus&qu"
 "ot; handler="destination_grab_cb" after="yes"/>\n"
+"                                    <accelerator key="d" s"
+"ignal="grab-focus" modifiers="GDK_MOD1_MASK"/>\n"
 "                                  </object>\n"
 "                                  <packing>\n"
-"                                    <property name="position&qu"
-"ot;>2</property>\n"
+"                                    <property name="left_attach"
+"">1</property>\n"
+"                                    <property name="right_attac"
+"h">2</property>\n"
 "                                  </packing>\n"
 "                                </child>\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"                              </object>\n"
-"                            </child>\n"
-"                            <child>\n"
-"                              <object class="GtkHBox" id=&"
-"quot;container_box">\n"
-"                                <property name="visible"&g"
-"t;True</property>\n"
-"                                <property name="events"&gt"
-";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
-"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                <property name="spacing"&g"
-"t;8</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkLabel""
-" id="label10">\n"
+" id="label18">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="label""
-" translatable="yes">Container:</property>\n"
+" translatable="yes">File:</property>\n"
 "                                  </object>\n"
-"                                  <packing>\n"
-"                                    <property name="expand&quot"
-";>False</property>\n"
-"                                    <property name="fill"&"
-"gt;False</property>\n"
-"                                  </packing>\n"
 "                                </child>\n"
+"                              </object>\n"
+"                              <packing>\n"
+"                                <property name="expand"&gt"
+";False</property>\n"
+"                              </packing>\n"
+"                            </child>\n"
+"                            <child>\n"
+"                              <object class="GtkTable" id="
+""table1">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <property name="n_rows"&gt"
+";2</property>\n"
+"                                <property name="n_columns""
+">2</property>\n"
+"                                <property name="column_spacing&"
+"quot;>4</property>\n"
 "                                <child>\n"
-"                                  <object class="GtkComboBox&qu"
-"ot; id="FileFormat">\n"
+"                                  <object class="GtkHBox" "
+"id="hbox3">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
-"                                    <property name="tooltip-tex"
-"t" translatable="yes">Output file container type</"
-"property>\n"
-"                                    <signal handler="container_"
-"changed_cb" name="changed"/>\n"
+"                                    <child>\n"
+"                                      <object class="GtkLabel&q"
+"uot; id="label27">\n"
+"                                        <property name="visible"
+"">True</property>\n"
+"                                        <property name="label&q"
+"uot; translatable="yes">Container:</property>\n"
+"                                      </object>\n"
+"                                      <packing>\n"
+"                                        <property name="expand&"
+"quot;>False</property>\n"
+"                                        <property name="fill&qu"
+"ot;>False</property>\n"
+"                                        <property name="positio"
+"n">0</property>\n"
+"                                      </packing>\n"
+"                                    </child>\n"
+"                                    <child>\n"
+"                                      <object class="GtkComboBo"
+"x" id="FileFormat">\n"
+"                                        <property name="visible"
+"">True</property>\n"
+"                                        <signal name="changed&q"
+"uot; handler="container_changed_cb"/>\n"
+"                                      </object>\n"
+"                                      <packing>\n"
+"                                        <property name="expand&"
+"quot;>False</property>\n"
+"                                        <property name="positio"
+"n">1</property>\n"
+"                                      </packing>\n"
+"                                    </child>\n"
 "                                  </object>\n"
-"                                  <packing>\n"
-"                                    <property name="expand&quot"
-";>False</property>\n"
-"                                    <property name="position&qu"
-"ot;>1</property>\n"
-"                                  </packing>\n"
 "                                </child>\n"
 "                                <child>\n"
-"                                  <object class="GtkAlignment&q"
-"uot; id="alignment39">\n"
+"                                  <object class="GtkCheckButton"
+"" id="Mp4iPodCompatible">\n"
+"                                    <property name="label""
+" translatable="yes">iPod 5G Support</property>\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
+"                                    <property name="can_focus&q"
+"uot;>True</property>\n"
+"                                    <property name="receives_de"
+"fault">False</property>\n"
 "                                    <property name="events&quot"
 ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                    <property name="xalign&quot"
-";>0.10000000149011612</property>\n"
-"                                    <property name="xscale&quot"
-";>0</property>\n"
-"                                    <child>\n"
-"                                      <object class="GtkCheckBu"
-"tton" id="Mp4iPodCompatible">\n"
-"                                        <property name="visible"
-"">True</property>\n"
-"                                        <property name="can_foc"
-"us">True</property>\n"
-"                                        <property name="events&"
-"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                        <property name="label&q"
-"uot; translatable="yes">iPod 5G Support</property>\n"
-"                                        <property name="draw_in"
-"dicator">True</property>\n"
-"                                        <signal handler="settin"
-"g_widget_changed_cb" name="toggled"/>\n"
-"                                      </object>\n"
-"                                    </child>\n"
+"                                    <property name="draw_indica"
+"tor">True</property>\n"
+"                                    <signal name="toggled""
+" handler="setting_widget_changed_cb"/>\n"
 "                                  </object>\n"
 "                                  <packing>\n"
-"                                    <property name="expand&quot"
-";>False</property>\n"
-"                                    <property name="position&qu"
-"ot;>2</property>\n"
+"                                    <property name="left_attach"
+"">1</property>\n"
+"                                    <property name="right_attac"
+"h">2</property>\n"
 "                                  </packing>\n"
 "                                </child>\n"
 "                                <child>\n"
 "                                  <object class="GtkCheckButton"
 "" id="Mp4HttpOptimize">\n"
+"                                    <property name="label""
+" translatable="yes">Web optimized</property>\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="can_focus&q"
 "uot;>True</property>\n"
+"                                    <property name="receives_de"
+"fault">False</property>\n"
 "                                    <property name="events&quot"
 ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                    <property name="label""
-" translatable="yes">Web optimized</property>\n"
-"                                    <property name="tooltip-tex"
-"t" translatable="yes">Tunes the MP4 to be better suit"
-"ed for streaming</property>\n"
 "                                    <property name="draw_indica"
 "tor">True</property>\n"
-"                                    <signal handler="http_opt_c"
-"hanged_cb" name="toggled"/>\n"
+"                                    <signal name="toggled""
+" handler="http_opt_changed_cb"/>\n"
 "                                  </object>\n"
 "                                  <packing>\n"
-"                                    <property name="expand&quot"
-";>False</property>\n"
-"                                    <property name="position&qu"
-"ot;>3</property>\n"
+"                                    <property name="top_attach&"
+"quot;>1</property>\n"
+"                                    <property name="bottom_atta"
+"ch">2</property>\n"
 "                                  </packing>\n"
 "                                </child>\n"
 "                                <child>\n"
 "                                  <object class="GtkCheckButton"
 "" id="Mp4LargeFile">\n"
+"                                    <property name="label""
+" translatable="yes">Large file size (>4GB)</prop"
+"erty>\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="can_focus&q"
 "uot;>True</property>\n"
+"                                    <property name="receives_de"
+"fault">False</property>\n"
 "                                    <property name="events&quot"
 ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                    <property name="tooltip-tex"
-"t" translatable="yes">Caution: This option will likel"
-"y break device compatiblity with all but the AppleTV Take 2. Checking t"
-"his box enables a 64 bit mp4 file which can be over 4 GB.</property&"
-"gt;\n"
-"                                    <property name="label""
-" translatable="yes">Large file size (>4GB)</prop"
-"erty>\n"
 "                                    <property name="draw_indica"
 "tor">True</property>\n"
-"                                    <signal handler="setting_wi"
-"dget_changed_cb" name="toggled"/>\n"
+"                                    <signal name="toggled""
+" handler="setting_widget_changed_cb"/>\n"
 "                                  </object>\n"
 "                                  <packing>\n"
-"                                    <property name="position&qu"
-"ot;>4</property>\n"
+"                                    <property name="left_attach"
+"">1</property>\n"
+"                                    <property name="right_attac"
+"h">2</property>\n"
+"                                    <property name="top_attach&"
+"quot;>1</property>\n"
+"                                    <property name="bottom_atta"
+"ch">2</property>\n"
 "                                  </packing>\n"
 "                                </child>\n"
 "                              </object>\n"
 "                              <packing>\n"
 "                                <property name="position"&"
 "gt;1</property>\n"
+"                                <property name="expand"&gt"
+";False</property>\n"
 "                              </packing>\n"
 "                            </child>\n"
 "                          </object>\n"
@@ -1255,7 +1259,7 @@
 "                  <packing>\n"
 "                    <property name="expand">False</p"
 "roperty>\n"
-"                    <property name="position">2</pro"
+"                    <property name="position">1</pro"
 "perty>\n"
 "                  </packing>\n"
 "                </child>\n"
@@ -1324,7 +1328,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -1533,7 +1537,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -1735,7 +1739,7 @@
 ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                    <property name="top_padding"
-"">2</property>\n"
+"">6</property>\n"
 "                                    <property name="bottom_padd"
 "ing">2</property>\n"
 "                                    <property name="left_paddin"
@@ -2155,7 +2159,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -2688,7 +2692,7 @@
 "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
 "MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                            <property name="top_padding"&g"
-"t;2</property>\n"
+"t;6</property>\n"
 "                            <property name="bottom_padding&quot"
 ";>2</property>\n"
 "                            <property name="left_padding"&"
@@ -3172,7 +3176,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -3246,7 +3250,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -3393,6 +3397,8 @@
 "                                <property name="events"&gt"
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
+"                                <property name="top_padding&quo"
+"t;>6</property>\n"
 "                                <property name="left_padding&qu"
 "ot;>12</property>\n"
 "                                <child>\n"
@@ -3534,7 +3540,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -3929,7 +3935,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -4315,7 +4321,7 @@
 ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
 "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                <property name="top_padding&quo"
-"t;>2</property>\n"
+"t;>6</property>\n"
 "                                <property name="bottom_padding&"
 "quot;>2</property>\n"
 "                                <property name="left_padding&qu"
@@ -4758,8 +4764,8 @@
 "        <child>\n"
 "          <object class="GtkFrame" id="presets_frame&"
 "quot;>\n"
-"            <property name="visible">False</property"
-">\n"
+"            <property name="visible">True</property&"
+"gt;\n"
 "            <property name="events">GDK_POINTER_MOTION_"
 "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO"
 "N_RELEASE_MASK</property>\n"
@@ -4779,6 +4785,8 @@
 "                <property name="events">GDK_POINTER_MOT"
 "ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
 "UTTON_RELEASE_MASK</property>\n"
+"                <property name="top_padding">6</prop"
+"erty>\n"
 "                <property name="left_padding">8</pro"
 "perty>\n"
 "                <child>\n"
@@ -5038,6 +5046,8 @@
 "  <object class="GtkDialog" id="prefs_dialog"&gt"
 ";\n"
 "    <property name="border_width">5</property>\n"
+"    <property name="title" translatable="yes"&gt"
+";Preferences</property>\n"
 "    <property name="modal">True</property>\n"
 "    <property name="window_position">GTK_WIN_POS_CENTER"
 "_ON_PARENT</property>\n"
@@ -5105,15 +5115,7 @@
 "                </child>\n"
 "              </object>\n"
 "            </child>\n"
-"            <child>\n"
-"              <object class="GtkFrame" id="frame16&qu"
-"ot;>\n"
-"                <property name="visible">True</prope"
-"rty>\n"
-"                <property name="label_xalign">0</pro"
-"perty>\n"
-"                <property name="shadow_type">GTK_SHADOW"
-"_ETCHED_OUT</property>\n"
+"\n"
 "                <child>\n"
 "                  <object class="GtkAlignment" id="al"
 "ignment6">\n"
@@ -5270,6 +5272,71 @@
 "</property>\n"
 "                          </packing>\n"
 "                        </child>\n"
+"\n"
+"                        <child>\n"
+"                          <object class="GtkAlignment" id="
+""alignment_j6">\n"
+"                            <property name="visible">Tr"
+"ue</property>\n"
+"                            <property name="left_padding"&"
+"gt;4</property>\n"
+"                            <child>\n"
+"                              <object class="GtkHBox" id=&"
+"quot;hbox_j3">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"                                <child>\n"
+"                                  <object class="GtkSpinButton&"
+"quot; id="preview_count">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="can_focus&q"
+"uot;>True</property>\n"
+"                                    <property name="max_length&"
+"quot;>2</property>\n"
+"                                    <property name="shadow_type"
+"">none</property>\n"
+"                                    <property name="adjustment&"
+"quot;>preview_count_adj</property>\n"
+"                                    <property name="numeric&quo"
+"t;>True</property>\n"
+"                                    <signal name="value_changed"
+"" handler="pref_changed_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>0</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkLabel""
+" id="label_j3">\n"
+"                                    <property name="justify&quo"
+"t;>GTK_JUSTIFY_LEFT</property>\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="label""
+" translatable="yes"> Number of previews </property>\n"
+"                                    <property name="use_markup&"
+"quot;>True</property>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>1</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                            </child>\n"
+"                          </object>\n"
+"                          <packing>\n"
+"                            <property name="position">6"
+"</property>\n"
+"                          </packing>\n"
+"                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkCheckButton" i"
 "d="allow_tweaks">\n"
@@ -5283,7 +5350,7 @@
 "="tweaks_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
-"                            <property name="position">6"
+"                            <property name="position">7"
 "</property>\n"
 "                          </packing>\n"
 "                        </child>\n"
@@ -5300,32 +5367,19 @@
 "="hbfd_feature_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
-"                            <property name="position">7"
+"                            <property name="position">8"
 "</property>\n"
 "                          </packing>\n"
 "                        </child>\n"
 "                      </object>\n"
 "                    </child>\n"
 "                  </object>\n"
-"                </child>\n"
-"                <child type="label">\n"
-"                  <object class="GtkLabel" id="label1"
-"8">\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                    <property name="label" translatable=&q"
-"uot;yes"><b>Preferences</b></pro"
+"                  <packing>\n"
+"                    <property name="position">1</pro"
 "perty>\n"
-"                    <property name="use_markup">True&lt"
-";/property>\n"
-"                  </object>\n"
+"                  </packing>\n"
 "                </child>\n"
-"              </object>\n"
-"              <packing>\n"
-"                <property name="position">1</propert"
-"y>\n"
-"              </packing>\n"
-"            </child>\n"
+"\n"
 "          </object>\n"
 "          <packing>\n"
 "            <property name="position">1</property&gt"
@@ -5628,7 +5682,7 @@
 "                    <property name="events">GDK_POINTER"
 "_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G"
 "DK_BUTTON_RELEASE_MASK</property>\n"
-"                    <property name="top_padding">2</"
+"                    <property name="top_padding">6</"
 "property>\n"
 "                    <property name="bottom_padding">4&l"
 "t;/property>\n"
@@ -6331,8 +6385,6 @@
 "/property>\n"
 "                    <property name="max_length">2</p"
 "roperty>\n"
-"                    <property name="has_frame">False&lt"
-";/property>\n"
 "                    <property name="shadow_type">none&l"
 "t;/property>\n"
 "                    <property name="adjustment">adjustm"
@@ -6752,7 +6804,7 @@
 "                    <property name="events">GDK_POINTER"
 "_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G"
 "DK_BUTTON_RELEASE_MASK</property>\n"
-"                    <property name="top_padding">2</"
+"                    <property name="top_padding">6</"
 "property>\n"
 "                    <property name="bottom_padding">2&l"
 "t;/property>\n"
@@ -7083,7 +7135,7 @@
 "                        <property name="events">GDK_POI"
 "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
 " | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                        <property name="top_padding">2&"
+"                        <property name="top_padding">6&"
 "lt;/property>\n"
 "                        <property name="bottom_padding"&gt"
 ";2</property>\n"
@@ -10455,6 +10507,8 @@
 "                      <false />\n"
 "                      <key>noscale</key>\n"
 "                      <false />\n"
+"                      <key>preview_count</key>\n"
+"                      <integer>10</integer>\n"
 "                      <key>reduce_hd_preview</key>\n"
 "                      <true />\n"
 "                      <key>show_presets</key>\n"

diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index af57e035da5011b6ba00a8b070511cd89ca767d6..5cc700cedab09feac2d4d289518d71dc72eaaf21 100644 (file)
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -173,6 +173,14 @@
     <property name="page_increment">10</property>
     <property name="value">0</property>
   </object>
+  <object class="GtkAdjustment" id="preview_count_adj">
+    <property name="upper">30</property>
+    <property name="lower">5</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">5</property>
+    <property name="page_size">0</property>
+    <property name="value">10</property>
+  </object>
   <object class="GtkUIManager" id="uimanager1">
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
@@ -271,7 +279,7 @@
         <child>
           <object class="GtkToggleAction" id="show_presets">
             <property name="visible">True</property>
-            <property name="active">False</property>
+            <property name="active">True</property>
             <property name="name">show_presets</property>
             <property name="label" translatable="yes">Show Presets</property>
             <signal handler="show_presets_toggled_cb" name="toggled"/>
@@ -461,6 +469,7 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -484,6 +493,8 @@
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
@@ -524,7 +535,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="title">
-                                               <property name="height_request">16</property>
                                     <property name="width_request">150</property>
                                     <property name="visible">True</property>
                                     <property name="has_frame">False</property>
@@ -662,15 +672,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
@@ -680,141 +681,142 @@
                       <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
                         <child>
-                          <object class="GtkVBox" id="vbox4">
+                          <object class="GtkHBox" id="hbox_j4">
                             <property name="visible">True</property>
+                            <property name="spacing">12</property>
                             <child>
-                              <object class="GtkHBox" id="hbox6">
+                              <object class="GtkTable" id="table3">
                                 <property name="visible">True</property>
-                                <property name="spacing">5</property>
-
-
-
-
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                                 <child>
                                   <object class="GtkFileChooserButton" id="dest_dir">
                                     <property name="visible">True</property>
-                                    <property name="action">select-folder</property>
+                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                     <property name="title" translatable="yes">Destination Directory</property>
                                     <signal name="selection_changed" handler="dest_dir_set_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label18">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">File:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</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="GtkEntry" id="dest_file">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="width_chars">20</property>
-                                    <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
+                                    <property name="width_chars">30</property>
                                     <signal name="changed" handler="dest_file_changed_cb"/>
                                     <signal name="grab_focus" handler="destination_grab_cb" after="yes"/>
+                                    <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
                                   </object>
                                   <packing>
-                                    <property name="position">2</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                   </packing>
                                 </child>
-
-
-
-
-
-
-
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="container_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="spacing">8</property>
                                 <child>
-                                  <object class="GtkLabel" id="label10">
+                                  <object class="GtkLabel" id="label18">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Container:</property>
+                                    <property name="label" translatable="yes">File:</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkTable" id="table1">
+                                <property name="visible">True</property>
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">4</property>
                                 <child>
-                                  <object class="GtkComboBox" id="FileFormat">
+                                  <object class="GtkHBox" id="hbox3">
                                     <property name="visible">True</property>
-                                    <property name="tooltip-text" translatable="yes">Output file container type</property>
-                                    <signal handler="container_changed_cb" name="changed"/>
+                                    <child>
+                                      <object class="GtkLabel" id="label27">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Container:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBox" id="FileFormat">
+                                        <property name="visible">True</property>
+                                        <signal name="changed" handler="container_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">1</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment39">
+                                  <object class="GtkCheckButton" id="Mp4iPodCompatible">
+                                    <property name="label" translatable="yes">iPod 5G Support</property>
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0.10000000149011612</property>
-                                    <property name="xscale">0</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="Mp4iPodCompatible">
-                                        <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="label" translatable="yes">iPod 5G Support</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                    </child>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="Mp4HttpOptimize">
+                                    <property name="label" translatable="yes">Web optimized</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Web optimized</property>
-                                    <property name="tooltip-text" translatable="yes">Tunes the MP4 to be better suited for streaming</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="http_opt_changed_cb" name="toggled"/>
+                                    <signal name="toggled" handler="http_opt_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="Mp4LargeFile">
+                                    <property name="label" translatable="yes">Large file size (>4GB)</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Caution: This option will likely break device compatiblity with all but the AppleTV Take 2. Checking this box enables a 64 bit mp4 file which can be over 4 GB.</property>
-                                    <property name="label" translatable="yes">Large file size (>4GB)</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                    <signal name="toggled" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="position">4</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>
                               </object>
                               <packing>
                                 <property name="position">1</property>
+                                <property name="expand">False</property>
                               </packing>
                             </child>
                           </object>
@@ -831,7 +833,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
@@ -870,7 +872,7 @@
                               <object class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <child>
@@ -996,7 +998,7 @@
                               <object class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -1121,7 +1123,7 @@
                                   <object class="GtkAlignment" id="alignment7">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="top_padding">2</property>
+                                    <property name="top_padding">6</property>
                                     <property name="bottom_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <property name="right_padding">2</property>
@@ -1394,7 +1396,7 @@
                               <object class="GtkAlignment" id="alignment10">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <child>
@@ -1713,7 +1715,7 @@
                           <object class="GtkAlignment" id="alignment18">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="top_padding">2</property>
+                            <property name="top_padding">6</property>
                             <property name="bottom_padding">2</property>
                             <property name="left_padding">12</property>
                             <property name="right_padding">2</property>
@@ -1995,7 +1997,7 @@
                               <object class="GtkAlignment" id="alignmentj01">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2037,7 +2039,7 @@
                               <object class="GtkAlignment" id="alignmentj02">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2124,6 +2126,7 @@
                               <object class="GtkAlignment" id="alignment25">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="top_padding">6</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox22">
@@ -2203,7 +2206,7 @@
                               <object class="GtkAlignment" id="alignment26">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2433,7 +2436,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                               <object class="GtkAlignment" id="alignment30">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2654,7 +2657,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                               <object class="GtkAlignment" id="alignment35">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">2</property>
+                                <property name="top_padding">6</property>
                                 <property name="bottom_padding">2</property>
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
@@ -2921,7 +2924,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
         </child>
         <child>
           <object class="GtkFrame" id="presets_frame">
-            <property name="visible">False</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="border_width">3</property>
             <property name="label_xalign">0</property>
@@ -2931,6 +2934,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
               <object class="GtkAlignment" id="alignment21">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="top_padding">6</property>
                 <property name="left_padding">8</property>
                 <child>
                   <object class="GtkVBox" id="presets_vbox">
@@ -3090,6 +3094,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
   </object>
   <object class="GtkDialog" id="prefs_dialog">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Preferences</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -3132,11 +3137,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkFrame" id="frame16">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+
                 <child>
                   <object class="GtkAlignment" id="alignment6">
                     <property name="visible">True</property>
@@ -3237,6 +3238,48 @@ location as the movie.</property>
                             <property name="position">5</property>
                           </packing>
                         </child>
+
+                        <child>
+                          <object class="GtkAlignment" id="alignment_j6">
+                            <property name="visible">True</property>
+                            <property name="left_padding">4</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox_j3">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkSpinButton" id="preview_count">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="max_length">2</property>
+                                    <property name="shadow_type">none</property>
+                                    <property name="adjustment">preview_count_adj</property>
+                                    <property name="numeric">True</property>
+                                    <signal name="value_changed" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_j3">
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes"> Number of previews </property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">6</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkCheckButton" id="allow_tweaks">
                             <property name="can_focus">True</property>
@@ -3245,7 +3288,7 @@ location as the movie.</property>
                             <signal name="toggled" handler="tweaks_changed_cb"/>
                           </object>
                           <packing>
-                            <property name="position">6</property>
+                            <property name="position">7</property>
                           </packing>
                         </child>
                         <child>
@@ -3256,25 +3299,17 @@ location as the movie.</property>
                             <signal name="toggled" handler="hbfd_feature_changed_cb"/>
                           </object>
                           <packing>
-                            <property name="position">7</property>
+                            <property name="position">8</property>
                           </packing>
                         </child>
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label18">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes"><b>Preferences</b></property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
+
           </object>
           <packing>
             <property name="position">1</property>
@@ -3457,7 +3492,7 @@ location as the movie.</property>
                   <object class="GtkAlignment" id="alignment36">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="top_padding">2</property>
+                    <property name="top_padding">6</property>
                     <property name="bottom_padding">4</property>
                     <property name="left_padding">12</property>
                     <property name="right_padding">4</property>
@@ -3896,7 +3931,6 @@ location as the movie.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="max_length">2</property>
-                    <property name="has_frame">False</property>
                     <property name="shadow_type">none</property>
                     <property name="adjustment">adjustment19</property>
                     <property name="numeric">True</property>
@@ -4168,7 +4202,7 @@ location as the movie.</property>
                   <object class="GtkAlignment" id="alignment43">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="top_padding">2</property>
+                    <property name="top_padding">6</property>
                     <property name="bottom_padding">2</property>
                     <property name="left_padding">12</property>
                     <property name="right_padding">2</property>
@@ -4363,7 +4397,7 @@ the other to maintain the video's original aspect ratio.</property>
                       <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="top_padding">2</property>
+                        <property name="top_padding">6</property>
                         <property name="bottom_padding">2</property>
                         <property name="left_padding">12</property>
                         <child>
@@ -5178,6 +5212,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
                        <false />
                        <key>noscale</key>
                        <false />
+                       <key>preview_count</key>
+                       <integer>10</integer>
                        <key>reduce_hd_preview</key>
                        <true />
                        <key>show_presets</key>