LinGui: fix centering of preview in larger window

3 files changed, 450 insertions, 468 deletions

diff --git a/gtk/src/ghb-3.12.ui b/gtk/src/ghb-3.12.ui
index 3dd59f628..43ac6dacc 100644
--- a/gtk/src/ghb-3.12.ui
+++ b/gtk/src/ghb-3.12.ui
@@ -8154,58 +8154,83 @@ Setting this to 0 means there is no maximum height.</property>
     <signal name="configure-event" handler="preview_configure_cb" swapped="no"/>
     <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/>
     <child>
-      <object class="GtkBox" id="preview_window_box">
+      <object class="GtkEventBox" id="preview_image">
         <property name="visible">True</property>
+        <property name="app_paintable">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+        <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
+        <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
+        <signal name="draw" handler="preview_draw_cb" swapped="no"/>
         <child>
-          <object class="GtkEventBox" id="preview_image">
+          <object class="GtkBox" id="preview_hud_box">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
-            <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
-            <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
-            <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
-            <signal name="draw" handler="preview_draw_cb" swapped="no"/>
             <child>
-              <object class="GtkBox" id="preview_hud_box">
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
+              <object class="GtkEventBox" id="preview_hud">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="hexpand-set">True</property>
+                <property name="vexpand-set">True</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <property name="margin-bottom">30</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+                <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
+                <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/>
                 <child>
-                  <object class="GtkEventBox" id="preview_hud">
-                    <property name="visible">False</property>
+                  <object class="GtkBox" id="vbox35">
+                    <property name="orientation">vertical</property>
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="hexpand-set">True</property>
-                    <property name="vexpand-set">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                    <property name="margin-bottom">30</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
-                    <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
-                    <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="margin-left">10</property>
+                    <property name="margin-right">10</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <object class="GtkBox" id="vbox35">
-                        <property name="orientation">vertical</property>
+                      <object class="GtkScale" id="preview_frame">
+                        <property name="width_request">400</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Select preview frames.</property>
+                        <property name="adjustment">adjustment19</property>
+                        <property name="digits">0</property>
+                        <property name="value_pos">bottom</property>
+                        <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="live_preview_box">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin-top">5</property>
-                        <property name="margin-bottom">5</property>
-                        <property name="margin-left">10</property>
-                        <property name="margin-right">10</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">5</property>
                         <child>
-                          <object class="GtkScale" id="preview_frame">
-                            <property name="width_request">400</property>
+                          <object class="GtkButton" id="live_preview_play">
+                            <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Select preview frames.</property>
-                            <property name="adjustment">adjustment19</property>
-                            <property name="digits">0</property>
-                            <property name="value_pos">bottom</property>
-                            <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
+                            <child>
+                              <object class="GtkImage" id="live_preview_play_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">gtk-media-play</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8214,27 +8239,30 @@ Setting this to 0 means there is no maximum height.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="live_preview_box">
-                            <property name="orientation">horizontal</property>
+                          <object class="GtkScale" id="live_preview_progress">
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">preview_progress_adj</property>
+                            <property name="draw_value">False</property>
+                            <property name="value_pos">right</property>
+                            <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="live_progress_box">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkButton" id="live_preview_play">
-                                <property name="height_request">30</property>
+                              <object class="GtkProgressBar" id="live_encode_progress">
+                                <property name="height_request">20</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
-                                <property name="relief">none</property>
-                                <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
-                                <child>
-                                  <object class="GtkImage" id="live_preview_play_image">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">gtk-media-play</property>
-                                  </object>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8242,111 +8270,55 @@ Setting this to 0 means there is no maximum height.</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkScale" id="live_preview_progress">
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">preview_progress_adj</property>
-                                <property name="draw_value">False</property>
-                                <property name="value_pos">right</property>
-                                <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="live_progress_box">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkProgressBar" id="live_encode_progress">
-                                    <property name="height_request">20</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="hbox26">
+                        <property name="orientation">horizontal</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">10</property>
                         <child>
