LinGui: add subtitle list to queue display

[handbrake-jp/handbrake-jp-git.git] / gtk / src / ghb.ui
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui

index d2620f3..9bc771a 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -209,6 +209,38 @@
      <property name="page_size">0</property>
      <property name="value">0</property>
    </object>
+  <object class="GtkAdjustment" id="adjustment27">
+    <property name="upper">10</property>
+    <property name="lower">1</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment28">
+    <property name="upper">4</property>
+    <property name="lower">0.9</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">0.1</property>
+    <property name="page_size">0</property>
+    <property name="value">0.0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment29">
+    <property name="upper">2000</property>
+    <property name="lower">0</property>
+    <property name="page_increment">16</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment30">
+    <property name="upper">1200</property>
+    <property name="lower">0</property>
+    <property name="page_increment">16</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
    <object class="GtkAdjustment" id="preview_progress_adj">
      <property name="upper">100</property>
      <property name="lower">0</property>
@@ -683,6 +715,50 @@
                                    </packing>
                                  </child>
                                  <child>
+                                  <object class="GtkAlignment" id="alignment47">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="xalign">0</property>
+                                    <property name="xscale">0</property>
+                                    <property name="left_padding">16</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox44">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="spacing">7</property>
+                                        <child>
+                                          <object class="GtkLabel" id="angle_label">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Angle:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="angle">
+                                            <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="adjustment">adjustment27</property>
+                                            <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">5</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child>
                                    <object class="GtkAlignment" id="alignment41">
                                      <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>
@@ -723,7 +799,7 @@
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
-                                    <property name="position">3</property>
+                                    <property name="position">4</property>
                                    </packing>
                                  </child>
                                </object>
@@ -1852,46 +1928,6 @@
                                          <property name="position">1</property>
                                        </packing>
                                      </child>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment42">
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="xalign">0.98000001907348633</property>
-                                        <property name="xscale">0.40000000596046448</property>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox18">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label2">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="label" translatable="yes">Dynamic Range Compression</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHScale" id="AudioTrackDRCSlider">
-                                                <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="adjustment">adjustment6</property>
-                                                <property name="restrict_to_fill_level">False</property>
-                                                <property name="fill_level">3823.35009765625</property>
-                                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="drc_widget_changed_cb" name="value_changed"/>
-                                                <signal name="format_value" handler="format_drc_cb"/>
-                                              </object>
-                                              <packing>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
@@ -1902,7 +1938,7 @@
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                      <property name="n_rows">2</property>
-                                    <property name="n_columns">5</property>
+                                    <property name="n_columns">7</property>
                                      <child>
                                        <object class="GtkComboBox" id="AudioTrack">
                                          <property name="width_request">215</property>
@@ -2006,6 +2042,18 @@
                                        </packing>
                                      </child>
                                      <child>
+                                      <object class="GtkLabel" id="label39">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label" translatable="yes">DRC</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">5</property>
+                                        <property name="right_attach">7</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                    <child>
                                        <object class="GtkComboBox" id="AudioMixdown">
                                          <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>
@@ -2020,6 +2068,41 @@
                                        </packing>
                                      </child>
                                      <child>
+                                      <object class="GtkScaleButton" id="AudioTrackDRCSlider">
+                                        <property name="visible">True</property>
+                                        <property name="orientation">1</property>
+                                        <property name="icons">audio-volume-muted
+audio-volume-high
+audio-volume-low
+audio-volume-medium</property>
+                                        <property name="adjustment">adjustment28</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <signal handler="drc_widget_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">5</property>
+                                        <property name="right_attach">6</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="drc_label">
+                                        <property name="visible">True</property>
+                                        <property name="width-chars">3</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">Off</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">6</property>
+                                        <property name="right_attach">7</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                    <child>
                                        <object class="GtkComboBox" id="AudioBitrate">
                                          <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>
@@ -2039,11 +2122,20 @@
                                    </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkTreeView" id="audio_list">
+                                  <object class="GtkScrolledWindow" id="scrolledwindow5">
                                      <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="headers_clickable">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="audio_list">
