diff options
| -rw-r--r-- | gtk/src/ghb.ui | 1062 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 1 | ||||
| -rw-r--r-- | gtk/src/internal_defaults.xml | 4 | ||||
| -rw-r--r-- | gtk/src/preview.c | 33 | ||||
| -rw-r--r-- | gtk/src/resource_data.h | 1705 | ||||
| -rw-r--r-- | gtk/src/resources.plist | 1066 |
6 files changed, 2111 insertions, 1760 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index f198ed397..e5f59ac97 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -161,6 +161,14 @@ <property name="page_size">0</property> <property name="value">0</property> </object> + <object class="GtkAdjustment" id="adjustment21"> + <property name="value">15</property> + <property name="lower">5</property> + <property name="upper">60</property> + <property name="step_increment">5</property> + <property name="page_increment">10</property> + <property name="page_size">0</property> + </object> <object class="GtkAdjustment" id="preview_progress_adj"> <property name="upper">100</property> <property name="lower">0</property> @@ -3846,147 +3854,214 @@ location as the movie.</property> <property name="skip_pager_hint">True</property> <signal handler="preview_window_delete_cb" name="delete_event"/> <child> - <object class="GtkVBox" id="vbox32"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> - - <child> - <object class="GtkAlignment" id="alignment_j24"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="top_padding">2</property> - <property name="bottom_padding">2</property> - <property name="left_padding">2</property> - <property name="right_padding">2</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="app_paintable">True</property> - </object> - </child> - </object> - </child> - - <child> - <object class="GtkAlignment" id="alignment_j25"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="left_padding">10</property> - <property name="right_padding">10</property> - + <property name="spacing">4</property> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="spacing">5</property> <child> - <object class="GtkButton" id="live_preview_play"> - <property name="height_request">30</property> + <object class="GtkAlignment" id="alignment_j1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <signal handler="live_preview_start_cb" name="clicked"/> + <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="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">2</property> + <property name="right_padding">2</property> <child> - <object class="GtkImage" id="live_preview_play_image"> + <object class="GtkDrawingArea" id="preview_image"> <property name="visible">True</property> - <property name="stock">gtk-media-play</property> + <property name="app_paintable">True</property> </object> </child> </object> <packing> - <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkHScale" id="live_preview_progress"> - <property name="visible">False</property> - <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 handler="live_preview_seek_cb" name="value_changed"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="live_progress_box"> + <object class="GtkAlignment" id="alignment_j2"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="left_padding">10</property> + <property name="right_padding">10</property> <child> - <object class="GtkLabel" id="label1"> - <property name="height_request">1</property> - <property name="visible">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkProgressBar" id="live_encode_progress"> - <property name="height_request">16</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"></property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="height_request">1</property> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="spacing">5</property> + <child> + <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="receives_default">True</property> + <property name="relief">none</property> + <signal name="clicked" handler="live_preview_start_cb"/> + <child> + <object class="GtkImage" id="live_preview_play_image"> + <property name="visible">True</property> + <property name="stock">gtk-media-play</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHScale" 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"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="live_progress_box"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="height_request">1</property> + <property name="visible">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="live_encode_progress"> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="height_request">1</property> + <property name="visible">True</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> </object> - <packing> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> + <property name="bottom_padding">4</property> + <property name="left_padding">10</property> + <property name="right_padding">10</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkHBox" id="hbox26"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Frame</b></property> - <property name="use_markup">True</property> + <property name="spacing">10</property> + <child> + <object class="GtkHBox" id="hbox27"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkLabel" id="label36"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Preview Frame:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="preview_frame"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_length">2</property> + <property name="shadow_type">none</property> + <property name="adjustment">adjustment19</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="preview_frame_value_changed_cb"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox28"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkLabel" id="label37"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Duration:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</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="adjustment">adjustment21</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="preview_duration_changed_cb"/> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="preview_frame"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">2</property> - <property name="shadow_type">none</property> - <property name="adjustment">adjustment19</property> - <property name="numeric">True</property> - <signal name="value_changed" handler="preview_frame_value_changed_cb"/> - </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="position">0</property> + </packing> </child> - + <child> + <object class="GtkVSeparator" id="vseparator_j3"> + <property name="visible">True</property> </object> <packing> <property name="expand">False</property> @@ -3995,220 +4070,227 @@ location as the movie.</property> </child> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkAlignment" id="alignment_j7"> + <property name="visible">True</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <child> - <object class="GtkFrame" id="Cropping3"> + <object class="GtkFrame" id="Cropping2"> <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="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> <child> - <object class="GtkVBox" id="vbox39"> + <object class="GtkTable" id="table2"> <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="GtkTable" id="table6"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="n_rows">5</property> - <property name="n_columns">5</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkLabel" id="label77"> - <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"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label74"> - <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"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureLeftCrop"> - <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">adjustment13</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label73"> - <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="x_options"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureTopCrop"> - <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">adjustment14</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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="x_options"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureBottomCrop"> - <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">adjustment15</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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="x_options"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureRightCrop"> - <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">adjustment16</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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="x_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label72"> - <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">Right</property> - <property name="width_chars">4</property> - </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"/> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - </packing> - </child> - + <property name="n_rows">5</property> + <property name="n_columns">5</property> <child> - <object class="GtkCheckButton" id="PictureAutoCrop"> + <object class="GtkLabel" id="label19"> + <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="label23"> + <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> + <child> + <object class="GtkSpinButton" id="PictureLeftCrop"> <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">Auto Crop</property> - <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <property name="adjustment">adjustment13</property> + <signal name="value_changed" handler="crop_changed_cb"/> </object> <packing> - <property name="position">1</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> + <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="x_options"></property> </packing> </child> + <child> + <object class="GtkSpinButton" id="PictureTopCrop"> + <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">adjustment14</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="x_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="PictureBottomCrop"> + <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">adjustment15</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="x_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="PictureRightCrop"> + <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">adjustment16</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="x_options"></property> + </packing> + </child> + <child> + <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">Right</property> + <property name="width_chars">4</property> + </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> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> </child> - + <child> + <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="draw_indicator">True</property> + <signal name="toggled" handler="scale_changed_cb"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> <child type="label"> - <object class="GtkLabel" id="label82"> + <object class="GtkLabel" id="label26"> <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"><b>Cropping</b></property> @@ -4217,27 +4299,28 @@ location as the movie.</property> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="padding">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVSeparator" id="vseparator_j1"> + <object class="GtkHSeparator" id="hseparator1"> <property name="visible">True</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame19"> + <object class="GtkFrame" id="frame3"> <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="GtkAlignment" id="alignment43"> + <object class="GtkAlignment" id="alignment4"> <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> @@ -4245,17 +4328,17 @@ location as the movie.</property> <property name="left_padding">12</property> <property name="right_padding">2</property> <child> - <object class="GtkVBox" id="vbox41"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">2</property> <child> - <object class="GtkHBox" id="hbox50"> + <object class="GtkHBox" id="hbox17"> <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> + <property name="spacing">4</property> <child> - <object class="GtkLabel" id="label85"> + <object class="GtkLabel" id="label27"> <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">width:</property> @@ -4272,7 +4355,7 @@ location as the movie.</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">adjustment17</property> <property name="snap_to_ticks">True</property> - <signal handler="scale_width_changed_cb" name="value_changed"/> + <signal name="value_changed" handler="scale_width_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4280,7 +4363,7 @@ location as the movie.</property> </packing> </child> <child> - <object class="GtkLabel" id="label86"> + <object class="GtkLabel" id="label28"> <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">height:</property> @@ -4296,7 +4379,7 @@ location as the movie.</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">adjustment18</property> - <signal handler="scale_height_changed_cb" name="value_changed"/> + <signal name="value_changed" handler="scale_height_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4306,20 +4389,25 @@ location as the movie.</property> </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox51"> + <object class="GtkHBox" id="hbox18"> <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="GtkCheckButton" id="autoscale"> + <property name="label" translatable="yes">Optimal for source</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Optimal for source</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> + <packing> + <property name="position">0</property> + </packing> </child> </object> <packing> @@ -4328,22 +4416,22 @@ location as the movie.</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox52"> + <object class="GtkHBox" id="hbox19"> <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="GtkCheckButton" id="ModDimensions"> + <property name="label" translatable="yes">Align Dimensions (mod 16)</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">Constrain dimensions to multiples of 16. -If not checked, encoding efficiency may be reduced.</property> - <property name="label" translatable="yes">Align Dimensions (mod 16)</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -4353,37 +4441,36 @@ If not checked, encoding efficiency may be reduced.</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox53"> + <object class="GtkHBox" id="hbox20"> <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="GtkCheckButton" id="anamorphic"> + <property name="label" translatable="yes">Anamorphic</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">Allow non-square pixels. Pixel aspect ratio will be -adjusted to keep the video's original aspect ratio.</property> - <property name="label" translatable="yes">Anamorphic</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> <packing> <property name="expand">False</property> + <property name="position">0</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="tooltip-text" translatable="yes">Changing either dimension automatically adjusts -the other to maintain the video's original aspect ratio.</property> - <property name="label" translatable="yes">Keep Aspect</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4401,7 +4488,7 @@ the other to maintain the video's original aspect ratio.</property> </object> </child> <child type="label"> - <object class="GtkLabel" id="label87"> + <object class="GtkLabel" id="label29"> <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"><b>Scaling</b></property> @@ -4410,62 +4497,149 @@ the other to maintain the video's original aspect ratio.</property> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="padding">2</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkVSeparator" id="vseparator_j1"> + <object class="GtkHSeparator" id="hseparator2"> <property name="visible">True</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="position">3</property> </packing> </child> - + <child> + <object class="GtkFrame" id="frame5"> + <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="frame4"> + <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="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> <child> - <object class="GtkAlignment" id="alignment8"> + <object class="GtkVBox" id="vbox8"> <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> <child> - <object class="GtkVBox" id="vbox10"> + <object class="GtkCheckButton" id="VideoGrayScale"> + <property name="label" translatable="yes">Grayscale</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="draw_indicator">True</property> + <signal name="toggled" handler="setting_widget_changed_cb"/> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="PictureDetelecine"> + <property name="label" translatable="yes">Detelecine</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="draw_indicator">True</property> + <signal name="button_press_event" handler="tweak_setting_cb"/> + <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="GtkCheckButton" id="PictureDecomb"> + <property name="label" translatable="yes">De-Comb</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="button_press_event" handler="tweak_setting_cb"/> + <signal name="toggled" handler="setting_widget_changed_cb"/> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox21"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Deblock:</property> + <property name="width_chars">10</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xscale">0.55000001192092896</property> + <child> + <object class="GtkHScale" id="PictureDeblock"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment20</property> + <property name="digits">0</property> + <property name="value_pos">right</property> + <signal name="value_changed" handler="setting_widget_changed_cb"/> + <signal name="format_value" handler="format_deblock_cb"/> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox22"> <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="GtkCheckButton" id="VideoGrayScale"> - <property name="label" translatable="yes">Grayscale</property> + <object class="GtkLabel" id="label31"> <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="draw_indicator">True</property> - <signal name="toggled" handler="setting_widget_changed_cb"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">Deinterlace:</property> + <property name="width_chars">10</property> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="PictureDetelecine"> - <property name="label" translatable="yes">Detelecine</property> + <object class="GtkComboBox" id="PictureDeinterlace"> + <property name="width_request">100</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="draw_indicator">True</property> + <signal name="changed" handler="setting_widget_changed_cb"/> <signal name="button_press_event" handler="tweak_setting_cb"/> - <signal name="toggled" handler="setting_widget_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4473,174 +4647,89 @@ the other to maintain the video's original aspect ratio.</property> </packing> </child> <child> - <object class="GtkCheckButton" id="PictureDecomb"> - <property name="label" translatable="yes">De-Comb</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="button_press_event" handler="tweak_setting_cb"/> - <signal name="toggled" handler="setting_widget_changed_cb"/> + <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace"> + <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox23"> + <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="GtkHBox" id="hbox25"> + <object class="GtkLabel" id="label32"> <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label41"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deblock:</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xscale">0.55000001192092896</property> - <child> - <object class="GtkHScale" id="PictureDeblock"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment20</property> - <property name="digits">0</property> - <property name="value_pos">right</property> - <signal name="value_changed" handler="setting_widget_changed_cb"/> - <signal name="format_value" handler="format_deblock_cb"/> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <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">Denoise:</property> + <property name="selectable">True</property> + <property name="width_chars">10</property> </object> <packing> - <property name="position">3</property> + <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkComboBox" id="PictureDenoise"> + <property name="width_request">100</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deinterlace:</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="PictureDeinterlace"> - <property name="width_request">100</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 name="changed" handler="setting_widget_changed_cb"/> - <signal name="button_press_event" handler="tweak_setting_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace"> - <signal name="changed" handler="setting_widget_changed_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> + <signal name="changed" handler="setting_widget_changed_cb"/> + <signal name="button_press_event" handler="tweak_setting_cb"/> </object> <packing> <property name="expand">False</property> - <property name="padding">2</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox13"> - <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="label21"> - <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">Denoise:</property> - <property name="selectable">True</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="PictureDenoise"> - <property name="width_request">100</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 name="changed" handler="setting_widget_changed_cb"/> - <signal name="button_press_event" handler="tweak_setting_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDenoise"> - <signal name="changed" handler="setting_widget_changed_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> + <object class="GtkComboBoxEntry" id="tweak_PictureDenoise"> + <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> <property name="expand">False</property> - <property name="padding">2</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">5</property> + </packing> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label22"> - <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"><b>Filters</b></property> - <property name="use_markup">True</property> - </object> - </child> </object> - <packing> - <property name="padding">2</property> - <property name="position">4</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label33"> + <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"><b>Filters</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">4</property> + </packing> + </child> + </object> + </child> </object> <packing> @@ -4648,6 +4737,7 @@ the other to maintain the video's original aspect ratio.</property> <property name="position">2</property> </packing> </child> + </object> </child> </object> diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index dc11f580b..8579872e4 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -2989,6 +2989,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex) job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1; if (job->start_at_preview) { +g_message("duration %d", ghb_settings_get_int(js, "live_duration")); job->seek_points = ghb_settings_get_int(js, "preview_count"); job->pts_to_stop = ghb_settings_get_int(js, "live_duration") * 90000LL; } diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml index 329f6e11d..942767fcb 100644 --- a/gtk/src/internal_defaults.xml +++ b/gtk/src/internal_defaults.xml @@ -16,8 +16,6 @@ <integer>100</integer> <key>folder</key> <string></string> - <key>live_duration</key> - <integer>15</integer> <key>preset</key> <array> <string>Normal</string> @@ -106,6 +104,8 @@ <false /> <key>hbfd_feature</key> <false /> + <key>live_duration</key> + <integer>15</integer> <key>LoggingLevel</key> <string>1</string> <key>nocheckvquality</key> diff --git a/gtk/src/preview.c b/gtk/src/preview.c index 51e36c27e..d032b9115 100644 --- a/gtk/src/preview.c +++ b/gtk/src/preview.c @@ -22,6 +22,7 @@ #include <gst/video/video.h> #include <gst/pbutils/missing-plugins.h> #include "settings.h" +#include "presets.h" #include "callbacks.h" #include "hb-backend.h" #include "preview.h" @@ -50,6 +51,7 @@ struct preview_s gboolean pause; gboolean encoded[10]; gint encode_frame; + gint live_id; gchar *current; }; @@ -122,6 +124,8 @@ ghb_preview_init(signal_user_data_t *ud) ud->preview->play = gst_element_factory_make("playbin", "play"); ud->preview->pause = TRUE; + ud->preview->encode_frame = -1; + ud->preview->live_id = -1; //xover = gst_element_factory_make("xvimagesink", "xover"); xover = gst_element_factory_make("gconfvideosink", "xover"); g_object_set(G_OBJECT(ud->preview->play), "video-sink", xover, NULL); @@ -427,6 +431,12 @@ ghb_live_reset(signal_user_data_t *ud) { gboolean encoded; + if (ud->preview->live_id >= 0) + { + ghb_stop_live_encode(); + } + ud->preview->live_id = -1; + ud->preview->encode_frame = -1; if (!ud->preview->pause) live_preview_stop(ud); if (ud->preview->current) @@ -471,8 +481,8 @@ live_preview_start_cb(GtkWidget *xwidget, signal_user_data_t *ud) js = ghb_value_dup(ud->settings); ghb_settings_set_string(js, "destination", name); ghb_settings_set_int(js, "start_frame", ud->preview->frame); - ghb_settings_set_int(js, "live_duration", 15); - ghb_add_live_job(js, 0); + ud->preview->live_id = 0; + ghb_add_live_job(js, ud->preview->live_id); ghb_start_live_encode(); ghb_value_free(js); } @@ -484,6 +494,7 @@ ghb_live_encode_done(signal_user_data_t *ud, gboolean success) GtkWidget *widget; GtkWidget *prog; + ud->preview->live_id = -1; prog = GHB_WIDGET(ud->builder, "live_encode_progress"); if (success && ud->preview->encode_frame == ud->preview->frame) @@ -742,6 +753,12 @@ preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) void preview_frame_value_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { + if (ud->preview->live_id >= 0) + { + ghb_stop_live_encode(); + ud->preview->live_id = -1; + ud->preview->encode_frame = -1; + } ghb_set_preview_image(ud); } @@ -755,3 +772,15 @@ preview_window_delete_cb( gtk_widget_hide(widget); return TRUE; } + +void +preview_duration_changed_cb(GtkWidget *widget, signal_user_data_t *ud) +{ + g_debug("preview_duration_changed_cb ()"); + ghb_live_reset(ud); + ghb_widget_to_setting (ud->settings, widget); + ghb_check_dependency(ud, widget); + const gchar *name = gtk_widget_get_name(widget); + ghb_pref_save(ud->settings, name); +} + diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index 5a4165cdc..3b20169fc 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -206,6 +206,16 @@ " <property name="page_size">0</property>\n" " <property name="value">0</property>\n" " </object>\n" +" <object class="GtkAdjustment" id="adjustment21"" +";>\n" +" <property name="value">15</property>\n" +" <property name="lower">5</property>\n" +" <property name="upper">60</property>\n" +" <property name="step_increment">5</property>\n" +" <property name="page_increment">10</property>" +"\n" +" <property name="page_size">0</property>\n" +" </object>\n" " <object class="GtkAdjustment" id="preview_progress_" "adj">\n" " <property name="upper">100</property>\n" @@ -6257,225 +6267,331 @@ " <signal handler="preview_window_delete_cb" name="" "delete_event"/>\n" " <child>\n" -" <object class="GtkVBox" id="vbox32">\n" +" <object class="GtkHBox" id="hbox2">\n" " <property name="visible">True</property>\n" -"\n" -" <child>\n" -" <object class="GtkAlignment" id="alignment_" -"j24">\n" -" <property name="visible">True</property&" -"gt;\n" -" <property name="events">GDK_POINTER_MOTION_" -"MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" -"N_RELEASE_MASK</property>\n" -" <property name="top_padding">2</property" -">\n" -" <property name="bottom_padding">2</prope" -"rty>\n" -" <property name="left_padding">2</propert" -"y>\n" -" <property name="right_padding">2</proper" -"ty>\n" -" <property name="xscale">0</property>\n" -" <property name="yscale">0</property>\n" -"\n" -" <child>\n" -" <object class="GtkDrawingArea" id="prev" -"iew_image">\n" -" <property name="visible">True</prope" -"rty>\n" -" <property name="app_paintable">True<" -"/property>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" </child>\n" -"\n" -" <child>\n" -" <object class="GtkAlignment" id="alignment_" -"j25">\n" -" <property name="visible">True</property&" -"gt;\n" -" <property name="events">GDK_POINTER_MOTION_" -"MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" -"N_RELEASE_MASK</property>\n" -" <property name="left_padding">10</proper" -"ty>\n" -" <property name="right_padding">10</prope" -"rty>\n" -"\n" +" <property name="spacing">4</property>\n" " <child>\n" -" <object class="GtkHBox" id="hbox7">" +" <object class="GtkVBox" id="vbox1">" "\n" " <property name="visible">True</property&" "gt;\n" " <property name="spacing">5</property>" "\n" " <child>\n" -" <object class="GtkButton" id="live_prev" -"iew_play">\n" -" <property name="height_request">30</" -"property>\n" +" <object class="GtkAlignment" id="alignm" +"ent_j1">\n" " <property name="visible">True</prope" "rty>\n" -" <property name="can_focus">True</pro" +" <property name="events">GDK_POINTER_MOT" +"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B" +"UTTON_RELEASE_MASK</property>\n" +" <property name="xscale">0</property&" +"gt;\n" +" <property name="yscale">0</property&" +"gt;\n" +" <property name="top_padding">2</prop" +"erty>\n" +" <property name="bottom_padding">2</p" +"roperty>\n" +" <property name="left_padding">2</pro" "perty>\n" -" <property name="receives_default">True&" -"lt;/property>\n" -" <property name="relief">none</proper" -"ty>\n" -" <signal handler="live_preview_start_cb" na" -"me="clicked"/>\n" +" <property name="right_padding">2</pr" +"operty>\n" " <child>\n" -" <object class="GtkImage" id="live_p" -"review_play_image">\n" +" <object class="GtkDrawingArea" id="" +"preview_image">\n" " <property name="visible">True</p" "roperty>\n" -" <property name="stock">gtk-media-pl" -"ay</property>\n" +" <property name="app_paintable">True" +"</property>\n" " </object>\n" " </child>\n" " </object>\n" " <packing>\n" -" <property name="expand">False</prope" -"rty>\n" " <property name="position">0</propert" "y>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkHScale" id="live_prev" -"iew_progress">\n" -" <property name="visible">False</prop" -"erty>\n" -" <property name="can_focus">True</pro" -"perty>\n" -" <property name="adjustment">preview_pro" -"gress_adj</property>\n" -" <property name="draw_value">False</p" -"roperty>\n" -" <property name="value_pos">right</pr" -"operty>\n" -" <signal handler="live_preview_seek_cb" nam" -"e="value_changed"/>\n" -" </object>\n" -" <packing>\n" -" <property name="position">1</propert" -"y>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkVBox" id="live_progre" -"ss_box">\n" +" <object class="GtkAlignment" id="alignm" +"ent_j2">\n" " <property name="visible">True</prope" "rty>\n" -" <child>\n" -" <object class="GtkLabel" id="label1" -"">\n" -" <property name="height_request">1&l" -"t;/property>\n" -" <property name="visible">True</p" +" <property name="events">GDK_POINTER_MOT" +"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B" +"UTTON_RELEASE_MASK</property>\n" +" <property name="left_padding">10</pr" +"operty>\n" +" <property name="right_padding">10</p" "roperty>\n" -" </object>\n" -" <packing>\n" -" <property name="position">0</pro" -"perty>\n" -" </packing>\n" -" </child>\n" " <child>\n" -" <object class="GtkProgressBar" id="" -"live_encode_progress">\n" -" <property name="height_request">16&" -"lt;/property>\n" +" <object class="GtkHBox" id="hbox3&q" +"uot;>\n" " <property name="visible">True</p" "roperty>\n" -" <property name="events">GDK_POINTER" -"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" -"DK_BUTTON_RELEASE_MASK</property>\n" -" <property name="text" translatable=&qu" -"ot;yes"></property>\n" -" </object>\n" -" <packing>\n" -" <property name="expand">False</propert" -"y>\n" -" <property name="position">1</pro" -"perty>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel" id="label2" -"">\n" -" <property name="height_request">1&l" +" <property name="spacing">5</prop" +"erty>\n" +" <child>\n" +" <object class="GtkButton" id="l" +"ive_preview_play">\n" +" <property name="height_request">" +";30</property>\n" +" <property name="visible">True&l" "t;/property>\n" -" <property name="visible">True</p" -"roperty>\n" +" <property name="can_focus">True" +"</property>\n" +" <property name="receives_default"&" +"gt;True</property>\n" +" <property name="relief">none<" +";/property>\n" +" <signal name="clicked" handler=&qu" +"ot;live_preview_start_cb"/>\n" +" <child>\n" +" <object class="GtkImage" id=&quo" +"t;live_preview_play_image">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="stock">gtk-" +"media-play</property>\n" +" </object>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">False&l" +"t;/property>\n" +" <property name="position">0<" +"/property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHScale" id="l" +"ive_preview_progress">\n" +" <property name="can_focus">True" +"</property>\n" +" <property name="adjustment">pre" +"view_progress_adj</property>\n" +" <property name="draw_value">Fal" +"se</property>\n" +" <property name="value_pos">righ" +"t</property>\n" +" <signal name="value_changed" handl" +"er="live_preview_seek_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="position">1<" +"/property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkVBox" id="liv" +"e_progress_box">\n" +" <property name="visible">True&l" +"t;/property>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label4">\n" +" <property name="height_request"" +";>1</property>\n" +" <property name="visible">Tr" +"ue</property>\n" +" </object>\n" +" <packing>\n" +" <property name="position">0" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkProgressBar" i" +"d="live_encode_progress">\n" +" <property name="height_request"" +";>16</property>\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="position">1" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label5">\n" +" <property name="height_request"" +";>1</property>\n" +" <property name="visible">Tr" +"ue</property>\n" +" </object>\n" +" <packing>\n" +" <property name="position">2" +"</property>\n" +" </packing>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="position">2<" +"/property>\n" +" </packing>\n" +" </child>\n" " </object>\n" -" <packing>\n" -" <property name="position">2</pro" -"perty>\n" -" </packing>\n" " </child>\n" " </object>\n" " <packing>\n" -" <property name="position">2</propert" +" <property name="expand">False</prope" +"rty>\n" +" <property name="position">1</propert" "y>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkHBox" id="hbox1"" -">\n" +" <object class="GtkAlignment" id="alignm" +"ent7">\n" " <property name="visible">True</prope" "rty>\n" -" <child>\n" -" <object class="GtkLabel" id="label3" -"">\n" -" <property name="visible">True</p" +" <property name="bottom_padding">4</p" +"roperty>\n" +" <property name="left_padding">10</pr" +"operty>\n" +" <property name="right_padding">10</p" "roperty>\n" -" <property name="label" translatable=&q" -"uot;yes">&lt;b&gt;Frame&lt;/b&gt;</property&" -"gt;\n" -" <property name="use_markup">True<" -";/property>\n" -" </object>\n" -" <packing>\n" -" <property name="position">0</pro" -"perty>\n" -" </packing>\n" -" </child>\n" " <child>\n" -" <object class="GtkSpinButton" id="p" -"review_frame">\n" +" <object class="GtkHBox" id="hbox26&" +"quot;>\n" " <property name="visible">True</p" "roperty>\n" -" <property name="can_focus">True<" +" <property name="spacing">10</pro" +"perty>\n" +" <child>\n" +" <object class="GtkHBox" id="hbo" +"x27">\n" +" <property name="visible">True&l" +"t;/property>\n" +" <property name="spacing">2</" +"property>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label36">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="label" transla" +"table="yes">&lt;b&gt;Preview Frame:&lt;/b&" +"gt;</property>\n" +" <property name="use_markup">" +";True</property>\n" +" </object>\n" +" <packing>\n" +" <property name="position">0" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkSpinButton" id" +"="preview_frame">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="max_length">" +";2</property>\n" +" <property name="shadow_type"&g" +"t;none</property>\n" +" <property name="adjustment">" +";adjustment19</property>\n" +" <property name="numeric">Tr" +"ue</property>\n" +" <signal name="value_changed" h" +"andler="preview_frame_value_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="position">1" +"</property>\n" +" </packing>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">False&l" +"t;/property>\n" +" <property name="position">0<" "/property>\n" -" <property name="max_length">2</p" -"roperty>\n" -" <property name="shadow_type">none&l" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHBox" id="hbo" +"x28">\n" +" <property name="visible">True&l" "t;/property>\n" -" <property name="adjustment">adjustm" -"ent19</property>\n" -" <property name="numeric">True</p" -"roperty>\n" -" <signal name="value_changed" handler=&" -"quot;preview_frame_value_changed_cb"/>\n" +" <property name="spacing">2</" +"property>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label37">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="label" transla" +"table="yes">&lt;b&gt;Duration:&lt;/b&gt;&l" +"t;/property>\n" +" <property name="use_markup">" +";True</property>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="position">0" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkSpinButton" id" +"="live_duration">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="adjustment">" +";adjustment21</property>\n" +" <property name="numeric">Tr" +"ue</property>\n" +" <signal name="value_changed" h" +"andler="preview_duration_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="position">1" +"</property>\n" +" </packing>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="position">1<" +"/property>\n" +" </packing>\n" +" </child>\n" " </object>\n" -" <packing>\n" -" <property name="position">1</pro" -"perty>\n" -" </packing>\n" " </child>\n" " </object>\n" " <packing>\n" " <property name="expand">False</prope" "rty>\n" -" <property name="position">3</propert" +" <property name="position">2</propert" "y>\n" " </packing>\n" " </child>\n" " </object>\n" +" <packing>\n" +" <property name="position">0</property>" +";\n" +" </packing>\n" " </child>\n" -"\n" +" <child>\n" +" <object class="GtkVSeparator" id="vseparato" +"r_j3">\n" +" <property name="visible">True</property&" +"gt;\n" " </object>\n" " <packing>\n" " <property name="expand">False</property&" @@ -6486,12 +6602,26 @@ " </child>\n" "\n" " <child>\n" -" <object class="GtkHBox" id="hbox8">" +" <object class="GtkAlignment" id="alignment_" +"j7">\n" +" <property name="visible">True</property&" +"gt;\n" +" <property name="top_padding">6</property" +">\n" +" <property name="bottom_padding">6</prope" +"rty>\n" +" <property name="left_padding">0</propert" +"y>\n" +" <property name="right_padding">0</proper" +"ty>\n" +"\n" +" <child>\n" +" <object class="GtkVBox" id="vbox5">" "\n" " <property name="visible">True</property&" "gt;\n" " <child>\n" -" <object class="GtkFrame" id="Cropping3&" +" <object class="GtkFrame" id="Cropping2&" "quot;>\n" " <property name="visible">True</prope" "rty>\n" @@ -6502,296 +6632,155 @@ "perty>\n" " <property name="shadow_type">none</p" "roperty>\n" -"\n" +" <child>\n" +" <object class="GtkVBox" id="vbox6&q" +"uot;>\n" +" <property name="visible">True</p" +"roperty>\n" +" <property name="events">GDK_POINTER" +"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" +"DK_BUTTON_RELEASE_MASK</property>\n" " <child>\n" -" <object class="GtkVBox" id="vbo" -"x39">\n" +" <object class="GtkTable" id="ta" +"ble2">\n" " <property name="visible">True&l" "t;/property>\n" " <property name="events">GDK_POI" "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" " | GDK_BUTTON_RELEASE_MASK</property>\n" -" <child>\n" -" <object class="GtkTable" id=" -""table6">\n" -" <property name="visible"&g" -"t;True</property>\n" -" <property name="events">" -";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" -"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="n_rows">" -";5</property>\n" -" <property name="n_columns"" +" <property name="n_rows">5</p" +"roperty>\n" +" <property name="n_columns">5<" +";/property>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label19">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="label" transla" +"table="yes">Left</property>\n" +" <property name="width_chars"&g" +"t;4</property>\n" +" </object>\n" +" <packing>\n" +" <property name="top_attach">" +";2</property>\n" +" <property name="bottom_attach"" +">3</property>\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label23">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="yalign">1&l" +"t;/property>\n" +" <property name="label" transla" +"table="yes">Top</property>\n" +" </object>\n" +" <packing>\n" +" <property name="left_attach"&g" +"t;2</property>\n" +" <property name="right_attach"&" +"gt;3</property>\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkSpinButton" id" +"="PictureLeftCrop">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="adjustment">" +";adjustment13</property>\n" +" <signal name="value_changed" h" +"andler="crop_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="left_attach"&g" +"t;1</property>\n" +" <property name="right_attach"&" +"gt;2</property>\n" +" <property name="top_attach">" +";2</property>\n" +" <property name="bottom_attach"" +">3</property>\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label24">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="yalign">0&l" +"t;/property>\n" +" <property name="label" transla" +"table="yes">Bottom</property>\n" +" </object>\n" +" <packing>\n" +" <property name="left_attach"&g" +"t;2</property>\n" +" <property name="right_attach"&" +"gt;3</property>\n" +" <property name="top_attach">" +";4</property>\n" +" <property name="bottom_attach"" ">5</property>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label77">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="label"" -" translatable="yes">Left</property>\n" -" <property name="width_chars" -"">4</property>\n" -" </object>\n" -" <packing>\n" -" <property name="top_attach&" -"quot;>2</property>\n" -" <property name="bottom_atta" -"ch">3</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label74">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="yalign"" -";>1</property>\n" -" <property name="label"" -" translatable="yes">Top</property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">2</property>\n" -" <property name="right_attac" -"h">3</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkSpinButton&" -"quot; id="PictureLeftCrop">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="can_focus&q" -"uot;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="adjustment&" -"quot;>adjustment13</property>\n" -" <signal handler="crop_chang" -"ed_cb" name="value_changed"/>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">1</property>\n" -" <property name="right_attac" -"h">2</property>\n" -" <property name="top_attach&" -"quot;>2</property>\n" -" <property name="bottom_atta" -"ch">3</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label73">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="yalign"" -";>0</property>\n" -" <property name="label"" -" translatable="yes">Bottom</property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">2</property>\n" -" <property name="right_attac" -"h">3</property>\n" -" <property name="top_attach&" -"quot;>4</property>\n" -" <property name="bottom_atta" -"ch">5</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkSpinButton&" -"quot; id="PictureTopCrop">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="can_focus&q" -"uot;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="adjustment&" -"quot;>adjustment14</property>\n" -" <signal handler="crop_chang" -"ed_cb" name="value_changed"/>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">2</property>\n" -" <property name="right_attac" -"h">3</property>\n" -" <property name="top_attach&" -"quot;>1</property>\n" -" <property name="bottom_atta" -"ch">2</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkSpinButton&" -"quot; id="PictureBottomCrop">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="can_focus&q" -"uot;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="adjustment&" -"quot;>adjustment15</property>\n" -" <signal handler="crop_chang" -"ed_cb" name="value_changed"/>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">2</property>\n" -" <property name="right_attac" -"h">3</property>\n" -" <property name="top_attach&" -"quot;>3</property>\n" -" <property name="bottom_atta" -"ch">4</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkSpinButton&" -"quot; id="PictureRightCrop">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="can_focus&q" -"uot;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="adjustment&" -"quot;>adjustment16</property>\n" -" <signal handler="crop_chang" -"ed_cb" name="value_changed"/>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">3</property>\n" -" <property name="right_attac" -"h">4</property>\n" -" <property name="top_attach&" -"quot;>2</property>\n" -" <property name="bottom_atta" -"ch">3</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label72">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="label"" -" translatable="yes">Right</property>\n" -" <property name="width_chars" -"">4</property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach" -"">4</property>\n" -" <property name="right_attac" -"h">5</property>\n" -" <property name="top_attach&" -"quot;>2</property>\n" -" <property name="bottom_atta" -"ch">3</property>\n" -" <property name="x_options&q" -"uot;/>\n" -" </packing>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="expand">" -";False</property>\n" -" </packing>\n" -" </child>\n" -"\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" " <child>\n" -" <object class="GtkCheckButton" i" -"d="PictureAutoCrop">\n" +" <object class="GtkSpinButton" id" +"="PictureTopCrop">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="adjustment">" +";adjustment14</property>\n" +" <signal name="value_changed" h" +"andler="crop_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="left_attach"&g" +"t;2</property>\n" +" <property name="right_attach"&" +"gt;3</property>\n" +" <property name="top_attach">" +";1</property>\n" +" <property name="bottom_attach"" +">2</property>\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkSpinButton" id" +"="PictureBottomCrop">\n" " <property name="visible">Tr" "ue</property>\n" " <property name="can_focus">" @@ -6799,24 +6788,166 @@ " <property name="events">GDK" "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" "MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="adjustment">" +";adjustment15</property>\n" +" <signal name="value_changed" h" +"andler="crop_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="left_attach"&g" +"t;2</property>\n" +" <property name="right_attach"&" +"gt;3</property>\n" +" <property name="top_attach">" +";3</property>\n" +" <property name="bottom_attach"" +">4</property>\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkSpinButton" id" +"="PictureRightCrop">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="adjustment">" +";adjustment16</property>\n" +" <signal name="value_changed" h" +"andler="crop_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="left_attach"&g" +"t;3</property>\n" +" <property name="right_attach"&" +"gt;4</property>\n" +" <property name="top_attach">" +";2</property>\n" +" <property name="bottom_attach"" +">3</property>\n" +" <property name="x_options">" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label25">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" " <property name="label" transla" -"table="yes">Auto Crop</property>\n" -" <property name="draw_indicator"" -";>True</property>\n" -" <signal handler="scale_changed_cb&q" -"uot; name="toggled"/>\n" +"table="yes">Right</property>\n" +" <property name="width_chars"&g" +"t;4</property>\n" " </object>\n" " <packing>\n" -" <property name="position">1" +" <property name="left_attach"&g" +"t;4</property>\n" +" <property name="right_attach"&" +"gt;5</property>\n" +" <property name="top_attach">" +";2</property>\n" +" <property name="bottom_attach"" +">3</property>\n" +" <property name="x_options">" "</property>\n" " </packing>\n" " </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" +" <child>\n" +" <placeholder/>\n" +" </child>\n" " </object>\n" +" <packing>\n" +" <property name="expand">False&l" +"t;/property>\n" +" <property name="position">0<" +"/property>\n" +" </packing>\n" " </child>\n" -"\n" +" <child>\n" +" <object class="GtkCheckButton" id=&q" +"uot;PictureAutoCrop">\n" +" <property name="label" translatabl" +"e="yes">Auto Crop</property>\n" +" <property name="visible">True&l" +"t;/property>\n" +" <property name="can_focus">True" +"</property>\n" +" <property name="receives_default"&" +"gt;False</property>\n" +" <property name="events">GDK_POI" +"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" +" | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="draw_indicator">" +";True</property>\n" +" <signal name="toggled" handler=&qu" +"ot;scale_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="position">1<" +"/property>\n" +" </packing>\n" +" </child>\n" +" </object>\n" +" </child>\n" " <child type="label">\n" -" <object class="GtkLabel" id="label8" -"2">\n" +" <object class="GtkLabel" id="label2" +"6">\n" " <property name="visible">True</p" "roperty>\n" " <property name="events">GDK_POINTER" @@ -6831,28 +6962,30 @@ " </child>\n" " </object>\n" " <packing>\n" -" <property name="expand">True</proper" -"ty>\n" +" <property name="expand">False</prope" +"rty>\n" " <property name="padding">2</property" ">\n" +" <property name="position">0</propert" +"y>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkVSeparator" id="vsepa" -"rator_j1">\n" +" <object class="GtkHSeparator" id="hsepa" +"rator1">\n" " <property name="visible">True</prope" "rty>\n" " </object>\n" " <packing>\n" -" <property name="expand">False</prope" -"rty>\n" +" <property name="expand">True</proper" +"ty>\n" " <property name="position">1</propert" "y>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkFrame" id="frame19&qu" -"ot;>\n" +" <object class="GtkFrame" id="frame3&quo" +"t;>\n" " <property name="visible">True</prope" "rty>\n" " <property name="events">GDK_POINTER_MOT" @@ -6864,7 +6997,7 @@ "roperty>\n" " <child>\n" " <object class="GtkAlignment" id="al" -"ignment43">\n" +"ignment4">\n" " <property name="visible">True</p" "roperty>\n" " <property name="events">GDK_POINTER" @@ -6880,7 +7013,7 @@ ";/property>\n" " <child>\n" " <object class="GtkVBox" id="vbo" -"x41">\n" +"x7">\n" " <property name="visible">True&l" "t;/property>\n" " <property name="events">GDK_POI" @@ -6890,17 +7023,17 @@ "property>\n" " <child>\n" " <object class="GtkHBox" id="" -";hbox50">\n" +";hbox17">\n" " <property name="visible">Tr" "ue</property>\n" -" <property name="spacing">4&" -"lt;/property>\n" " <property name="events">GDK" "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" "MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="spacing">4&" +"lt;/property>\n" " <child>\n" " <object class="GtkLabel" id=" -""label85">\n" +""label27">\n" " <property name="visible"&g" "t;True</property>\n" " <property name="events">" @@ -6930,8 +7063,8 @@ ";>adjustment17</property>\n" " <property name="snap_to_ticks&q" "uot;>True</property>\n" -" <signal handler="scale_width_ch" -"anged_cb" name="value_changed"/>\n" +" <signal name="value_changed&quo" +"t; handler="scale_width_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" @@ -6942,7 +7075,7 @@ " </child>\n" " <child>\n" " <object class="GtkLabel" id=" -""label86">\n" +""label28">\n" " <property name="visible"&g" "t;True</property>\n" " <property name="events">" @@ -6970,8 +7103,8 @@ "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" " <property name="adjustment"" ";>adjustment18</property>\n" -" <signal handler="scale_height_c" -"hanged_cb" name="value_changed"/>\n" +" <signal name="value_changed&quo" +"t; handler="scale_height_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" @@ -6984,11 +7117,13 @@ " <packing>\n" " <property name="expand">Fal" "se</property>\n" +" <property name="position">0" +"</property>\n" " </packing>\n" " </child>\n" " <child>\n" " <object class="GtkHBox" id="" -";hbox51">\n" +";hbox18">\n" " <property name="visible">Tr" "ue</property>\n" " <property name="events">GDK" @@ -6997,17 +7132,23 @@ " <child>\n" " <object class="GtkCheckButton&quo" "t; id="autoscale">\n" +" <property name="label" tra" +"nslatable="yes">Optimal for source</property>\n" " <property name="visible"&g" "t;True</property>\n" " <property name="can_focus"" ">True</property>\n" -" <property name="label" tra" -"nslatable="yes">Optimal for source</property>\n" +" <property name="receives_defaul" +"t">False</property>\n" " <property name="draw_indicator&" "quot;>True</property>\n" -" <signal handler="scale_changed_" -"cb" name="toggled"/>\n" +" <signal name="toggled" han" +"dler="scale_changed_cb"/>\n" " </object>\n" +" <packing>\n" +" <property name="position"&" +"gt;0</property>\n" +" </packing>\n" " </child>\n" " </object>\n" " <packing>\n" @@ -7019,7 +7160,7 @@ " </child>\n" " <child>\n" " <object class="GtkHBox" id="" -";hbox52">\n" +";hbox19">\n" " <property name="visible">Tr" "ue</property>\n" " <property name="events">GDK" @@ -7028,28 +7169,28 @@ " <child>\n" " <object class="GtkCheckButton&quo" "t; id="ModDimensions">\n" +" <property name="label" tra" +"nslatable="yes">Align Dimensions (mod 16)</property>" +"\n" " <property name="visible"&g" "t;True</property>\n" " <property name="can_focus"" ">True</property>\n" +" <property name="receives_defaul" +"t">False</property>\n" " <property name="events">" ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip-text&qu" -"ot; translatable="yes">Constrain dimensions to multiples o" -"f 16. \n" -"If not checked, encoding efficiency may be reduced.</property>\n" -" <property name="label" tra" -"nslatable="yes">Align Dimensions (mod 16)</property>" -"\n" " <property name="draw_indicator&" "quot;>True</property>\n" -" <signal handler="scale_changed_" -"cb" name="toggled"/>\n" +" <signal name="toggled" han" +"dler="scale_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" ";False</property>\n" +" <property name="position"&" +"gt;0</property>\n" " </packing>\n" " </child>\n" " </object>\n" @@ -7062,7 +7203,7 @@ " </child>\n" " <child>\n" " <object class="GtkHBox" id="" -";hbox53">\n" +";hbox20">\n" " <property name="visible">Tr" "ue</property>\n" " <property name="events">GDK" @@ -7073,55 +7214,51 @@ " <child>\n" " <object class="GtkCheckButton&quo" "t; id="anamorphic">\n" +" <property name="label" tra" +"nslatable="yes">Anamorphic</property>\n" " <property name="visible"&g" "t;True</property>\n" " <property name="can_focus"" ">True</property>\n" +" <property name="receives_defaul" +"t">False</property>\n" " <property name="events">" ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip-text&qu" -"ot; translatable="yes">Allow non-square pixels. Pixel aspe" -"ct ratio will be\n" -"adjusted to keep the video's original aspect ratio.</property&g" -"t;\n" -" <property name="label" tra" -"nslatable="yes">Anamorphic</property>\n" " <property name="active">" ";True</property>\n" " <property name="draw_indicator&" "quot;>True</property>\n" -" <signal handler="scale_changed_" -"cb" name="toggled"/>\n" +" <signal name="toggled" han" +"dler="scale_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" ";False</property>\n" +" <property name="position"&" +"gt;0</property>\n" " </packing>\n" " </child>\n" " <child>\n" " <object class="GtkCheckButton&quo" "t; id="PictureKeepRatio">\n" +" <property name="label" tra" +"nslatable="yes">Keep Aspect</property>\n" " <property name="visible"&g" "t;True</property>\n" " <property name="can_focus"" ">True</property>\n" +" <property name="receives_defaul" +"t">False</property>\n" " <property name="events">" ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip-text&qu" -"ot; translatable="yes">Changing either dimension automatic" -"ally adjusts\n" -"the other to maintain the video's original aspect ratio.</prope" -"rty>\n" -" <property name="label" tra" -"nslatable="yes">Keep Aspect</property>\n" " <property name="active">" ";True</property>\n" " <property name="draw_indicator&" "quot;>True</property>\n" -" <signal handler="scale_changed_" -"cb" name="toggled"/>\n" +" <signal name="toggled" han" +"dler="scale_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" @@ -7143,8 +7280,8 @@ " </object>\n" " </child>\n" " <child type="label">\n" -" <object class="GtkLabel" id="label8" -"7">\n" +" <object class="GtkLabel" id="label2" +"9">\n" " <property name="visible">True</p" "roperty>\n" " <property name="events">GDK_POINTER" @@ -7159,8 +7296,8 @@ " </child>\n" " </object>\n" " <packing>\n" -" <property name="expand">True</proper" -"ty>\n" +" <property name="expand">False</prope" +"rty>\n" " <property name="padding">2</property" ">\n" " <property name="position">2</propert" @@ -7168,97 +7305,241 @@ " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkVSeparator" id="vsepa" -"rator_j1">\n" +" <object class="GtkHSeparator" id="hsepa" +"rator2">\n" " <property name="visible">True</prope" "rty>\n" " </object>\n" " <packing>\n" -" <property name="expand">False</prope" -"rty>\n" +" <property name="expand">True</proper" +"ty>\n" " <property name="position">3</propert" "y>\n" " </packing>\n" " </child>\n" -"\n" +" <child>\n" +" <object class="GtkFrame" id="frame5&quo" +"t;>\n" +" <property name="visible">True</prope" +"rty>\n" +" <property name="events">GDK_POINTER_MOT" +"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B" +"UTTON_RELEASE_MASK</property>\n" +" <property name="label_xalign">0</pro" +"perty>\n" +" <property name="shadow_type">none</p" +"roperty>\n" " <child>\n" -" <object class="GtkFrame" id="frame4" -"">\n" +" <object class="GtkAlignment" id="al" +"ignment5">\n" " <property name="visible">True</p" "roperty>\n" " <property name="events">GDK_POINTER" "_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" "DK_BUTTON_RELEASE_MASK</property>\n" -" <property name="label_xalign">0<" -"/property>\n" -" <property name="shadow_type">none&l" +" <property name="top_padding">6</" +"property>\n" +" <property name="bottom_padding">2&l" "t;/property>\n" +" <property name="left_padding">12<" +";/property>\n" " <child>\n" -" <object class="GtkAlignment" id=&quo" -"t;alignment8">\n" +" <object class="GtkVBox" id="vbo" +"x8">\n" " <property name="visible">True&l" "t;/property>\n" " <property name="events">GDK_POI" "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" " | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="top_padding">6&" -"lt;/property>\n" -" <property name="bottom_padding">" -";2</property>\n" -" <property name="left_padding">1" -"2</property>\n" " <child>\n" -" <object class="GtkVBox" id="" -";vbox10">\n" +" <object class="GtkCheckButton" i" +"d="VideoGrayScale">\n" +" <property name="label" transla" +"table="yes">Grayscale</property>\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="receives_default&qu" +"ot;>False</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="draw_indicator"" +";>True</property>\n" +" <signal name="toggled" handler" +"="setting_widget_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="position">0" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkCheckButton" i" +"d="PictureDetelecine">\n" +" <property name="label" transla" +"table="yes">Detelecine</property>\n" " <property name="visible">Tr" "ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="receives_default&qu" +"ot;>False</property>\n" " <property name="events">GDK" "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" "MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="draw_indicator"" +";>True</property>\n" +" <signal name="button_press_event&qu" +"ot; handler="tweak_setting_cb"/>\n" +" <signal name="toggled" handler" +"="setting_widget_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="position">1" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkCheckButton" i" +"d="PictureDecomb">\n" +" <property name="label" transla" +"table="yes">De-Comb</property>\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="receives_default&qu" +"ot;>False</property>\n" +" <property name="active">Tru" +"e</property>\n" +" <property name="draw_indicator"" +";>True</property>\n" +" <signal name="button_press_event&qu" +"ot; handler="tweak_setting_cb"/>\n" +" <signal name="toggled" handler" +"="setting_widget_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="position">2" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHBox" id="" +";hbox21">\n" +" <property name="visible">Tr" +"ue</property>\n" " <child>\n" -" <object class="GtkCheckButton&quo" -"t; id="VideoGrayScale">\n" +" <object class="GtkLabel" id=" +""label30">\n" +" <property name="visible"&g" +"t;True</property>\n" +" <property name="xalign">" +";0</property>\n" " <property name="label" tra" -"nslatable="yes">Grayscale</property>\n" +"nslatable="yes">Deblock:</property>\n" +" <property name="width_chars&quo" +"t;>10</property>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">" +";False</property>\n" +" <property name="position"&" +"gt;0</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkAlignment"" +" id="alignment6">\n" +" <property name="visible"&g" +"t;True</property>\n" +" <property name="xalign">" +";0</property>\n" +" <property name="xscale">" +";0.55000001192092896</property>\n" +" <child>\n" +" <object class="GtkHScale"" +"; id="PictureDeblock">\n" +" <property name="visible&quo" +"t;>True</property>\n" +" <property name="can_focus&q" +"uot;>True</property>\n" +" <property name="adjustment&" +"quot;>adjustment20</property>\n" +" <property name="digits"" +";>0</property>\n" +" <property name="value_pos&q" +"uot;>right</property>\n" +" <signal name="value_changed" +"" handler="setting_widget_changed_cb"/>\n" +" <signal name="format_value&" +"quot; handler="format_deblock_cb"/>\n" +" </object>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="position"&" +"gt;1</property>\n" +" </packing>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="position">3" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHBox" id="" +";hbox22">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <child>\n" +" <object class="GtkLabel" id=" +""label31">\n" " <property name="visible"&g" "t;True</property>\n" " <property name="can_focus"" ">True</property>\n" -" <property name="receives_defaul" -"t">False</property>\n" " <property name="events">" ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="draw_indicator&" -"quot;>True</property>\n" -" <signal name="toggled" han" -"dler="setting_widget_changed_cb"/>\n" +" <property name="xalign">" +";0</property>\n" +" <property name="label" tra" +"nslatable="yes">Deinterlace:</property>\n" +" <property name="width_chars&quo" +"t;>10</property>\n" " </object>\n" " <packing>\n" +" <property name="expand">" +";False</property>\n" " <property name="position"&" "gt;0</property>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkCheckButton&quo" -"t; id="PictureDetelecine">\n" -" <property name="label" tra" -"nslatable="yes">Detelecine</property>\n" +" <object class="GtkComboBox" " +"id="PictureDeinterlace">\n" +" <property name="width_request&q" +"uot;>100</property>\n" " <property name="visible"&g" "t;True</property>\n" -" <property name="can_focus"" -">True</property>\n" -" <property name="receives_defaul" -"t">False</property>\n" " <property name="events">" ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="draw_indicator&" -"quot;>True</property>\n" +" <signal name="changed" han" +"dler="setting_widget_changed_cb"/>\n" " <signal name="button_press_even" "t" handler="tweak_setting_cb"/>\n" -" <signal name="toggled" han" -"dler="setting_widget_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" @@ -7268,23 +7549,9 @@ " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkCheckButton&quo" -"t; id="PictureDecomb">\n" -" <property name="label" tra" -"nslatable="yes">De-Comb</property>\n" -" <property name="visible"&g" -"t;True</property>\n" -" <property name="can_focus"" -">True</property>\n" -" <property name="receives_defaul" -"t">False</property>\n" -" <property name="active">" -";True</property>\n" -" <property name="draw_indicator&" -"quot;>True</property>\n" -" <signal name="button_press_even" -"t" handler="tweak_setting_cb"/>\n" -" <signal name="toggled" han" +" <object class="GtkComboBoxEntry&q" +"uot; id="tweak_PictureDeinterlace">\n" +" <signal name="changed" han" "dler="setting_widget_changed_cb"/>\n" " </object>\n" " <packing>\n" @@ -7294,251 +7561,124 @@ "gt;2</property>\n" " </packing>\n" " </child>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="padding">2&" +"lt;/property>\n" +" <property name="position">4" +"</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHBox" id="" +";hbox23">\n" +" <property name="visible">Tr" +"ue</property>\n" +" <property name="events">GDK" +"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" +"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" " <child>\n" -" <object class="GtkHBox" id=&" -"quot;hbox25">\n" +" <object class="GtkLabel" id=" +""label32">\n" " <property name="visible"&g" "t;True</property>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label41">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="xalign"" -";>0</property>\n" -" <property name="label"" -" translatable="yes">Deblock:</property>\n" -" <property name="width_chars" -"">10</property>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>0</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkAlignment&q" -"uot; id="alignment20">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="xalign"" -";>0</property>\n" -" <property name="xscale"" -";>0.55000001192092896</property>\n" -" <child>\n" -" <object class="GtkHScale&" -"quot; id="PictureDeblock">\n" -" <property name="visible" -"">True</property>\n" -" <property name="can_foc" -"us">True</property>\n" -" <property name="adjustm" -"ent">adjustment20</property>\n" -" <property name="digits&" -"quot;>0</property>\n" -" <property name="value_p" -"os">right</property>\n" -" <signal name="value_cha" -"nged" handler="setting_widget_changed_cb"/>\n" -" <signal name="format_va" -"lue" handler="format_deblock_cb"/>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="position&qu" -"ot;>1</property>\n" -" </packing>\n" -" </child>\n" +" <property name="events">" +";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" +"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="xalign">" +";0</property>\n" +" <property name="label" tra" +"nslatable="yes">Denoise:</property>\n" +" <property name="selectable"" +";>True</property>\n" +" <property name="width_chars&quo" +"t;>10</property>\n" " </object>\n" " <packing>\n" +" <property name="expand">" +";False</property>\n" " <property name="position"&" -"gt;3</property>\n" +"gt;0</property>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkHBox" id=&" -"quot;hbox12">\n" +" <object class="GtkComboBox" " +"id="PictureDenoise">\n" +" <property name="width_request&q" +"uot;>100</property>\n" " <property name="visible"&g" "t;True</property>\n" " <property name="events">" ";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" "ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label20">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="can_focus&q" -"uot;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="xalign"" -";>0</property>\n" -" <property name="label"" -" translatable="yes">Deinterlace:</property>\n" -" <property name="width_chars" -"">10</property>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>0</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkComboBox&qu" -"ot; id="PictureDeinterlace">\n" -" <property name="width_reque" -"st">100</property>\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <signal name="changed"" -" handler="setting_widget_changed_cb"/>\n" -" <signal name="button_press_" -"event" handler="tweak_setting_cb"/>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>1</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkComboBoxEnt" -"ry" id="tweak_PictureDeinterlace">\n" -" <signal name="changed"" -" handler="setting_widget_changed_cb"/>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>2</property>\n" -" </packing>\n" -" </child>\n" +" <signal name="changed" han" +"dler="setting_widget_changed_cb"/>\n" +" <signal name="button_press_even" +"t" handler="tweak_setting_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" ";False</property>\n" -" <property name="padding"&g" -"t;2</property>\n" " <property name="position"&" -"gt;4</property>\n" +"gt;1</property>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkHBox" id=&" -"quot;hbox13">\n" -" <property name="visible"&g" -"t;True</property>\n" -" <property name="events">" -";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" -"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <child>\n" -" <object class="GtkLabel"" -" id="label21">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="xalign"" -";>0</property>\n" -" <property name="label"" -" translatable="yes">Denoise:</property>\n" -" <property name="selectable&" -"quot;>True</property>\n" -" <property name="width_chars" -"">10</property>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>0</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkComboBox&qu" -"ot; id="PictureDenoise">\n" -" <property name="width_reque" -"st">100</property>\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <property name="events"" -";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" -"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <signal name="changed"" -" handler="setting_widget_changed_cb"/>\n" -" <signal name="button_press_" -"event" handler="tweak_setting_cb"/>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>1</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkComboBoxEnt" -"ry" id="tweak_PictureDenoise">\n" -" <signal name="changed"" -" handler="setting_widget_changed_cb"/>\n" -" </object>\n" -" <packing>\n" -" <property name="expand"" -";>False</property>\n" -" <property name="position&qu" -"ot;>2</property>\n" -" </packing>\n" -" </child>\n" +" <object class="GtkComboBoxEntry&q" +"uot; id="tweak_PictureDenoise">\n" +" <signal name="changed" han" +"dler="setting_widget_changed_cb"/>\n" " </object>\n" " <packing>\n" " <property name="expand">" ";False</property>\n" -" <property name="padding"&g" -"t;2</property>\n" " <property name="position"&" -"gt;5</property>\n" +"gt;2</property>\n" " </packing>\n" " </child>\n" " </object>\n" +" <packing>\n" +" <property name="expand">Fal" +"se</property>\n" +" <property name="padding">2&" +"lt;/property>\n" +" <property name="position">5" +"</property>\n" +" </packing>\n" " </child>\n" " </object>\n" " </child>\n" -" <child type="label">\n" -" <object class="GtkLabel" id="la" -"bel22">\n" -" <property name="visible">True&l" -"t;/property>\n" -" <property name="events">GDK_POI" -"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" -" | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="label" translatabl" -"e="yes">&lt;b&gt;Filters&lt;/b&gt;</pro" -"perty>\n" -" <property name="use_markup">Tru" -"e</property>\n" -" </object>\n" -" </child>\n" " </object>\n" -" <packing>\n" -" <property name="padding">2</prop" -"erty>\n" -" <property name="position">4</pro" -"perty>\n" -" </packing>\n" " </child>\n" +" <child type="label">\n" +" <object class="GtkLabel" id="label3" +"3">\n" +" <property name="visible">True</p" +"roperty>\n" +" <property name="events">GDK_POINTER" +"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" +"DK_BUTTON_RELEASE_MASK</property>\n" +" <property name="label" translatable=&q" +"uot;yes">&lt;b&gt;Filters&lt;/b&gt;</propert" +"y>\n" +" <property name="use_markup">True<" +";/property>\n" +" </object>\n" +" </child>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">False</prope" +"rty>\n" +" <property name="padding">2</property" +">\n" +" <property name="position">4</propert" +"y>\n" +" </packing>\n" +" </child>\n" +" </object>\n" +" </child>\n" "\n" " </object>\n" " <packing>\n" @@ -7548,6 +7688,7 @@ ";\n" " </packing>\n" " </child>\n" +"\n" " </object>\n" " </child>\n" " </object>\n" @@ -10482,8 +10623,6 @@ " <integer>100</integer>\n" " <key>folder</key>\n" " <string></string>\n" -" <key>live_duration</key>\n" -" <integer>15</integer>\n" " <key>preset</key>\n" " <array>\n" " <string>Normal</string>\n" @@ -10571,6 +10710,8 @@ " <false />\n" " <key>hbfd_feature</key>\n" " <false />\n" +" <key>live_duration</key>\n" +" <integer>15</integer>\n" " <key>nocheckvquality</key>\n" " <false />\n" " <key>noscale</key>\n" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index 0a810c2fd..ffb34613d 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -166,6 +166,14 @@ <property name="page_size">0</property> <property name="value">0</property> </object> + <object class="GtkAdjustment" id="adjustment21"> + <property name="value">15</property> + <property name="lower">5</property> + <property name="upper">60</property> + <property name="step_increment">5</property> + <property name="page_increment">10</property> + <property name="page_size">0</property> + </object> <object class="GtkAdjustment" id="preview_progress_adj"> <property name="upper">100</property> <property name="lower">0</property> @@ -3851,147 +3859,214 @@ location as the movie.</property> <property name="skip_pager_hint">True</property> <signal handler="preview_window_delete_cb" name="delete_event"/> <child> - <object class="GtkVBox" id="vbox32"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> - - <child> - <object class="GtkAlignment" id="alignment_j24"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="top_padding">2</property> - <property name="bottom_padding">2</property> - <property name="left_padding">2</property> - <property name="right_padding">2</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="app_paintable">True</property> - </object> - </child> - </object> - </child> - + <property name="spacing">4</property> <child> - <object class="GtkAlignment" id="alignment_j25"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="left_padding">10</property> - <property name="right_padding">10</property> - - <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="spacing">5</property> <child> - <object class="GtkButton" id="live_preview_play"> - <property name="height_request">30</property> + <object class="GtkAlignment" id="alignment_j1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <signal handler="live_preview_start_cb" name="clicked"/> + <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="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">2</property> + <property name="right_padding">2</property> <child> - <object class="GtkImage" id="live_preview_play_image"> + <object class="GtkDrawingArea" id="preview_image"> <property name="visible">True</property> - <property name="stock">gtk-media-play</property> + <property name="app_paintable">True</property> </object> </child> </object> <packing> - <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkHScale" id="live_preview_progress"> - <property name="visible">False</property> - <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 handler="live_preview_seek_cb" name="value_changed"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="live_progress_box"> + <object class="GtkAlignment" id="alignment_j2"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="left_padding">10</property> + <property name="right_padding">10</property> <child> - <object class="GtkLabel" id="label1"> - <property name="height_request">1</property> - <property name="visible">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkProgressBar" id="live_encode_progress"> - <property name="height_request">16</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"></property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="height_request">1</property> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="spacing">5</property> + <child> + <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="receives_default">True</property> + <property name="relief">none</property> + <signal name="clicked" handler="live_preview_start_cb"/> + <child> + <object class="GtkImage" id="live_preview_play_image"> + <property name="visible">True</property> + <property name="stock">gtk-media-play</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHScale" 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"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="live_progress_box"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="height_request">1</property> + <property name="visible">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="live_encode_progress"> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="height_request">1</property> + <property name="visible">True</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> </object> - <packing> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> + <property name="bottom_padding">4</property> + <property name="left_padding">10</property> + <property name="right_padding">10</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkHBox" id="hbox26"> <property name="visible">True</property> - <property name="label" translatable="yes">&lt;b&gt;Frame&lt;/b&gt;</property> - <property name="use_markup">True</property> + <property name="spacing">10</property> + <child> + <object class="GtkHBox" id="hbox27"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkLabel" id="label36"> + <property name="visible">True</property> + <property name="label" translatable="yes">&lt;b&gt;Preview Frame:&lt;/b&gt;</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="preview_frame"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_length">2</property> + <property name="shadow_type">none</property> + <property name="adjustment">adjustment19</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="preview_frame_value_changed_cb"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox28"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkLabel" id="label37"> + <property name="visible">True</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="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="adjustment">adjustment21</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="preview_duration_changed_cb"/> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="preview_frame"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">2</property> - <property name="shadow_type">none</property> - <property name="adjustment">adjustment19</property> - <property name="numeric">True</property> - <signal name="value_changed" handler="preview_frame_value_changed_cb"/> - </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="position">0</property> + </packing> </child> - + <child> + <object class="GtkVSeparator" id="vseparator_j3"> + <property name="visible">True</property> </object> <packing> <property name="expand">False</property> @@ -4000,220 +4075,227 @@ location as the movie.</property> </child> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkAlignment" id="alignment_j7"> + <property name="visible">True</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <child> - <object class="GtkFrame" id="Cropping3"> + <object class="GtkFrame" id="Cropping2"> <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="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> <child> - <object class="GtkVBox" id="vbox39"> + <object class="GtkTable" id="table2"> <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="GtkTable" id="table6"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="n_rows">5</property> - <property name="n_columns">5</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkLabel" id="label77"> - <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"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label74"> - <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"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureLeftCrop"> - <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">adjustment13</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label73"> - <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="x_options"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureTopCrop"> - <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">adjustment14</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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="x_options"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureBottomCrop"> - <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">adjustment15</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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="x_options"/> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="PictureRightCrop"> - <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">adjustment16</property> - <signal handler="crop_changed_cb" name="value_changed"/> - </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="x_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label72"> - <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">Right</property> - <property name="width_chars">4</property> - </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"/> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - </packing> - </child> - + <property name="n_rows">5</property> + <property name="n_columns">5</property> + <child> + <object class="GtkLabel" id="label19"> + <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="GtkCheckButton" id="PictureAutoCrop"> + <object class="GtkLabel" id="label23"> + <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> + <child> + <object class="GtkSpinButton" id="PictureLeftCrop"> <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">Auto Crop</property> - <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <property name="adjustment">adjustment13</property> + <signal name="value_changed" handler="crop_changed_cb"/> </object> <packing> - <property name="position">1</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> + <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="x_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="PictureTopCrop"> + <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">adjustment14</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="x_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="PictureBottomCrop"> + <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">adjustment15</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="x_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="PictureRightCrop"> + <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">adjustment16</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="x_options"></property> + </packing> + </child> + <child> + <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">Right</property> + <property name="width_chars">4</property> + </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> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> </child> - + <child> + <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="draw_indicator">True</property> + <signal name="toggled" handler="scale_changed_cb"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> <child type="label"> - <object class="GtkLabel" id="label82"> + <object class="GtkLabel" id="label26"> <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;Cropping&lt;/b&gt;</property> @@ -4222,27 +4304,28 @@ location as the movie.</property> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="padding">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVSeparator" id="vseparator_j1"> + <object class="GtkHSeparator" id="hseparator1"> <property name="visible">True</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame19"> + <object class="GtkFrame" id="frame3"> <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="GtkAlignment" id="alignment43"> + <object class="GtkAlignment" id="alignment4"> <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> @@ -4250,17 +4333,17 @@ location as the movie.</property> <property name="left_padding">12</property> <property name="right_padding">2</property> <child> - <object class="GtkVBox" id="vbox41"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">2</property> <child> - <object class="GtkHBox" id="hbox50"> + <object class="GtkHBox" id="hbox17"> <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> + <property name="spacing">4</property> <child> - <object class="GtkLabel" id="label85"> + <object class="GtkLabel" id="label27"> <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">width:</property> @@ -4277,7 +4360,7 @@ location as the movie.</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">adjustment17</property> <property name="snap_to_ticks">True</property> - <signal handler="scale_width_changed_cb" name="value_changed"/> + <signal name="value_changed" handler="scale_width_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4285,7 +4368,7 @@ location as the movie.</property> </packing> </child> <child> - <object class="GtkLabel" id="label86"> + <object class="GtkLabel" id="label28"> <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">height:</property> @@ -4301,7 +4384,7 @@ location as the movie.</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">adjustment18</property> - <signal handler="scale_height_changed_cb" name="value_changed"/> + <signal name="value_changed" handler="scale_height_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4311,20 +4394,25 @@ location as the movie.</property> </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox51"> + <object class="GtkHBox" id="hbox18"> <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="GtkCheckButton" id="autoscale"> + <property name="label" translatable="yes">Optimal for source</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Optimal for source</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> + <packing> + <property name="position">0</property> + </packing> </child> </object> <packing> @@ -4333,22 +4421,22 @@ location as the movie.</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox52"> + <object class="GtkHBox" id="hbox19"> <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="GtkCheckButton" id="ModDimensions"> + <property name="label" translatable="yes">Align Dimensions (mod 16)</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">Constrain dimensions to multiples of 16. -If not checked, encoding efficiency may be reduced.</property> - <property name="label" translatable="yes">Align Dimensions (mod 16)</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -4358,37 +4446,36 @@ If not checked, encoding efficiency may be reduced.</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox53"> + <object class="GtkHBox" id="hbox20"> <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="GtkCheckButton" id="anamorphic"> + <property name="label" translatable="yes">Anamorphic</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">Allow non-square pixels. Pixel aspect ratio will be -adjusted to keep the video's original aspect ratio.</property> - <property name="label" translatable="yes">Anamorphic</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> <packing> <property name="expand">False</property> + <property name="position">0</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="tooltip-text" translatable="yes">Changing either dimension automatically adjusts -the other to maintain the video's original aspect ratio.</property> - <property name="label" translatable="yes">Keep Aspect</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal handler="scale_changed_cb" name="toggled"/> + <signal name="toggled" handler="scale_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4406,7 +4493,7 @@ the other to maintain the video's original aspect ratio.</property> </object> </child> <child type="label"> - <object class="GtkLabel" id="label87"> + <object class="GtkLabel" id="label29"> <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;Scaling&lt;/b&gt;</property> @@ -4415,62 +4502,149 @@ the other to maintain the video's original aspect ratio.</property> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="padding">2</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkVSeparator" id="vseparator_j1"> + <object class="GtkHSeparator" id="hseparator2"> <property name="visible">True</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="position">3</property> </packing> </child> - + <child> + <object class="GtkFrame" id="frame5"> + <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="frame4"> + <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="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> <child> - <object class="GtkAlignment" id="alignment8"> + <object class="GtkVBox" id="vbox8"> <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> <child> - <object class="GtkVBox" id="vbox10"> + <object class="GtkCheckButton" id="VideoGrayScale"> + <property name="label" translatable="yes">Grayscale</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="draw_indicator">True</property> + <signal name="toggled" handler="setting_widget_changed_cb"/> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="PictureDetelecine"> + <property name="label" translatable="yes">Detelecine</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="draw_indicator">True</property> + <signal name="button_press_event" handler="tweak_setting_cb"/> + <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="GtkCheckButton" id="PictureDecomb"> + <property name="label" translatable="yes">De-Comb</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="button_press_event" handler="tweak_setting_cb"/> + <signal name="toggled" handler="setting_widget_changed_cb"/> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox21"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Deblock:</property> + <property name="width_chars">10</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xscale">0.55000001192092896</property> + <child> + <object class="GtkHScale" id="PictureDeblock"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment20</property> + <property name="digits">0</property> + <property name="value_pos">right</property> + <signal name="value_changed" handler="setting_widget_changed_cb"/> + <signal name="format_value" handler="format_deblock_cb"/> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox22"> <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="GtkCheckButton" id="VideoGrayScale"> - <property name="label" translatable="yes">Grayscale</property> + <object class="GtkLabel" id="label31"> <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="draw_indicator">True</property> - <signal name="toggled" handler="setting_widget_changed_cb"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">Deinterlace:</property> + <property name="width_chars">10</property> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="PictureDetelecine"> - <property name="label" translatable="yes">Detelecine</property> + <object class="GtkComboBox" id="PictureDeinterlace"> + <property name="width_request">100</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="draw_indicator">True</property> + <signal name="changed" handler="setting_widget_changed_cb"/> <signal name="button_press_event" handler="tweak_setting_cb"/> - <signal name="toggled" handler="setting_widget_changed_cb"/> </object> <packing> <property name="expand">False</property> @@ -4478,174 +4652,89 @@ the other to maintain the video's original aspect ratio.</property> </packing> </child> <child> - <object class="GtkCheckButton" id="PictureDecomb"> - <property name="label" translatable="yes">De-Comb</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="button_press_event" handler="tweak_setting_cb"/> - <signal name="toggled" handler="setting_widget_changed_cb"/> + <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace"> + <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox23"> + <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="GtkHBox" id="hbox25"> + <object class="GtkLabel" id="label32"> <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label41"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deblock:</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xscale">0.55000001192092896</property> - <child> - <object class="GtkHScale" id="PictureDeblock"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment20</property> - <property name="digits">0</property> - <property name="value_pos">right</property> - <signal name="value_changed" handler="setting_widget_changed_cb"/> - <signal name="format_value" handler="format_deblock_cb"/> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <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">Denoise:</property> + <property name="selectable">True</property> + <property name="width_chars">10</property> </object> <packing> - <property name="position">3</property> + <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkComboBox" id="PictureDenoise"> + <property name="width_request">100</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deinterlace:</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="PictureDeinterlace"> - <property name="width_request">100</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 name="changed" handler="setting_widget_changed_cb"/> - <signal name="button_press_event" handler="tweak_setting_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace"> - <signal name="changed" handler="setting_widget_changed_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> + <signal name="changed" handler="setting_widget_changed_cb"/> + <signal name="button_press_event" handler="tweak_setting_cb"/> </object> <packing> <property name="expand">False</property> - <property name="padding">2</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox13"> - <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="label21"> - <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">Denoise:</property> - <property name="selectable">True</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="PictureDenoise"> - <property name="width_request">100</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 name="changed" handler="setting_widget_changed_cb"/> - <signal name="button_press_event" handler="tweak_setting_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDenoise"> - <signal name="changed" handler="setting_widget_changed_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> + <object class="GtkComboBoxEntry" id="tweak_PictureDenoise"> + <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> <property name="expand">False</property> - <property name="padding">2</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">5</property> + </packing> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label22"> - <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;Filters&lt;/b&gt;</property> - <property name="use_markup">True</property> - </object> - </child> </object> - <packing> - <property name="padding">2</property> - <property name="position">4</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label33"> + <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;Filters&lt;/b&gt;</property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">4</property> + </packing> + </child> + </object> + </child> </object> <packing> @@ -4653,6 +4742,7 @@ the other to maintain the video's original aspect ratio.</property> <property name="position">2</property> </packing> </child> + </object> </child> </object> @@ -5164,8 +5254,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A <integer>100</integer> <key>folder</key> <string></string> - <key>live_duration</key> - <integer>15</integer> <key>preset</key> <array> <string>Normal</string> @@ -5253,6 +5341,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A <false /> <key>hbfd_feature</key> <false /> + <key>live_duration</key> + <integer>15</integer> <key>nocheckvquality</key> <false /> <key>noscale</key> |