-                          <object class="GtkBox" id="hbox26">
+                          <object class="GtkBox" id="live_preview_duration_box">
                             <property name="orientation">horizontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">10</property>
+                            <property name="spacing">2</property>
                             <child>
-                              <object class="GtkBox" id="live_preview_duration_box">
-                                <property name="orientation">horizontal</property>
+                              <object class="GtkLabel" id="label37">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkLabel" id="label37">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="live_duration">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                    <property name="adjustment">adjustment21</property>
-                                    <property name="numeric">True</property>
-                                    <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preview_show_crop">
-                                <property name="label" translatable="yes">Show Crop</property>
+                              <object class="GtkSpinButton" id="live_duration">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
-                                <property name="halign">start</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
+                                <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="adjustment">adjustment21</property>
+                                <property name="numeric">True</property>
+                                <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8354,22 +8326,39 @@ Setting this to 0 means there is no maximum height.</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkToggleButton" id="preview_fullscreen">
-                                <property name="label" translatable="yes">Fullscreen</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
-                                <property name="relief">none</property>
-                                <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="preview_show_crop">
+                            <property name="label" translatable="yes">Show Crop</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToggleButton" id="preview_fullscreen">
+                            <property name="label" translatable="yes">Fullscreen</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
+                            <property name="relief">none</property>
+                            <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8378,6 +8367,11 @@ Setting this to 0 means there is no maximum height.</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/gtk/src/ghb-3.14.ui b/gtk/src/ghb-3.14.ui
index 90a2c5bba..d7706c11a 100644
--- a/gtk/src/ghb-3.14.ui
+++ b/gtk/src/ghb-3.14.ui
@@ -8159,58 +8159,83 @@ Setting this to 0 means there is no maximum height.</property>
     <signal name="configure-event" handler="preview_configure_cb" swapped="no"/>
     <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/>
     <child>
-      <object class="GtkBox" id="preview_window_box">
+      <object class="GtkEventBox" id="preview_image">
         <property name="visible">True</property>
+        <property name="app_paintable">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+        <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
+        <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
+        <signal name="draw" handler="preview_draw_cb" swapped="no"/>
         <child>
-          <object class="GtkEventBox" id="preview_image">
+          <object class="GtkBox" id="preview_hud_box">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
-            <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
-            <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
-            <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
-            <signal name="draw" handler="preview_draw_cb" swapped="no"/>
             <child>
-              <object class="GtkBox" id="preview_hud_box">
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
+              <object class="GtkEventBox" id="preview_hud">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="hexpand-set">True</property>
+                <property name="vexpand-set">True</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <property name="margin-bottom">30</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+                <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
+                <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/>
                 <child>
-                  <object class="GtkEventBox" id="preview_hud">
-                    <property name="visible">False</property>
+                  <object class="GtkBox" id="vbox35">
+                    <property name="orientation">vertical</property>
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="hexpand-set">True</property>
-                    <property name="vexpand-set">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                    <property name="margin-bottom">30</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
-                    <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
-                    <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="margin-start">10</property>
+                    <property name="margin-end">10</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <object class="GtkBox" id="vbox35">
-                        <property name="orientation">vertical</property>
+                      <object class="GtkScale" id="preview_frame">
+                        <property name="width_request">400</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Select preview frames.</property>
+                        <property name="adjustment">adjustment19</property>
+                        <property name="digits">0</property>
+                        <property name="value_pos">bottom</property>
+                        <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="live_preview_box">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin-top">5</property>
-                        <property name="margin-bottom">5</property>
-                        <property name="margin-start">10</property>
-                        <property name="margin-end">10</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">5</property>
                         <child>