+                                        <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="headers_clickable">True</property>
+                                      </object>
+                                    </child>
                                    </object>
                                    <packing>
                                      <property name="position">2</property>
@@ -2067,123 +2159,239 @@
                        <object class="GtkHBox" id="hbox63">
                          <property name="visible">True</property>
                          <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="spacing">5</property>
+                        <property name="spacing">4</property>
                          <child>
-                          <object class="GtkFrame" id="frame18">
+                          <object class="GtkAlignment" id="alignment61">
                              <property name="visible">True</property>
                              <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
+                            <property name="left_padding">12</property>
+                            <property name="right_padding">2</property>
+                            <property name="yscale">0</property>
                              <child>
-                              <object class="GtkAlignment" id="alignment57">
+                              <object class="GtkHBox" id="hbox81">
                                  <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="bottom_padding">2</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">2</property>
+                                <property name="spacing">4</property>
+
                                  <child>
-                                  <object class="GtkHBox" id="hbox64">
+                                  <object class="GtkLabel" id="label87">
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="spacing">5</property>
+                                    <property name="label" translatable="yes">Preferred Language:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
  
-                                    <child>
-                                      <object class="GtkComboBox" id="SourceAudioLang">
-                                        <property name="width_request">150</property>
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <signal handler="setting_widget_changed_cb" name="changed"/>
-                                      </object>
-                                    </child>
+                                <child>
+                                  <object class="GtkComboBox" id="SourceAudioLang">
+                                    <property name="width_request">150</property>
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <signal handler="setting_widget_changed_cb" name="changed"/>
                                    </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                  </child>
                                </object>
                              </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label74">
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox49">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <child>
+                              <object class="GtkRadioButton" id="AudioDUB">
                                  <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Preferred Audio Language&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">DUB Audio</property>
+                                <property name="tooltip-text" translatable="yes">DUB Audio of foreign language films with "Preferred Language"</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
                                </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="not_dub_audio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Add Subtitles</property>
+                                <property name="tooltip-text" translatable="yes">Add "Preferred Language" subtitles to foreign language films</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">AudioDUB</property>
+                                <signal name="toggled" handler="setting_widget_changed_cb"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
                              </child>
                            </object>
                          </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label48">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Audio</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="subtitle_tab">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <child>
+                      <object class="GtkFrame" id="frame20">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
                          <child>
-                          <object class="GtkFrame" id="frame19">
+                          <object class="GtkAlignment" id="alignment23">
                              <property name="visible">True</property>
                              <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</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>
                              <child>
-                              <object class="GtkAlignment" id="alignment58">
+                              <object class="GtkVBox" id="vbox12">
                                  <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="bottom_padding">2</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">2</property>
+                                <property name="spacing">2</property>
                                  <child>
-                                  <object class="GtkHBox" id="hbox65">
+                                  <object class="GtkHBox" id="hbox45">
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                      <property name="spacing">5</property>
-
                                      <child>
-                                      <object class="GtkComboBox" id="Subtitles">
-                                        <property name="width_request">150</property>
+                                      <object class="GtkButton" id="subtitle_add">
                                          <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
                                          <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <signal handler="subtitle_changed_cb" name="changed"/>
+                                        <property name="tooltip-text" translatable="yes">Add new audio settings to the list</property>
+                                        <property name="relief">GTK_RELIEF_NONE</property>
+                                        <signal handler="subtitle_add_clicked_cb" name="clicked"/>
+                                        <child>
+                                          <object class="GtkImage" id="image9">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="stock">gtk-add</property>
+                                          </object>
+                                        </child>
                                        </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                      </packing>
                                      </child>
                                      <child>
-                                      <object class="GtkCheckButton" id="SubtitlesForced">
+                                      <object class="GtkButton" id="subtitle_remove">
                                          <property name="visible">True</property>
                                          <property name="can_focus">True</property>
-                                        <property name="has_tooltip">True</property>
-                                        <property name="tooltip-text" translatable="yes">These are subtitles that a regular DVD player would automatically show.</property>
-                                        <property name="label" translatable="yes">Allow only forced subtitles</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                        <property name="receives_default">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="tooltip-text" translatable="yes">Remove the selected audio settings</property>
+                                        <property name="relief">GTK_RELIEF_NONE</property>
+                                        <signal handler="subtitle_remove_clicked_cb" name="clicked"/>
+                                        <child>
+                                          <object class="GtkImage" id="image2">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="stock">gtk-remove</property>
+                                          </object>
+                                        </child>
                                        </object>
                                        <packing>
