diff options
| author | jstebbins <[email protected]> | 2008-11-26 19:19:35 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2008-11-26 19:19:35 +0000 |
| commit | 80fa9daad46cf5281b71ed287868e535fa9fbdb9 (patch) | |
| tree | c52bb7e6199d7c088b6f19252f4fc92e9226d57b /gtk | |
| parent | f4f9ae17636bab751746c41a16c2f329b06cd7bf (diff) | |
LinGui: move the picture filters to the preview window.
and tidy up the picture tab.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1957 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/ghb.ui | 592 | ||||
| -rw-r--r-- | gtk/src/preview.c | 2 | ||||
| -rw-r--r-- | gtk/src/resource_data.h | 979 | ||||
| -rw-r--r-- | gtk/src/resources.plist | 592 |
4 files changed, 1133 insertions, 1032 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index 6e013342a..e1abfd492 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -885,16 +885,24 @@ <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">3</property> + + <child> + <object class="GtkAlignment" id="alignment_a"> + <property name="visible">True</property> + <property name="top_padding">10</property> + <property name="left_padding">10</property> + <child> <object class="GtkVBox" id="vbox5"> <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">14</property> <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">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> @@ -1020,7 +1028,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> @@ -1145,7 +1153,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> @@ -1264,259 +1272,92 @@ </child> </object> </child> + + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + + <child> + <object class="GtkAlignment" id="alignment_b"> + <property name="visible">True</property> + <property name="right_padding">10</property> + <child> <object class="GtkVBox" id="vbox9"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkFrame" id="frame4"> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + + <child> + <object class="GtkFrame" id="frame8"> <property name="visible">True</property> - <property name="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">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">etched-in</property> <child> - <object class="GtkAlignment" id="alignment8"> + <object class="GtkAlignment" id="alignment19"> <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">12</property> + <property name="bottom_padding">4</property> + <property name="left_padding">4</property> + <property name="right_padding">4</property> <child> - <object class="GtkVBox" id="vbox10"> + <object class="GtkImage" id="preview_button_image"> + <property name="width_request">240</property> + <property name="height_request">120</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="GtkCheckButton" id="VideoGrayScale"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">This filter removes the color components of the picture.</property> - <property name="label" translatable="yes">Grayscale</property> - <property name="draw_indicator">True</property> - <signal handler="setting_widget_changed_cb" name="toggled"/> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="PictureDetelecine"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">Remove interlacing artifacts caused by the telecine process often applied to movies.</property> - <property name="label" translatable="yes">Detelecine</property> - <property name="draw_indicator">True</property> - <signal handler="setting_widget_changed_cb" name="toggled"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="position">1</property> - <property name="expand">False</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="PictureDecomb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">Decomb is a selective deinterlacer. It will only deinterlace frames that appear to need it. It generally produces better quality than the normal deinterlacer.</property> - <property name="label" translatable="yes">De-Comb</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal handler="setting_widget_changed_cb" name="toggled"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox25"> - <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> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xscale">0.55</property> - <child> - <object class="GtkHScale" id="PictureDeblock"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">This is a filter that gets applied before encoding. If the source looks blocky before encoding, you may want to use this.</property> - <property name="adjustment">adjustment20</property> - <property name="digits">0</property> - <property name="value_pos">GTK_POS_RIGHT</property> - <signal handler="setting_widget_changed_cb" name="value_changed"/> - <signal handler="format_deblock_cb" name="format-value"/> - </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="hbox12"> - <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="selectable">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deinterlace:</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</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> - <property name="tooltip-text" translatable="yes">Removes interlacing artifacts. Since deinterlacing degrades picture quality, leave it off unless you know you need it.</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace"> - <property name="visible">False</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxentry-entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">15</property> - <signal handler="deint_tweak_focus_out_cb" name="focus_out_event"/> - </object> - </child> - </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="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="selectable">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="width_chars">10</property> - </object> - <packing> - <property name="expand">False</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> - <property name="tooltip-text" translatable="yes">This filter removes noise or grain from the picture.</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDenoise"> - <property name="visible">False</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxentry-entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">15</property> - <signal handler="denoise_tweak_focus_out_cb" name="focus_out_event"/> - </object> - </child> - </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">5</property> - </packing> - </child> + <property name="icon_name">hb-icon</property> + <property name="icon-size">6</property> + <signal name="size_allocate" handler="preview_button_size_allocate_cb"/> </object> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label22"> + <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="label" translatable="yes"><b>Picture Cleanup</b></property> <property name="use_markup">True</property> </object> </child> + </object> <packing> <property name="expand">False</property> - <property name="padding">2</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> + + <child> - <object class="GtkVBox" id="vbox16"> + <object class="GtkButton" id="preview_button"> + <property name="width_request">118</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">half</property> + <signal name="clicked" handler="preview_button_clicked_cb"/> <child> - <object class="GtkHBox" id="hbox56"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> + <property name="spacing">4</property> <child> - <object class="GtkLabel" id="label69"> + <object class="GtkLabel" id="previewlabel1"> <property name="visible">True</property> - <property name="xalign">0.75999999046325684</property> - <property name="yalign">1</property> - <property name="label" translatable="yes"><b>Preview:</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Full Size Preview:</property> + <property name="justify">right</property> </object> + <packing> + <property name="expand">True</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkLabel" id="preview_dims"> @@ -1527,54 +1368,39 @@ <property name="label" translatable="yes">--</property> </object> <packing> + <property name="expand">True</property> <property name="position">1</property> </packing> </child> </object> </child> + </object> <packing> <property name="expand">False</property> - <property name="position">1</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox35"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <child> - <object class="GtkButton" id="preview_button"> - <property name="width_request">118</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip-text" translatable="yes">Open the full size preview</property> - <property name="relief">GTK_RELIEF_HALF</property> - <signal handler="preview_button_clicked_cb" name="clicked"/> - <signal handler="preview_button_size_allocate_cb" name="size_allocate"/> - <child> - <object class="GtkHBox" id="hbox49"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="preview_button_image"> - <property name="visible">True</property> - <property name="icon_size">6</property> - <property name="icon_name">hb-icon</property> - </object> - </child> - </object> - </child> - </object> - </child> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> + </child> + + </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> + </object> </child> <child type="tab"> @@ -4185,6 +4011,40 @@ location as the movie.</property> <property name="position">2</property> </packing> </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>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="has_frame">False</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> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -4610,48 +4470,222 @@ the other to maintain the video's original aspect ratio.</property> <object class="GtkVBox" id="vbox42"> <property name="visible">True</property> <child> - <object class="GtkAlignment" id="alignment6"> + <object class="GtkFrame" id="frame4"> <property name="visible">True</property> - <property name="xscale">0</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">etched-out</property> <child> - <object class="GtkHBox" id="hbox45"> + <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Frame</b></property> - <property name="use_markup">True</property> - </object> - </child> - <child> - <object class="GtkSpinButton" id="preview_frame"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">View other frames</property> - <property name="max_length">2</property> - <property name="has_frame">False</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="adjustment">adjustment19</property> - <property name="numeric">True</property> - <signal handler="preview_frame_value_changed_cb" name="value_changed"/> + <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> + <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="hbox25"> + <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> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox12"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">4</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> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">5</property> + </packing> + </child> </object> - <packing> - <property name="position">1</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>Picture 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">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">2</property> diff --git a/gtk/src/preview.c b/gtk/src/preview.c index a4dfcdd5a..c598c123a 100644 --- a/gtk/src/preview.c +++ b/gtk/src/preview.c @@ -587,7 +587,7 @@ ghb_set_preview_image(signal_user_data_t *ud) g_free(text); g_debug("preview %d x %d", preview_width, preview_height); - target_height = MIN(ud->preview->button_height - 12, 128); + target_height = MIN(ud->preview->button_height, 128); height = target_height; width = preview_width * height / preview_height; diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index 7631d0249..4392d75fc 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -1351,6 +1351,17 @@ "DK_BUTTON_RELEASE_MASK</property>\n" " <property name="spacing">3</prop" "erty>\n" +"\n" +" <child>\n" +" <object class="GtkAlignment" id=&quo" +"t;alignment_a">\n" +" <property name="visible">True&l" +"t;/property>\n" +" <property name="top_padding">10" +"</property>\n" +" <property name="left_padding">1" +"0</property>\n" +"\n" " <child>\n" " <object class="GtkVBox" id="vbo" "x5">\n" @@ -1359,6 +1370,8 @@ " <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="spacing">14</pr" +"operty>\n" " <child>\n" " <object class="GtkFrame" id=&quo" "t;frame5">\n" @@ -1370,7 +1383,7 @@ " <property name="label_xalign"&" "gt;0</property>\n" " <property name="shadow_type"&g" -"t;GTK_SHADOW_ETCHED_OUT</property>\n" +"t;GTK_SHADOW_NONE</property>\n" " <child>\n" " <object class="GtkAlignment"" " id="alignment9">\n" @@ -1579,7 +1592,7 @@ " <property name="label_xalign"&" "gt;0</property>\n" " <property name="shadow_type"&g" -"t;GTK_SHADOW_ETCHED_OUT</property>\n" +"t;GTK_SHADOW_NONE</property>\n" " <child>\n" " <object class="GtkAlignment"" " id="alignment5">\n" @@ -1781,7 +1794,7 @@ " <property name="label_xalign&qu" "ot;>0</property>\n" " <property name="shadow_type&quo" -"t;>GTK_SHADOW_ETCHED_OUT</property>\n" +"t;>GTK_SHADOW_NONE</property>\n" " <child>\n" " <object class="GtkAlignment&q" "uot; id="alignment7">\n" @@ -1963,6 +1976,22 @@ " </child>\n" " </object>\n" " </child>\n" +"\n" +" </object>\n" +" <packing>\n" +" <property name="position">0<" +"/property>\n" +" </packing>\n" +" </child>\n" +"\n" +" <child>\n" +" <object class="GtkAlignment" id=&quo" +"t;alignment_b">\n" +" <property name="visible">True&l" +"t;/property>\n" +" <property name="right_padding">" +"10</property>\n" +"\n" " <child>\n" " <object class="GtkVBox" id="vbo" "x9">\n" @@ -1972,434 +2001,116 @@ "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" " | GDK_BUTTON_RELEASE_MASK</property>\n" " <child>\n" +" <object class="GtkLabel" id=&quo" +"t;label8">\n" +" <property name="visible">Tr" +"ue</property>\n" +" </object>\n" +" <packing>\n" +" <property name="position">0" +"</property>\n" +" </packing>\n" +" </child>\n" +"\n" +" <child>\n" " <object class="GtkFrame" id=&quo" -"t;frame4">\n" +"t;frame8">\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_xalign"&" "gt;0</property>\n" " <property name="shadow_type"&g" -"t;GTK_SHADOW_ETCHED_OUT</property>\n" +"t;etched-in</property>\n" " <child>\n" " <object class="GtkAlignment"" -" id="alignment8">\n" +" id="alignment19">\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="top_padding&quo" -"t;>2</property>\n" " <property name="bottom_padding&" -"quot;>2</property>\n" +"quot;>4</property>\n" " <property name="left_padding&qu" -"ot;>12</property>\n" +"ot;>4</property>\n" +" <property name="right_padding&q" +"uot;>4</property>\n" " <child>\n" -" <object class="GtkVBox" " -"id="vbox10">\n" +" <object class="GtkImage"" +" id="preview_button_image">\n" +" <property name="width_reque" +"st">240</property>\n" +" <property name="height_requ" +"est">120</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" -" <child>\n" -" <object class="GtkCheckBu" -"tton" id="VideoGrayScale">\n" -" <property name="visible" -"">True</property>\n" -" <property name="can_foc" -"us">True</property>\n" -" <property name="events&" -"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" -"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip" -"-text" translatable="yes">This filter removes the col" -"or components of the picture.</property>\n" -" <property name="label&q" -"uot; translatable="yes">Grayscale</property>\n" -" <property name="draw_in" -"dicator">True</property>\n" -" <signal handler="settin" -"g_widget_changed_cb" name="toggled"/>\n" -" </object>\n" -" <packing>\n" -" <property name="positio" -"n">0</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCheckBu" -"tton" id="PictureDetelecine">\n" -" <property name="visible" -"">True</property>\n" -" <property name="can_foc" -"us">True</property>\n" -" <property name="events&" -"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" -"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip" -"-text" translatable="yes">Remove interlacing artifact" -"s caused by the telecine process often applied to movies.</property&" -"gt;\n" -" <property name="label&q" -"uot; translatable="yes">Detelecine</property>\n" -" <property name="draw_in" -"dicator">True</property>\n" -" <signal handler="settin" -"g_widget_changed_cb" name="toggled"/>\n" -" <signal handler="tweak_" -"setting_cb" name="button-press-event"/>\n" -" </object>\n" -" <packing>\n" -" <property name="positio" -"n">1</property>\n" -" <property name="expand&" -"quot;>False</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCheckBu" -"tton" id="PictureDecomb">\n" -" <property name="visible" -"">True</property>\n" -" <property name="can_foc" -"us">True</property>\n" -" <property name="tooltip" -"-text" translatable="yes">Decomb is a selective deint" -"erlacer. It will only deinterlace frames that appear to need it. It gen" -"erally produces better quality than the normal deinterlacer.</proper" -"ty>\n" -" <property name="label&q" -"uot; translatable="yes">De-Comb</property>\n" -" <property name="active&" -"quot;>True</property>\n" -" <property name="draw_in" -"dicator">True</property>\n" -" <signal handler="settin" -"g_widget_changed_cb" name="toggled"/>\n" -" <signal handler="tweak_" -"setting_cb" name="button-press-event"/>\n" -" </object>\n" -" <packing>\n" -" <property name="expand&" -"quot;>False</property>\n" -" <property name="positio" -"n">2</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkHBox&qu" -"ot; id="hbox25">\n" -" <property name="visible" -"">True</property>\n" -" <child>\n" -" <object class="GtkLab" -"el" id="label41">\n" -" <property name="vis" -"ible">True</property>\n" -" <property name="xal" -"ign">0</property>\n" -" <property name="lab" -"el" translatable="yes">Deblock:</property>\n" -" <property name="wid" -"th_chars">10</property>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkAli" -"gnment" id="alignment20">\n" -" <property name="vis" -"ible">True</property>\n" -" <property name="xal" -"ign">0</property>\n" -" <property name="xsc" -"ale">0.55</property>\n" -" <child>\n" -" <object class="Gt" -"kHScale" id="PictureDeblock">\n" -" <property name="" -";visible">True</property>\n" -" <property name="" -";can_focus">True</property>\n" -" <property name="" -";tooltip-text" translatable="yes">This is a filter th" -"at gets applied before encoding. If the source looks blocky before enc" -"oding, you may want to use this.</property>\n" -" <property name="" -";adjustment">adjustment20</property>\n" -" <property name="" -";digits">0</property>\n" -" <property name="" -";value_pos">GTK_POS_RIGHT</property>\n" -" <signal handler=&quo" -"t;setting_widget_changed_cb" name="value_changed"/>\n" -" <signal handler=&quo" -"t;format_deblock_cb" name="format-value"/>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="pos" -"ition">1</property>\n" -" </packing>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="positio" -"n">3</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkHBox&qu" -"ot; id="hbox12">\n" -" <property name="visible" -"">True</property>\n" -" <property name="events&" -"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" -"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <child>\n" -" <object class="GtkLab" -"el" id="label20">\n" -" <property name="vis" -"ible">True</property>\n" -" <property name="can" -"_focus">True</property>\n" -" <property name="sel" -"ectable">False</property>\n" -" <property name="eve" -"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" -"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="xal" -"ign">0</property>\n" -" <property name="lab" -"el" translatable="yes">Deinterlace:</property>\n" -" <property name="wid" -"th_chars">10</property>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCom" -"boBox" id="PictureDeinterlace">\n" -" <property name="wid" -"th_request">100</property>\n" -" <property name="vis" -"ible">True</property>\n" -" <property name="eve" -"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" -"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip" -"-text" translatable="yes">Removes interlacing artifac" -"ts. Since deinterlacing degrades picture quality, leave it off unless y" -"ou know you need it.</property>\n" -" <signal handler="se" -"tting_widget_changed_cb" name="changed"/>\n" -" <signal handler="tw" -"eak_setting_cb" name="button-press-event"/>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" <property name="pos" -"ition">1</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCom" -"boBoxEntry" id="tweak_PictureDeinterlace">\n" -" <property name="vis" -"ible">False</property>\n" -" <signal handler="se" -"tting_widget_changed_cb" name="changed"/>\n" -" <child internal-child=&q" -"uot;entry">\n" -" <object class="Gt" -"kEntry" id="comboboxentry-entry1">\n" -" <property name="" -";visible">True</property>\n" -" <property name="" -";can_focus">True</property>\n" -" <property name="" -";width_chars">15</property>\n" -" <signal handler=&quo" -"t;deint_tweak_focus_out_cb" name="focus_out_event"/>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" <property name="pos" -"ition">2</property>\n" -" </packing>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="expand&" -"quot;>False</property>\n" -" <property name="padding" -"">2</property>\n" -" <property name="positio" -"n">4</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkHBox&qu" -"ot; id="hbox13">\n" -" <property name="visible" -"">True</property>\n" -" <property name="events&" -"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" -"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <child>\n" -" <object class="GtkLab" -"el" id="label21">\n" -" <property name="vis" -"ible">True</property>\n" -" <property name="sel" -"ectable">True</property>\n" -" <property name="eve" -"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" -"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="xal" -"ign">0</property>\n" -" <property name="lab" -"el" translatable="yes">Denoise:</property>\n" -" <property name="wid" -"th_chars">10</property>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCom" -"boBox" id="PictureDenoise">\n" -" <property name="wid" -"th_request">100</property>\n" -" <property name="vis" -"ible">True</property>\n" -" <property name="eve" -"nts">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" -"DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="tooltip" -"-text" translatable="yes">This filter removes noise o" -"r grain from the picture.</property>\n" -" <signal handler="se" -"tting_widget_changed_cb" name="changed"/>\n" -" <signal handler="tw" -"eak_setting_cb" name="button-press-event"/>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" <property name="pos" -"ition">1</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCom" -"boBoxEntry" id="tweak_PictureDenoise">\n" -" <property name="vis" -"ible">False</property>\n" -" <signal handler="se" -"tting_widget_changed_cb" name="changed"/>\n" -" <child internal-child=&q" -"uot;entry">\n" -" <object class="Gt" -"kEntry" id="comboboxentry-entry2">\n" -" <property name="" -";visible">True</property>\n" -" <property name="" -";can_focus">True</property>\n" -" <property name="" -";width_chars">15</property>\n" -" <signal handler=&quo" -"t;denoise_tweak_focus_out_cb" name="focus_out_event"/>" -";\n" -" </object>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="exp" -"and">False</property>\n" -" <property name="pos" -"ition">2</property>\n" -" </packing>\n" -" </child>\n" -" </object>\n" -" <packing>\n" -" <property name="expand&" -"quot;>False</property>\n" -" <property name="padding" -"">2</property>\n" -" <property name="positio" -"n">5</property>\n" -" </packing>\n" -" </child>\n" +" <property name="icon_name&q" +"uot;>hb-icon</property>\n" +" <property name="icon-size&q" +"uot;>6</property>\n" +" <signal name="size_allocate" +"" handler="preview_button_size_allocate_cb"/>\n" " </object>\n" " </child>\n" " </object>\n" " </child>\n" " <child type="label">\n" " <object class="GtkLabel" id=" -""label22">\n" +""label21">\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="label" tra" -"nslatable="yes">&lt;b&gt;Picture Cleanup&lt;/b" -"&gt;</property>\n" " <property name="use_markup"" ";>True</property>\n" " </object>\n" " </child>\n" +"\n" " </object>\n" " <packing>\n" " <property name="expand">Fal" "se</property>\n" -" <property name="padding">2&" -"lt;/property>\n" +" <property name="fill">False" +"</property>\n" +" <property name="position">1" +"</property>\n" " </packing>\n" " </child>\n" +"\n" +"\n" " <child>\n" -" <object class="GtkVBox" id="" -";vbox16">\n" +" <object class="GtkButton" id=&qu" +"ot;preview_button">\n" +" <property name="width_request"" +">118</property>\n" " <property name="visible">Tr" "ue</property>\n" +" <property name="can_focus">" +"True</property>\n" +" <property name="receives_default&qu" +"ot;>True</property>\n" +" <property name="relief">hal" +"f</property>\n" +" <signal name="clicked" handler" +"="preview_button_clicked_cb"/>\n" " <child>\n" " <object class="GtkHBox" id=&" -"quot;hbox56">\n" +"quot;hbox7">\n" " <property name="visible"&g" "t;True</property>\n" +" <property name="spacing"&g" +"t;4</property>\n" " <child>\n" " <object class="GtkLabel"" -" id="label69">\n" +" id="previewlabel1">\n" " <property name="visible&quo" "t;>True</property>\n" -" <property name="xalign"" -";>0.75999999046325684</property>\n" -" <property name="yalign"" -";>1</property>\n" " <property name="label"" -" translatable="yes">&lt;b&gt;Preview:&lt;/b&am" -"p;gt;</property>\n" -" <property name="use_markup&" -"quot;>True</property>\n" +" translatable="yes">Full Size Preview:</property>\n" +" <property name="justify&quo" +"t;>right</property>\n" " </object>\n" +" <packing>\n" +" <property name="expand"" +";>True</property>\n" +" <property name="position&qu" +"ot;>0</property>\n" +" </packing>\n" " </child>\n" " <child>\n" " <object class="GtkLabel"" @@ -2416,77 +2127,50 @@ " translatable="yes">--</property>\n" " </object>\n" " <packing>\n" +" <property name="expand"" +";>True</property>\n" " <property name="position&qu" "ot;>1</property>\n" " </packing>\n" " </child>\n" " </object>\n" " </child>\n" +"\n" " </object>\n" " <packing>\n" " <property name="expand">Fal" "se</property>\n" -" <property name="position">1" +" <property name="fill">False" +"</property>\n" +" <property name="position">2" "</property>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkHBox" id="" -";hbox35">\n" +" <object class="GtkLabel" id=&quo" +"t;label8">\n" " <property name="visible">Tr" "ue</property>\n" -" <child>\n" -" <object class="GtkButton" id" -"="preview_button">\n" -" <property name="width_request&q" -"uot;>118</property>\n" -" <property name="visible"&g" -"t;True</property>\n" -" <property name="can_focus"" -">True</property>\n" -" <property name="receives_defaul" -"t">True</property>\n" -" <property name="tooltip-text&qu" -"ot; translatable="yes">Open the full size preview</prop" -"erty>\n" -" <property name="relief">" -";GTK_RELIEF_HALF</property>\n" -" <signal handler="preview_button" -"_clicked_cb" name="clicked"/>\n" -" <signal handler="preview_button" -"_size_allocate_cb" name="size_allocate"/>\n" -" <child>\n" -" <object class="GtkHBox" " -"id="hbox49">\n" -" <property name="visible&quo" -"t;>True</property>\n" -" <child>\n" -" <object class="GtkImage&q" -"uot; id="preview_button_image">\n" -" <property name="visible" -"">True</property>\n" -" <property name="icon_si" -"ze">6</property>\n" -" <property name="icon_na" -"me">hb-icon</property>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" </child>\n" " </object>\n" " <packing>\n" -" <property name="position">2" +" <property name="position">3" "</property>\n" " </packing>\n" " </child>\n" " </object>\n" +" </child>\n" +"\n" +" </object>\n" " <packing>\n" +" <property name="expand">False&l" +"t;/property>\n" +" <property name="fill">False<" +"/property>\n" " <property name="position">1<" "/property>\n" " </packing>\n" " </child>\n" +"\n" " </object>\n" " </child>\n" " <child type="tab">\n" @@ -6837,6 +6521,60 @@ "y>\n" " </packing>\n" " </child>\n" +" <child>\n" +" <object class="GtkHBox" id="hbox1"" +">\n" +" <property name="visible">True</prope" +"rty>\n" +" <child>\n" +" <object class="GtkLabel" id="label3" +"">\n" +" <property name="visible">True</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" +" <property name="visible">True</p" +"roperty>\n" +" <property name="can_focus">True<" +"/property>\n" +" <property name="max_length">2</p" +"roperty>\n" +" <property name="has_frame">False<" +";/property>\n" +" <property name="shadow_type">none&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" +" </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" +"y>\n" +" </packing>\n" +" </child>\n" " </object>\n" " <packing>\n" " <property name="expand">False</property&" @@ -7527,70 +7265,365 @@ " <property name="visible">True</prope" "rty>\n" " <child>\n" -" <object class="GtkAlignment" id="al" -"ignment6">\n" +" <object class="GtkFrame" id="frame4" +"">\n" " <property name="visible">True</p" "roperty>\n" -" <property name="xscale">0</prope" -"rty>\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">etched" +"-out</property>\n" " <child>\n" -" <object class="GtkHBox" id="hbo" -"x45">\n" +" <object class="GtkAlignment" id=&quo" +"t;alignment8">\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">2&" +"lt;/property>\n" +" <property name="bottom_padding">" +";2</property>\n" +" <property name="left_padding">1" +"2</property>\n" " <child>\n" -" <object class="GtkLabel" id=&quo" -"t;label18">\n" +" <object class="GtkVBox" id="" +";vbox10">\n" " <property name="visible">Tr" "ue</property>\n" -" <property name="label" transla" -"table="yes">&lt;b&gt;Frame&lt;/b&gt;</p" -"roperty>\n" -" <property name="use_markup">" +" <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="GtkCheckButton&quo" +"t; id="VideoGrayScale">\n" +" <property name="label" tra" +"nslatable="yes">Grayscale</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="toggled" han" +"dler="setting_widget_changed_cb"/>\n" +" </object>\n" +" <packing>\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" +" <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="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">" +";False</property>\n" +" <property name="position"&" +"gt;1</property>\n" +" </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" +"dler="setting_widget_changed_cb"/>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">" +";False</property>\n" +" <property name="position"&" +"gt;2</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHBox" id=&" +"quot;hbox25">\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" +" </object>\n" +" <packing>\n" +" <property name="position"&" +"gt;3</property>\n" +" </packing>\n" +" </child>\n" +" <child>\n" +" <object class="GtkHBox" id=&" +"quot;hbox12">\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" +" </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" +" </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>\n" +" <packing>\n" +" <property name="expand">" +";False</property>\n" +" <property name="padding"&g" +"t;2</property>\n" +" <property name="position"&" +"gt;5</property>\n" +" </packing>\n" +" </child>\n" " </object>\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="tooltip-text" " -"translatable="yes">View other frames</property>\n" -" <property name="max_length">" -";2</property>\n" -" <property name="has_frame">" -"False</property>\n" -" <property name="shadow_type"&g" -"t;GTK_SHADOW_NONE</property>\n" -" <property name="adjustment">" -";adjustment19</property>\n" -" <property name="numeric">Tr" -"ue</property>\n" -" <signal handler="preview_frame_valu" -"e_changed_cb" name="value_changed"/>\n" -" </object>\n" -" <packing>\n" -" <property name="position">1" +" </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;Picture Filters&lt;/b&gt;" "</property>\n" -" </packing>\n" -" </child>\n" +" <property name="use_markup">Tru" +"e</property>\n" " </object>\n" " </child>\n" " </object>\n" " <packing>\n" " <property name="expand">False</p" "roperty>\n" +" <property name="padding">2</prop" +"erty>\n" +" <property name="position">0</pro" +"perty>\n" " </packing>\n" " </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" " </object>\n" " <packing>\n" " <property name="position">2</propert" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index 72771ba72..6ad8a9e08 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -890,16 +890,24 @@ <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">3</property> + + <child> + <object class="GtkAlignment" id="alignment_a"> + <property name="visible">True</property> + <property name="top_padding">10</property> + <property name="left_padding">10</property> + <child> <object class="GtkVBox" id="vbox5"> <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">14</property> <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">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> @@ -1025,7 +1033,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> @@ -1150,7 +1158,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> @@ -1269,259 +1277,92 @@ </child> </object> </child> + + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + + <child> + <object class="GtkAlignment" id="alignment_b"> + <property name="visible">True</property> + <property name="right_padding">10</property> + <child> <object class="GtkVBox" id="vbox9"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkFrame" id="frame4"> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + + <child> + <object class="GtkFrame" id="frame8"> <property name="visible">True</property> - <property name="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">GTK_SHADOW_ETCHED_OUT</property> + <property name="shadow_type">etched-in</property> <child> - <object class="GtkAlignment" id="alignment8"> + <object class="GtkAlignment" id="alignment19"> <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">12</property> + <property name="bottom_padding">4</property> + <property name="left_padding">4</property> + <property name="right_padding">4</property> <child> - <object class="GtkVBox" id="vbox10"> + <object class="GtkImage" id="preview_button_image"> + <property name="width_request">240</property> + <property name="height_request">120</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="GtkCheckButton" id="VideoGrayScale"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">This filter removes the color components of the picture.</property> - <property name="label" translatable="yes">Grayscale</property> - <property name="draw_indicator">True</property> - <signal handler="setting_widget_changed_cb" name="toggled"/> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="PictureDetelecine"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip-text" translatable="yes">Remove interlacing artifacts caused by the telecine process often applied to movies.</property> - <property name="label" translatable="yes">Detelecine</property> - <property name="draw_indicator">True</property> - <signal handler="setting_widget_changed_cb" name="toggled"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="position">1</property> - <property name="expand">False</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="PictureDecomb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">Decomb is a selective deinterlacer. It will only deinterlace frames that appear to need it. It generally produces better quality than the normal deinterlacer.</property> - <property name="label" translatable="yes">De-Comb</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal handler="setting_widget_changed_cb" name="toggled"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox25"> - <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> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xscale">0.55</property> - <child> - <object class="GtkHScale" id="PictureDeblock"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">This is a filter that gets applied before encoding. If the source looks blocky before encoding, you may want to use this.</property> - <property name="adjustment">adjustment20</property> - <property name="digits">0</property> - <property name="value_pos">GTK_POS_RIGHT</property> - <signal handler="setting_widget_changed_cb" name="value_changed"/> - <signal handler="format_deblock_cb" name="format-value"/> - </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="hbox12"> - <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="selectable">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deinterlace:</property> - <property name="width_chars">10</property> - </object> - <packing> - <property name="expand">False</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> - <property name="tooltip-text" translatable="yes">Removes interlacing artifacts. Since deinterlacing degrades picture quality, leave it off unless you know you need it.</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace"> - <property name="visible">False</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxentry-entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">15</property> - <signal handler="deint_tweak_focus_out_cb" name="focus_out_event"/> - </object> - </child> - </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="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="selectable">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="width_chars">10</property> - </object> - <packing> - <property name="expand">False</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> - <property name="tooltip-text" translatable="yes">This filter removes noise or grain from the picture.</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <signal handler="tweak_setting_cb" name="button-press-event"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="tweak_PictureDenoise"> - <property name="visible">False</property> - <signal handler="setting_widget_changed_cb" name="changed"/> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxentry-entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">15</property> - <signal handler="denoise_tweak_focus_out_cb" name="focus_out_event"/> - </object> - </child> - </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">5</property> - </packing> - </child> + <property name="icon_name">hb-icon</property> + <property name="icon-size">6</property> + <signal name="size_allocate" handler="preview_button_size_allocate_cb"/> </object> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label22"> + <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="label" translatable="yes">&lt;b&gt;Picture Cleanup&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="fill">False</property> + <property name="position">1</property> </packing> </child> + + <child> - <object class="GtkVBox" id="vbox16"> + <object class="GtkButton" id="preview_button"> + <property name="width_request">118</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">half</property> + <signal name="clicked" handler="preview_button_clicked_cb"/> <child> - <object class="GtkHBox" id="hbox56"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> + <property name="spacing">4</property> <child> - <object class="GtkLabel" id="label69"> + <object class="GtkLabel" id="previewlabel1"> <property name="visible">True</property> - <property name="xalign">0.75999999046325684</property> - <property name="yalign">1</property> - <property name="label" translatable="yes">&lt;b&gt;Preview:&lt;/b&gt;</property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Full Size Preview:</property> + <property name="justify">right</property> </object> + <packing> + <property name="expand">True</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkLabel" id="preview_dims"> @@ -1532,54 +1373,39 @@ <property name="label" translatable="yes">--</property> </object> <packing> + <property name="expand">True</property> <property name="position">1</property> </packing> </child> </object> </child> + </object> <packing> <property name="expand">False</property> - <property name="position">1</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox35"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <child> - <object class="GtkButton" id="preview_button"> - <property name="width_request">118</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip-text" translatable="yes">Open the full size preview</property> - <property name="relief">GTK_RELIEF_HALF</property> - <signal handler="preview_button_clicked_cb" name="clicked"/> - <signal handler="preview_button_size_allocate_cb" name="size_allocate"/> - <child> - <object class="GtkHBox" id="hbox49"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="preview_button_image"> - <property name="visible">True</property> - <property name="icon_size">6</property> - <property name="icon_name">hb-icon</property> - </object> - </child> - </object> - </child> - </object> - </child> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> + </child> + + </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> + </object> </child> <child type="tab"> @@ -4190,6 +4016,40 @@ location as the movie.</property> <property name="position">2</property> </packing> </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes">&lt;b&gt;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="has_frame">False</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> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -4615,48 +4475,222 @@ the other to maintain the video's original aspect ratio.</property> <object class="GtkVBox" id="vbox42"> <property name="visible">True</property> <child> - <object class="GtkAlignment" id="alignment6"> + <object class="GtkFrame" id="frame4"> <property name="visible">True</property> - <property name="xscale">0</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">etched-out</property> <child> - <object class="GtkHBox" id="hbox45"> + <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="label" translatable="yes">&lt;b&gt;Frame&lt;/b&gt;</property> - <property name="use_markup">True</property> - </object> - </child> - <child> - <object class="GtkSpinButton" id="preview_frame"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">View other frames</property> - <property name="max_length">2</property> - <property name="has_frame">False</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="adjustment">adjustment19</property> - <property name="numeric">True</property> - <signal handler="preview_frame_value_changed_cb" name="value_changed"/> + <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> + <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="hbox25"> + <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> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox12"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">4</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> + <packing> + <property name="expand">False</property> + <property name="padding">2</property> + <property name="position">5</property> + </packing> + </child> </object> - <packing> - <property name="position">1</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;Picture 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">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">2</property> |