-                          <object class="GtkScale" id="preview_frame">
-                            <property name="width_request">400</property>
+                          <object class="GtkButton" id="live_preview_play">
+                            <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Select preview frames.</property>
-                            <property name="adjustment">adjustment19</property>
-                            <property name="digits">0</property>
-                            <property name="value_pos">bottom</property>
-                            <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
+                            <child>
+                              <object class="GtkImage" id="live_preview_play_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">gtk-media-play</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8219,27 +8244,30 @@ Setting this to 0 means there is no maximum height.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="live_preview_box">
-                            <property name="orientation">horizontal</property>
+                          <object class="GtkScale" id="live_preview_progress">
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">preview_progress_adj</property>
+                            <property name="draw_value">False</property>
+                            <property name="value_pos">right</property>
+                            <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="live_progress_box">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkButton" id="live_preview_play">
-                                <property name="height_request">30</property>
+                              <object class="GtkProgressBar" id="live_encode_progress">
+                                <property name="height_request">20</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
-                                <property name="relief">none</property>
-                                <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
-                                <child>
-                                  <object class="GtkImage" id="live_preview_play_image">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">gtk-media-play</property>
-                                  </object>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8247,111 +8275,55 @@ Setting this to 0 means there is no maximum height.</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkScale" id="live_preview_progress">
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">preview_progress_adj</property>
-                                <property name="draw_value">False</property>
-                                <property name="value_pos">right</property>
-                                <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="live_progress_box">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkProgressBar" id="live_encode_progress">
-                                    <property name="height_request">20</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="hbox26">
+                        <property name="orientation">horizontal</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">10</property>
                         <child>
-                          <object class="GtkBox" id="hbox26">
+                          <object class="GtkBox" id="live_preview_duration_box">
                             <property name="orientation">horizontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">10</property>
+                            <property name="spacing">2</property>
                             <child>
-                              <object class="GtkBox" id="live_preview_duration_box">
-                                <property name="orientation">horizontal</property>
+                              <object class="GtkLabel" id="label37">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkLabel" id="label37">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="live_duration">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                    <property name="adjustment">adjustment21</property>
-                                    <property name="numeric">True</property>
-                                    <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preview_show_crop">
-                                <property name="label" translatable="yes">Show Crop</property>
+                              <object class="GtkSpinButton" id="live_duration">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
-                                <property name="halign">start</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
+                                <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="adjustment">adjustment21</property>
+                                <property name="numeric">True</property>
+                                <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8359,22 +8331,39 @@ Setting this to 0 means there is no maximum height.</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkToggleButton" id="preview_fullscreen">
-                                <property name="label" translatable="yes">Fullscreen</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
-                                <property name="relief">none</property>
-                                <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="preview_show_crop">
+                            <property name="label" translatable="yes">Show Crop</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToggleButton" id="preview_fullscreen">
+                            <property name="label" translatable="yes">Fullscreen</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
+                            <property name="relief">none</property>
+                            <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8383,6 +8372,11 @@ Setting this to 0 means there is no maximum height.</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index e5c775a03..a80119c2a 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -8188,58 +8188,83 @@ Setting this to 0 means there is no maximum height.</property>
     <signal name="configure-event" handler="preview_configure_cb" swapped="no"/>
     <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/>
     <child>
-      <object class="GtkBox" id="preview_window_box">
+      <object class="GtkEventBox" id="preview_image">
         <property name="visible">True</property>
+        <property name="app_paintable">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+        <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
+        <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
+        <signal name="draw" handler="preview_draw_cb" swapped="no"/>
         <child>
-          <object class="GtkEventBox" id="preview_image">
+          <object class="GtkBox" id="preview_hud_box">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
-            <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
-            <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
-            <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
-            <signal name="draw" handler="preview_draw_cb" swapped="no"/>
             <child>
-              <object class="GtkBox" id="preview_hud_box">
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
+              <object class="GtkEventBox" id="preview_hud">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="hexpand-set">True</property>
+                <property name="vexpand-set">True</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <property name="margin-bottom">30</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+                <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
+                <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/>
                 <child>