+                                        <property name="expand">False</property>
                                          <property name="position">1</property>
                                        </packing>
                                      </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment48">
+                                        <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="xscale">0</property>
+                                        <property name="yscale">0</property>
+                                        <property name="xalign">1</property>
+                                        <child>
+                                          <object class="GtkComboBox" id="SubtitleTrack">
+                                            <property name="width_request">215</property>
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <signal handler="subtitle_track_changed_cb" name="changed"/>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
                                    </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow4">
+                                    <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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="subtitle_list">
+                                        <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="headers_clickable">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                  </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label75">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Subtitles&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="expand">False</property>
-                        <property name="position">3</property>
-                      </packing>
                      </child>
                    </object>
                  </child>
                  <child type="tab">
-                  <object class="GtkLabel" id="label48">
+                  <object class="GtkLabel" id="label9">
                      <property name="visible">True</property>
-                    <property name="label" translatable="yes">Audio/Subtitles</property>
+                    <property name="label" translatable="yes">Subtitles</property>
                    </object>
                    <packing>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                      <property name="tab_fill">False</property>
                    </packing>
                  </child>
@@ -3001,7 +3209,7 @@ no-dct-decimate=0:cabac=1</property>
                      <property name="label" translatable="yes">H.264</property>
                    </object>
                    <packing>
-                    <property name="position">3</property>
+                    <property name="position">4</property>
                      <property name="tab_fill">False</property>
                    </packing>
                  </child>
@@ -3018,7 +3226,7 @@ no-dct-decimate=0:cabac=1</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">Chapter Markers</property>
                              <property name="draw_indicator">True</property>
-                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                            <signal handler="chapter_markers_changed_cb" name="toggled"/>
                            </object>
                            <packing>
                              <property name="expand">False</property>
@@ -3066,7 +3274,7 @@ no-dct-decimate=0:cabac=1</property>
                      <property name="label" translatable="yes">Chapters</property>
                    </object>
                    <packing>
-                    <property name="position">4</property>
+                    <property name="position">5</property>
                      <property name="tab_fill">False</property>
                    </packing>
                  </child>
@@ -3088,7 +3296,7 @@ no-dct-decimate=0:cabac=1</property>
              </child>
              <child>
                <object class="GtkProgressBar" id="progressbar">
-                <property name="height_request">16</property>
+                <property name="height_request">20</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="text" translatable="yes"/>
@@ -3326,16 +3534,42 @@ no-dct-decimate=0:cabac=1</property>
                        <object class="GtkVBox" id="vbox42">
                          <property name="visible">True</property>
                          <child>
-                          <object class="GtkCheckButton" id="check_updates">
+                          <object class="GtkAlignment" id="alignment60">
                              <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text">Check for updates to HandBrake at startup.</property>
-                            <property name="label" translatable="yes">Check for Updates</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="pref_changed_cb"/>
+                            <property name="left_padding">0</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox80">
+                                <property name="spacing">4</property>
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkComboBox" id="check_updates">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip_text">Frequency to poll for HandBrake updates.</property>
+                                    <signal name="changed" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label74">
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Check For Updates</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="expand">False</property>
+                            <property name="position">0</property>
                            </packing>
                          </child>
  
@@ -3404,13 +3638,12 @@ auto-generated destination name.</property>
                            </packing>
                          </child>
                          <child>
-                          <object class="GtkCheckButton" id="reduce_hd_preview">
+                          <object class="GtkCheckButton" id="use_dvdnav">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                            <property name="tooltip_text"> Automatically reduce the size of High Definition previews.
-This is helpfull when working on laptops or similar
-non-hidef screens.  </property>
-                            <property name="label" translatable="yes">Scale down High Definition previews</property>
+                            <property name="tooltip_text">Experimental dvdnav support.  
+Dvdnav can read some discs that dvdread can not.</property>
+                            <property name="label" translatable="yes">Use dvdnav (Experimental)</property>
                              <property name="draw_indicator">True</property>
                              <signal name="toggled" handler="pref_changed_cb"/>
                            </object>
@@ -3420,15 +3653,13 @@ non-hidef screens.  </property>
                            </packing>
                          </child>
                          <child>
-                          <object class="GtkCheckButton" id="noscale">
+                          <object class="GtkCheckButton" id="reduce_hd_preview">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                            <property name="tooltip_text">When picture settings require that the image 
-dimensions be rounded to some multiple number
-of pixels. This setting will crop a few extra pixels
-instead of doing exact cropping and scaling to
-the required multiple.</property>
-                            <property name="label" translatable="yes">Loose cropping</property>
+                            <property name="tooltip_text"> Automatically reduce the size of High Definition previews.
+This is helpfull when working on laptops or similar
+non-hidef screens.  </property>
+                            <property name="label" translatable="yes">Scale down High Definition previews</property>
                              <property name="draw_indicator">True</property>
                              <signal name="toggled" handler="pref_changed_cb"/>
                            </object>
@@ -3443,6 +3674,7 @@ the required multiple.</property>
                              <property name="left_padding">4</property>
                              <child>
                                <object class="GtkHBox" id="hbox66">
+                                <property name="spacing">4</property>
                                  <property name="visible">True</property>
                                  <child>
                                    <object class="GtkSpinButton" id="preview_count">
@@ -3467,7 +3699,7 @@ increases scan duration.</property>
                                    <object class="GtkLabel" id="label77">
                                      <property name="justify">GTK_JUSTIFY_LEFT</property>
                                      <property name="visible">True</property>
-                                    <property name="label" translatable="yes"> Number of previews </property>
+                                    <property name="label" translatable="yes">Number of previews</property>
                                      <property name="use_markup">True</property>
                                    </object>
                                    <packing>
@@ -3578,7 +3810,20 @@ location as the movie.</property>
                              <property name="position">8</property>
                            </packing>
                          </child>
-
+                        <child>
+                          <object class="GtkCheckButton" id="skip_taskbar">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text">Do not put HandBrake in the system TaskBar when minimized.</property>
+                            <property name="label" translatable="yes">Minimize to System Tray</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="skip_taskbar_cb"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">9</property>
+                          </packing>
+                        </child>
                          <child>
                            <object class="GtkCheckButton" id="allow_tweaks">
                              <property name="can_focus">True</property>
@@ -3588,7 +3833,7 @@ location as the movie.</property>
                            </object>
                            <packing>
                              <property name="expand">False</property>
-                            <property name="position">9</property>
+                            <property name="position">10</property>
                            </packing>
                          </child>
                          <child>
@@ -3600,7 +3845,7 @@ location as the movie.</property>
                            </object>
                            <packing>
                              <property name="expand">False</property>
-                            <property name="position">10</property>
+                            <property name="position">11</property>
                            </packing>
                          </child>
                        </object>
@@ -3907,6 +4152,7 @@ location as the movie.</property>
      </action-widgets>
    </object>
    <object class="GtkWindow" id="activity_window">
+    <property name="visible">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="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
      <property name="skip_taskbar_hint">True</property>
@@ -3960,6 +4206,7 @@ location as the movie.</property>
      </child>
    </object>
    <object class="GtkWindow" id="queue_window">
+    <property name="visible">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="title" translatable="yes">HandBrake Queue</property>
      <property name="icon_name">hb-queue</property>
@@ -4102,6 +4349,7 @@ location as the movie.</property>
      </child>
    </object>
    <object class="GtkWindow" id="settings_window">
+    <property name="visible">False</property>
      <property name="title" translatable="yes">Picture Settings</property>
      <property name="window_position">GTK_WIN_POS_NONE</property>
      <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -4149,6 +4397,15 @@ location as the movie.</property>
                      <property name="label_xalign">0</property>
                      <property name="shadow_type">none</property>
                      <child>
+                      <object class="GtkAlignment" id="alignment46">
+                        <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="bottom_padding">2</property>
+                        <property name="left_padding">12</property>
+                        <property name="right_padding">2</property>
+
+                    <child>
                        <object class="GtkVBox" id="vbox6">
                          <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>