-                  <object class="GtkEventBox" id="preview_hud">
-                    <property name="visible">False</property>
+                  <object class="GtkBox" id="vbox35">
+                    <property name="orientation">vertical</property>
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="hexpand-set">True</property>
-                    <property name="vexpand-set">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                    <property name="margin-bottom">30</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property>
-                    <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
-                    <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="margin-left">10</property>
+                    <property name="margin-right">10</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <object class="GtkBox" id="vbox35">
-                        <property name="orientation">vertical</property>
+                      <object class="GtkScale" id="preview_frame">
+                        <property name="width_request">400</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Select preview frames.</property>
+                        <property name="adjustment">adjustment19</property>
+                        <property name="digits">0</property>
+                        <property name="value_pos">bottom</property>
+                        <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="live_preview_box">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin-top">5</property>
-                        <property name="margin-bottom">5</property>
-                        <property name="margin-left">10</property>
-                        <property name="margin-right">10</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">5</property>
                         <child>
-                          <object class="GtkScale" id="preview_frame">
-                            <property name="width_request">400</property>
+                          <object class="GtkButton" id="live_preview_play">
+                            <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Select preview frames.</property>
-                            <property name="adjustment">adjustment19</property>
-                            <property name="digits">0</property>
-                            <property name="value_pos">bottom</property>
-                            <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
+                            <child>
+                              <object class="GtkImage" id="live_preview_play_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">gtk-media-play</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8248,27 +8273,30 @@ Setting this to 0 means there is no maximum height.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="live_preview_box">
-                            <property name="orientation">horizontal</property>
+                          <object class="GtkScale" id="live_preview_progress">
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">preview_progress_adj</property>
+                            <property name="draw_value">False</property>
+                            <property name="value_pos">right</property>
+                            <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="live_progress_box">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkButton" id="live_preview_play">
-                                <property name="height_request">30</property>
+                              <object class="GtkProgressBar" id="live_encode_progress">
+                                <property name="height_request">20</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
-                                <property name="relief">none</property>
-                                <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
-                                <child>
-                                  <object class="GtkImage" id="live_preview_play_image">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">gtk-media-play</property>
-                                  </object>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8276,111 +8304,55 @@ Setting this to 0 means there is no maximum height.</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkScale" id="live_preview_progress">
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">preview_progress_adj</property>
-                                <property name="draw_value">False</property>
-                                <property name="value_pos">right</property>
-                                <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="live_progress_box">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkProgressBar" id="live_encode_progress">
-                                    <property name="height_request">20</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="hbox26">
+                        <property name="orientation">horizontal</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">10</property>
                         <child>
-                          <object class="GtkBox" id="hbox26">
+                          <object class="GtkBox" id="live_preview_duration_box">
                             <property name="orientation">horizontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">10</property>
+                            <property name="spacing">2</property>
                             <child>
-                              <object class="GtkBox" id="live_preview_duration_box">
-                                <property name="orientation">horizontal</property>
+                              <object class="GtkLabel" id="label37">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkLabel" id="label37">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="live_duration">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                    <property name="adjustment">adjustment21</property>
-                                    <property name="numeric">True</property>
-                                    <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preview_show_crop">
-                                <property name="label" translatable="yes">Show Crop</property>
+                              <object class="GtkSpinButton" id="live_duration">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
-                                <property name="halign">start</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
+                                <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="adjustment">adjustment21</property>
+                                <property name="numeric">True</property>
+                                <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8388,22 +8360,39 @@ Setting this to 0 means there is no maximum height.</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkToggleButton" id="preview_fullscreen">
-                                <property name="label" translatable="yes">Fullscreen</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
-                                <property name="relief">none</property>
-                                <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="preview_show_crop">
+                            <property name="label" translatable="yes">Show Crop</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToggleButton" id="preview_fullscreen">
+                            <property name="label" translatable="yes">Fullscreen</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
+                            <property name="relief">none</property>
+                            <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8412,6 +8401,11 @@ Setting this to 0 means there is no maximum height.</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                   </object>
                 </child>