@@ -4157,33 +4414,7 @@ location as the movie.</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="n_rows">5</property>
-                            <property name="n_columns">5</property>
-                            <child>
-                              <object class="GtkLabel" id="label20">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Left</property>
-                                <property name="width_chars">4</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label41">
-                                <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="yalign">1</property>
-                                <property name="label" translatable="yes">Top</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="x_options"></property>
-                              </packing>
-                            </child>
+                            <property name="n_columns">6</property>
                              <child>
                                <object class="GtkSpinButton" id="PictureLeftCrop">
                                  <property name="visible">True</property>
@@ -4193,25 +4424,10 @@ location as the movie.</property>
                                  <signal name="value_changed" handler="crop_changed_cb"/>
                                </object>
                                <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label24">
-                                <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="yalign">0</property>
-                                <property name="label" translatable="yes">Bottom</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                                  <property name="x_options"></property>
                                </packing>
                              </child>
@@ -4224,10 +4440,10 @@ location as the movie.</property>
                                  <signal name="value_changed" handler="crop_changed_cb"/>
                                </object>
                                <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
                                  <property name="x_options"></property>
                                </packing>
                              </child>
@@ -4240,10 +4456,10 @@ location as the movie.</property>
                                  <signal name="value_changed" handler="crop_changed_cb"/>
                                </object>
                                <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
                                  <property name="x_options"></property>
                                </packing>
                              </child>
@@ -4256,43 +4472,50 @@ location as the movie.</property>
                                  <signal name="value_changed" handler="crop_changed_cb"/>
                                </object>
                                <packing>
-                                <property name="left_attach">3</property>
-                                <property name="right_attach">4</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                                  <property name="x_options"></property>
                                </packing>
                              </child>
                              <child>
-                              <object class="GtkLabel" id="label25">
+                              <object class="GtkCheckButton" id="PictureAutoCrop">
+                                <property name="label" translatable="yes">Auto Crop</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">Right</property>
-                                <property name="width_chars">4</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="scale_changed_cb"/>
                                </object>
                                <packing>
-                                <property name="left_attach">4</property>
-                                <property name="right_attach">5</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options"></property>
+                                <property name="y_options"></property>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
                                </packing>
                              </child>
                              <child>
-                              <object class="GtkCheckButton" id="PictureAutoCrop">
-                                <property name="label" translatable="yes">Auto Crop</property>
+                              <object class="GtkCheckButton" id="PictureLooseCrop">
                                  <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">When picture settings require that the image 
+dimensions be rounded to some multiple number
+of pixels. This setting will crop a few extra pixels
+instead of doing exact cropping and scaling to
+the required multiple.</property>
+                                <property name="label" translatable="yes">Loose crop</property>
                                  <property name="draw_indicator">True</property>
                                  <signal name="toggled" handler="scale_changed_cb"/>
                                </object>
                                <packing>
+                                <property name="y_options"></property>
                                  <property name="left_attach">0</property>
                                  <property name="right_attach">2</property>
-                                <property name="top_attach">0</property>
-                                <property name="bottom_attach">1</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                                </packing>
                              </child>
                              <child>
@@ -4340,15 +4563,46 @@ location as the movie.</property>
                              <child>
                                <placeholder/>
                              </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                            </object>
                            <packing>
                              <property name="expand">False</property>
                              <property name="position">0</property>
                            </packing>
                          </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox78">
+                            <property name="visible">True</property>
+                            <property name="spacing">4</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <child>
+                              <object class="GtkLabel" id="label97">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Crop Dimensions:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="crop_dimensions2">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="label" translatable="yes">--</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+
                        </object>
                      </child>
                      <child type="label">
@@ -4518,7 +4772,7 @@ location as the movie.</property>
                                    </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkComboBox" id="PictureAlignment">
+                                  <object class="GtkComboBox" id="PictureModulus">
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                      <signal name="changed" handler="scale_changed_cb"/>
@@ -4539,7 +4793,7 @@ location as the movie.</property>
                        </object>
                      </child>
                      <child type="label">
-                      <object class="GtkLabel" id="label29">
+                      <object class="GtkLabel" id="label25">
                          <property name="visible">True</property>
                          <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                          <property name="label" translatable="yes">&lt;b&gt;Storage&lt;/b&gt;</property>
@@ -4633,33 +4887,15 @@ location as the movie.</property>
                                </packing>
                              </child>
                              <child>
-                              <object class="GtkCheckButton" id="PictureKeepRatio">
-                                <property name="label" translatable="yes">Keep Aspect</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="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="scale_changed_cb"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox53">
+                              <object class="GtkHBox" id="hbox79">
                                  <property name="visible">True</property>
                                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                  <property name="spacing">4</property>
                                  <child>
-                                  <object class="GtkLabel" id="label93">
-                                    <property name="width_request">100</property>
-                                    <property name="xalign">0</property>
+                                  <object class="GtkLabel" id="label98">
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Display Aspect:</property>
+                                    <property name="label" translatable="yes">Pixel Aspect:</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
@@ -4667,16 +4903,59 @@ location as the movie.</property>
                                    </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkLabel" id="display_aspect">
+                                  <object class="GtkSpinButton" id="PicturePARWidth">
                                      <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">--:--</property>
+                                    <property name="adjustment">adjustment29</property>
+                                    <property name="snap_to_ticks">True</property>
+                                    <signal name="value_changed" handler="par_changed_cb"/>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="position">1</property>
                                    </packing>
                                  </child>
+                                <child>
+                                  <object class="GtkLabel" id="label99">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="PicturePARHeight">
+                                    <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="adjustment">adjustment30</property>
+                                    <signal name="value_changed" handler="par_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="PictureKeepRatio">
+                                <property name="label" translatable="yes">Keep Aspect</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="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="scale_changed_cb"/>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
@@ -4684,17 +4963,17 @@ location as the movie.</property>
                                </packing>
                              </child>
                              <child>
-                              <object class="GtkHBox" id="hbox76">
+                              <object class="GtkHBox" id="hbox53">
                                  <property name="visible">True</property>
                                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                  <property name="spacing">4</property>
                                  <child>
-                                  <object class="GtkLabel" id="label94">
+                                  <object class="GtkLabel" id="label93">
                                      <property name="width_request">100</property>
                                      <property name="xalign">0</property>
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Pixel Aspect:</property>
+                                    <property name="label" translatable="yes">Display Aspect:</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
@@ -4702,7 +4981,7 @@ location as the movie.</property>
                                    </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkLabel" id="pixel_aspect">
+                                  <object class="GtkLabel" id="display_aspect">
                                      <property name="visible">True</property>
                                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                      <property name="label" translatable="yes">--:--</property>
@@ -4782,7 +5061,7 @@ location as the movie.</property>
                                </packing>
                              </child>
                              <child>
-                              <object class="GtkAlignment" id="alignment2">
+                              <object class="GtkAlignment" id="alignment27">
                                  <property name="visible">True</property>
                                  <property name="xalign">0</property>
                                  <property name="xscale">0</property>
@@ -4795,7 +5074,7 @@ location as the movie.</property>
                                  <property name="column_spacing">5</property>
  
                                  <child>
-                                  <object class="GtkLabel" id="label56">
+                                  <object class="GtkLabel" id="label41">
                                      <property name="visible">True</property>
                                      <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Deblock:</property>
@@ -4894,7 +5173,7 @@ location as the movie.</property>
                                  <property name="column_spacing">5</property>
  
                                  <child>
-                                  <object class="GtkLabel" id="label56">
+                                  <object class="GtkLabel" id="label86">
                                      <property name="visible">True</property>
                                      <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Detelecine:</property>
@@ -5058,12 +5337,21 @@ location as the movie.</property>
      </child>
    </object>
  
-  <object class="GtkDrawingArea" id="preview_image">
+  <object class="GtkAlignment" id="preview_image_align">
      <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 | GDK_LEAVE_NOTIFY_MASK</property>
-    <property name="app_paintable">True</property>
-    <signal name="motion-notify-event" handler="preview_motion_cb"/>
-    <signal name="leave-notify-event" handler="preview_leave_cb"/>
+    <property name="xalign">.5</property>
+    <property name="yalign">.5</property>
+    <property name="xscale">0</property>
+    <property name="yscale">0</property>
+    <child>
+      <object class="GtkDrawingArea" id="preview_image">
+        <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 | GDK_LEAVE_NOTIFY_MASK</property>
+        <property name="app_paintable">True</property>
+        <signal name="motion-notify-event" handler="preview_motion_cb"/>
+        <signal name="leave-notify-event" handler="preview_leave_cb"/>
+      </object>
+    </child>
    </object>
  
    <object class="GtkAlignment" id="preview_hud">
@@ -5156,7 +5444,7 @@ location as the movie.</property>
                          </child>
                          <child>
                            <object class="GtkProgressBar" id="live_encode_progress">
-                            <property name="height_request">16</property>
+                            <property name="height_request">20</property>
                              <property name="visible">True</property>
                              <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                            </object>
@@ -5222,16 +5510,29 @@ location as the movie.</property>
                        </packing>
                      </child>
                      <child>
+                      <object class="GtkCheckButton" id="show_crop">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Show Cropped area of the preview</property>
+                        <property name="label" translatable="yes">Show Crop</property>
+                        <signal name="toggled" handler="show_crop_changed_cb"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
                        <object class="GtkToggleButton" id="preview_fullscreen">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="tooltip-text" translatable="yes">View Fullscreen Preview</property>
                          <property name="label" translatable="yes">Fullscreen</property>
-                        <signal handler="fullscreen_clicked_cb" name="clicked"/>
+                        <signal handler="fullscreen_clicked_cb" name="toggled"/>
                        </object>
                        <packing>
                          <property name="expand">False</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                        </packing>
                      </child>
                      <child>
@@ -5244,7 +5545,7 @@ location as the movie.</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                        </packing>
                      </child>
                    </object>
@@ -5262,6 +5563,7 @@ location as the movie.</property>
    </object>
  
    <object class="GtkWindow" id="preview_window">
+    <property name="visible">False</property>
      <property name="title" translatable="yes">Preview</property>
      <property name="window_position">GTK_WIN_POS_CENTER</property>
      <property name="skip_taskbar_hint">True</property>
@@ -5454,6 +5756,7 @@ libmpeg2 authors:
    Brion Vibber
    Martin Vogt
    Fredrik Vraalsen
+
  libogg authors:
    Christopher Montgomery
  
@@ -5466,19 +5769,6 @@ libvorbis authors:
  libx264 authors:
    Laurent Aimar
  
-libxvidcore authors:
-  Christoph Lampert
-  Michael Militzer
-  Peter Ross
-  Benjamin Herrenschmidt
-  Daniel Smith
-  Dirk Knop
-  Edouard Gomez
-  Guillaume Morin
-  MinChen
-  Pascal Massimino
-  Radoslaw Czyz
-
  </property>
      <property name="logo_icon_name">hb-icon</property>
      <property name="wrap_license">True</property>
@@ -5505,7 +5795,7 @@ libxvidcore authors:
      </child>
    </object>
    <object class="GtkStatusIcon" id="hb_status">
-    <property name="icon_name">hb-status</property>
+    <property name="icon_name">hb-icon</property>
      <signal handler="status_activate_cb" name="activate"/>
    </object>
    <object class="GtkDialog" id="update_dialog">
@@ -5533,7 +5823,7 @@ libxvidcore authors:
                      <property name="visible_window">False</property>
                      <property name="above_child">True</property>
                      <child>
-                      <object class="GtkImage" id="image3">
+                      <object class="GtkImage" id="image10">
                          <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="icon_name">hb-icon</property>
@@ -5591,7 +5881,7 @@ libxvidcore authors:
                      <property name="label_xalign">0</property>
                      <property name="shadow_type">etched-out</property>
                      <child>
-                      <object class="GtkAlignment" id="alignment2">
+                      <object class="GtkAlignment" id="alignment28">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
@@ -5699,7 +5989,7 @@ libxvidcore authors:
                    </packing>
                  </child>
                  <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment24">
                      <property name="visible">True</property>
                      <property name="xalign">0</property>
                      <property name="xscale">0</property>