diff options
| author | John Stebbins <[email protected]> | 2016-03-16 19:21:07 -0600 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-03-16 19:21:07 -0600 |
| commit | e5fc75086a8aefbde4ebc4867476fff8d86f1efb (patch) | |
| tree | 834b0e68e40fc3d39ead95d0976b19366cea9e4f /gtk | |
| parent | f81ea492fd140ad793799f5325bc4a333194c539 (diff) | |
LinGui: replace preview "fullscreen" with preview window resizing
Dynamic transitions to fullscreen mode have been broken in GTK for a
long time now. So I'm giving up on them ever fixing it. Instead, the
preview window can be resized by dragging edges and maximized with the
maximize button.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/callbacks.c | 15 | ||||
| -rw-r--r-- | gtk/src/ghb-3.12.ui | 300 | ||||
| -rw-r--r-- | gtk/src/ghb-3.14.ui | 300 | ||||
| -rw-r--r-- | gtk/src/ghb.ui | 300 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 5 | ||||
| -rw-r--r-- | gtk/src/internal_defaults.json | 1 | ||||
| -rw-r--r-- | gtk/src/main.c | 12 | ||||
| -rw-r--r-- | gtk/src/preview.c | 423 | ||||
| -rw-r--r-- | gtk/src/preview.h | 2 |
9 files changed, 770 insertions, 588 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 74230f3b8..bc78557b2 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -2026,7 +2026,7 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud) widget = GHB_WIDGET(ud->builder, "preview_frame"); gtk_range_set_range(GTK_RANGE(widget), 1, preview_count); - ghb_set_preview_image(ud); + ghb_reset_preview_image(ud); ghb_preview_set_visible(ud); } } @@ -2638,19 +2638,6 @@ scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud) } G_MODULE_EXPORT void -show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud) -{ - g_debug("show_crop_changed_cb ()"); - ghb_widget_to_setting(ud->prefs, widget); - ghb_check_dependency(ud, widget, NULL); - ghb_live_reset(ud); - if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, GHB_PIC_KEEP_PAR); - ghb_pref_save(ud->prefs, "preview_show_crop"); - update_preview = TRUE; -} - -G_MODULE_EXPORT void generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud) { // Normally (due to user input) I only want to process the entry diff --git a/gtk/src/ghb-3.12.ui b/gtk/src/ghb-3.12.ui index 43ac6dacc..012634b3a 100644 --- a/gtk/src/ghb-3.12.ui +++ b/gtk/src/ghb-3.12.ui @@ -8145,12 +8145,11 @@ Setting this to 0 means there is no maximum height.</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK</property> <property name="title" translatable="yes">Preview</property> - <property name="resizable">False</property> + <property name="resizable">True</property> <property name="window_position">center</property> - <property name="type_hint">utility</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="transient_for">hb_window</property> + <property name="type_hint">normal</property> + <property name="icon-name">hb-icon</property> + <signal name="window-state-event" handler="preview_state_cb" swapped="no"/> <signal name="configure-event" handler="preview_configure_cb" swapped="no"/> <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/> <child> @@ -8158,50 +8157,76 @@ Setting this to 0 means there is no maximum height.</property> <property name="visible">True</property> <property name="app_paintable">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> + <property name="hexpand-set">True</property> + <property name="vexpand-set">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="halign">fill</property> + <property name="valign">fill</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/> <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/> + <signal name="size-allocate" handler="preview_resize_cb" swapped="no"/> <signal name="draw" handler="preview_draw_cb" swapped="no"/> <child> - <object class="GtkBox" id="preview_hud_box"> - <property name="orientation">vertical</property> - <property name="visible">True</property> + <object class="GtkEventBox" id="preview_hud"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">end</property> + <property name="margin-bottom">30</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> + <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/> + <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/> <child> - <object class="GtkEventBox" id="preview_hud"> - <property name="visible">False</property> + <object class="GtkBox" id="vbox35"> + <property name="orientation">vertical</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hexpand-set">True</property> - <property name="vexpand-set">True</property> - <property name="halign">center</property> - <property name="valign">end</property> - <property name="margin-bottom">30</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> - <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/> - <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkBox" id="vbox35"> - <property name="orientation">vertical</property> + <object class="GtkScale" id="preview_frame"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Select preview frames.</property> + <property name="adjustment">adjustment19</property> + <property name="digits">0</property> + <property name="value_pos">bottom</property> + <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="live_preview_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin-top">5</property> - <property name="margin-bottom">5</property> - <property name="margin-left">10</property> - <property name="margin-right">10</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">5</property> <child> - <object class="GtkScale" id="preview_frame"> - <property name="width_request">400</property> + <object class="GtkButton" id="live_preview_play"> + <property name="height_request">30</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Select preview frames.</property> - <property name="adjustment">adjustment19</property> - <property name="digits">0</property> - <property name="value_pos">bottom</property> - <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property> + <property name="relief">none</property> + <signal name="clicked" handler="live_preview_start_cb" swapped="no"/> + <child> + <object class="GtkImage" id="live_preview_play_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-media-play</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -8210,27 +8235,30 @@ Setting this to 0 means there is no maximum height.</property> </packing> </child> <child> - <object class="GtkBox" id="live_preview_box"> - <property name="orientation">horizontal</property> + <object class="GtkScale" id="live_preview_progress"> + <property name="can_focus">True</property> + <property name="adjustment">preview_progress_adj</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> + <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="live_progress_box"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">5</property> <child> - <object class="GtkButton" id="live_preview_play"> - <property name="height_request">30</property> + <object class="GtkProgressBar" id="live_encode_progress"> + <property name="height_request">20</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property> - <property name="relief">none</property> - <signal name="clicked" handler="live_preview_start_cb" swapped="no"/> - <child> - <object class="GtkImage" id="live_preview_play_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-media-play</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> <property name="expand">False</property> @@ -8238,111 +8266,55 @@ Setting this to 0 means there is no maximum height.</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkScale" id="live_preview_progress"> - <property name="can_focus">True</property> - <property name="adjustment">preview_progress_adj</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> - <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="live_progress_box"> - <property name="orientation">vertical</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkProgressBar" id="live_encode_progress"> - <property name="height_request">20</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox26"> + <property name="orientation">horizontal</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">10</property> <child> - <object class="GtkBox" id="hbox26"> + <object class="GtkBox" id="live_preview_duration_box"> <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> + <property name="spacing">2</property> <child> - <object class="GtkBox" id="live_preview_duration_box"> - <property name="orientation">horizontal</property> + <object class="GtkLabel" id="label37"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkLabel" id="label37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Duration:</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="live_duration"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="adjustment">adjustment21</property> - <property name="numeric">True</property> - <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes"><b>Duration:</b></property> + <property name="use_markup">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="preview_show_crop"> - <property name="label" translatable="yes">Show Crop</property> + <object class="GtkSpinButton" id="live_duration"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property> - <property name="halign">start</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/> + <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="adjustment">adjustment21</property> + <property name="numeric">True</property> + <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -8350,22 +8322,39 @@ Setting this to 0 means there is no maximum height.</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkToggleButton" id="preview_fullscreen"> - <property name="label" translatable="yes">Fullscreen</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property> - <property name="relief">none</property> - <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="preview_show_crop"> + <property name="label" translatable="yes">Show Crop</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property> + <property name="halign">start</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="preview_reset"> + <property name="label" translatable="yes">Source Resolution</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Reset preview window to the source video's resolution</property> + <property name="relief">none</property> + <signal name="clicked" handler="preview_reset_clicked_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -8374,6 +8363,11 @@ Setting this to 0 means there is no maximum height.</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/gtk/src/ghb-3.14.ui b/gtk/src/ghb-3.14.ui index d7706c11a..f52c93277 100644 --- a/gtk/src/ghb-3.14.ui +++ b/gtk/src/ghb-3.14.ui @@ -8150,12 +8150,11 @@ Setting this to 0 means there is no maximum height.</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK</property> <property name="title" translatable="yes">Preview</property> - <property name="resizable">False</property> + <property name="resizable">True</property> <property name="window_position">center</property> - <property name="type_hint">utility</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="transient_for">hb_window</property> + <property name="type_hint">normal</property> + <property name="icon-name">hb-icon</property> + <signal name="window-state-event" handler="preview_state_cb" swapped="no"/> <signal name="configure-event" handler="preview_configure_cb" swapped="no"/> <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/> <child> @@ -8163,50 +8162,76 @@ Setting this to 0 means there is no maximum height.</property> <property name="visible">True</property> <property name="app_paintable">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> + <property name="hexpand-set">True</property> + <property name="vexpand-set">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="halign">fill</property> + <property name="valign">fill</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/> <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/> + <signal name="size-allocate" handler="preview_resize_cb" swapped="no"/> <signal name="draw" handler="preview_draw_cb" swapped="no"/> <child> - <object class="GtkBox" id="preview_hud_box"> - <property name="orientation">vertical</property> - <property name="visible">True</property> + <object class="GtkEventBox" id="preview_hud"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">end</property> + <property name="margin-bottom">30</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> + <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/> + <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/> <child> - <object class="GtkEventBox" id="preview_hud"> - <property name="visible">False</property> + <object class="GtkBox" id="vbox35"> + <property name="orientation">vertical</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hexpand-set">True</property> - <property name="vexpand-set">True</property> - <property name="halign">center</property> - <property name="valign">end</property> - <property name="margin-bottom">30</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> - <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/> - <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkBox" id="vbox35"> - <property name="orientation">vertical</property> + <object class="GtkScale" id="preview_frame"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Select preview frames.</property> + <property name="adjustment">adjustment19</property> + <property name="digits">0</property> + <property name="value_pos">bottom</property> + <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="live_preview_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin-top">5</property> - <property name="margin-bottom">5</property> - <property name="margin-start">10</property> - <property name="margin-end">10</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">5</property> <child> - <object class="GtkScale" id="preview_frame"> - <property name="width_request">400</property> + <object class="GtkButton" id="live_preview_play"> + <property name="height_request">30</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Select preview frames.</property> - <property name="adjustment">adjustment19</property> - <property name="digits">0</property> - <property name="value_pos">bottom</property> - <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property> + <property name="relief">none</property> + <signal name="clicked" handler="live_preview_start_cb" swapped="no"/> + <child> + <object class="GtkImage" id="live_preview_play_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-media-play</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -8215,27 +8240,30 @@ Setting this to 0 means there is no maximum height.</property> </packing> </child> <child> - <object class="GtkBox" id="live_preview_box"> - <property name="orientation">horizontal</property> + <object class="GtkScale" id="live_preview_progress"> + <property name="can_focus">True</property> + <property name="adjustment">preview_progress_adj</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> + <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="live_progress_box"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">5</property> <child> - <object class="GtkButton" id="live_preview_play"> - <property name="height_request">30</property> + <object class="GtkProgressBar" id="live_encode_progress"> + <property name="height_request">20</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property> - <property name="relief">none</property> - <signal name="clicked" handler="live_preview_start_cb" swapped="no"/> - <child> - <object class="GtkImage" id="live_preview_play_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-media-play</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> <property name="expand">False</property> @@ -8243,111 +8271,55 @@ Setting this to 0 means there is no maximum height.</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkScale" id="live_preview_progress"> - <property name="can_focus">True</property> - <property name="adjustment">preview_progress_adj</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> - <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="live_progress_box"> - <property name="orientation">vertical</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkProgressBar" id="live_encode_progress"> - <property name="height_request">20</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox26"> + <property name="orientation">horizontal</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">10</property> <child> - <object class="GtkBox" id="hbox26"> + <object class="GtkBox" id="live_preview_duration_box"> <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> + <property name="spacing">2</property> <child> - <object class="GtkBox" id="live_preview_duration_box"> - <property name="orientation">horizontal</property> + <object class="GtkLabel" id="label37"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkLabel" id="label37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Duration:</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="live_duration"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="adjustment">adjustment21</property> - <property name="numeric">True</property> - <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes"><b>Duration:</b></property> + <property name="use_markup">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="preview_show_crop"> - <property name="label" translatable="yes">Show Crop</property> + <object class="GtkSpinButton" id="live_duration"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property> - <property name="halign">start</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/> + <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="adjustment">adjustment21</property> + <property name="numeric">True</property> + <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -8355,22 +8327,39 @@ Setting this to 0 means there is no maximum height.</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkToggleButton" id="preview_fullscreen"> - <property name="label" translatable="yes">Fullscreen</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property> - <property name="relief">none</property> - <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="preview_show_crop"> + <property name="label" translatable="yes">Show Crop</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property> + <property name="halign">start</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="preview_reset"> + <property name="label" translatable="yes">Source Resolution</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Reset preview window to the source video's resolution</property> + <property name="relief">none</property> + <signal name="clicked" handler="preview_reset_clicked_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -8379,6 +8368,11 @@ Setting this to 0 means there is no maximum height.</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index a80119c2a..a6b03f2f9 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -8179,12 +8179,11 @@ Setting this to 0 means there is no maximum height.</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK</property> <property name="title" translatable="yes">Preview</property> - <property name="resizable">False</property> + <property name="resizable">True</property> <property name="window_position">center</property> - <property name="type_hint">utility</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="transient_for">hb_window</property> + <property name="type_hint">normal</property> + <property name="icon-name">hb-icon</property> + <signal name="window-state-event" handler="preview_state_cb" swapped="no"/> <signal name="configure-event" handler="preview_configure_cb" swapped="no"/> <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/> <child> @@ -8192,50 +8191,76 @@ Setting this to 0 means there is no maximum height.</property> <property name="visible">True</property> <property name="app_paintable">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> + <property name="hexpand-set">True</property> + <property name="vexpand-set">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="halign">fill</property> + <property name="valign">fill</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/> <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/> + <signal name="size-allocate" handler="preview_resize_cb" swapped="no"/> <signal name="draw" handler="preview_draw_cb" swapped="no"/> <child> - <object class="GtkBox" id="preview_hud_box"> - <property name="orientation">vertical</property> - <property name="visible">True</property> + <object class="GtkEventBox" id="preview_hud"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">end</property> + <property name="margin-bottom">30</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> + <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/> + <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/> <child> - <object class="GtkEventBox" id="preview_hud"> - <property name="visible">False</property> + <object class="GtkBox" id="vbox35"> + <property name="orientation">vertical</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hexpand-set">True</property> - <property name="vexpand-set">True</property> - <property name="halign">center</property> - <property name="valign">end</property> - <property name="margin-bottom">30</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> - <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/> - <signal name="leave-notify-event" handler="hud_leave_cb" swapped="no"/> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkBox" id="vbox35"> - <property name="orientation">vertical</property> + <object class="GtkScale" id="preview_frame"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Select preview frames.</property> + <property name="adjustment">adjustment19</property> + <property name="digits">0</property> + <property name="value_pos">bottom</property> + <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="live_preview_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin-top">5</property> - <property name="margin-bottom">5</property> - <property name="margin-left">10</property> - <property name="margin-right">10</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">5</property> <child> - <object class="GtkScale" id="preview_frame"> - <property name="width_request">400</property> + <object class="GtkButton" id="live_preview_play"> + <property name="height_request">30</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Select preview frames.</property> - <property name="adjustment">adjustment19</property> - <property name="digits">0</property> - <property name="value_pos">bottom</property> - <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property> + <property name="relief">none</property> + <signal name="clicked" handler="live_preview_start_cb" swapped="no"/> + <child> + <object class="GtkImage" id="live_preview_play_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-media-play</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -8244,27 +8269,30 @@ Setting this to 0 means there is no maximum height.</property> </packing> </child> <child> - <object class="GtkBox" id="live_preview_box"> - <property name="orientation">horizontal</property> + <object class="GtkScale" id="live_preview_progress"> + <property name="can_focus">True</property> + <property name="adjustment">preview_progress_adj</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> + <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="live_progress_box"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">5</property> <child> - <object class="GtkButton" id="live_preview_play"> - <property name="height_request">30</property> + <object class="GtkProgressBar" id="live_encode_progress"> + <property name="height_request">20</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property> - <property name="relief">none</property> - <signal name="clicked" handler="live_preview_start_cb" swapped="no"/> - <child> - <object class="GtkImage" id="live_preview_play_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-media-play</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> <property name="expand">False</property> @@ -8272,111 +8300,55 @@ Setting this to 0 means there is no maximum height.</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkScale" id="live_preview_progress"> - <property name="can_focus">True</property> - <property name="adjustment">preview_progress_adj</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> - <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="live_progress_box"> - <property name="orientation">vertical</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkProgressBar" id="live_encode_progress"> - <property name="height_request">20</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox26"> + <property name="orientation">horizontal</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">10</property> <child> - <object class="GtkBox" id="hbox26"> + <object class="GtkBox" id="live_preview_duration_box"> <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> + <property name="spacing">2</property> <child> - <object class="GtkBox" id="live_preview_duration_box"> - <property name="orientation">horizontal</property> + <object class="GtkLabel" id="label37"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkLabel" id="label37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Duration:</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="live_duration"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="adjustment">adjustment21</property> - <property name="numeric">True</property> - <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes"><b>Duration:</b></property> + <property name="use_markup">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="preview_show_crop"> - <property name="label" translatable="yes">Show Crop</property> + <object class="GtkSpinButton" id="live_duration"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property> - <property name="halign">start</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/> + <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="adjustment">adjustment21</property> + <property name="numeric">True</property> + <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -8384,22 +8356,39 @@ Setting this to 0 means there is no maximum height.</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkToggleButton" id="preview_fullscreen"> - <property name="label" translatable="yes">Fullscreen</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property> - <property name="relief">none</property> - <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="preview_show_crop"> + <property name="label" translatable="yes">Show Crop</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property> + <property name="halign">start</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="preview_reset"> + <property name="label" translatable="yes">Source Resolution</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Reset preview window to the source video's resolution</property> + <property name="relief">none</property> + <signal name="clicked" handler="preview_reset_clicked_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -8408,6 +8397,11 @@ Setting this to 0 means there is no maximum height.</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 88a13debc..d7437a3bd 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -4332,11 +4332,6 @@ ghb_get_preview_image( { gint factor = 80; - if (ghb_dict_get_bool(ud->prefs, "preview_fullscreen")) - { - factor = 100; - } - GdkScreen *ss; gint s_w, s_h; diff --git a/gtk/src/internal_defaults.json b/gtk/src/internal_defaults.json index 6bf22e128..f0ba22bad 100644 --- a/gtk/src/internal_defaults.json +++ b/gtk/src/internal_defaults.json @@ -88,7 +88,6 @@ "reduce_hd_preview": true, "MinTitleDuration": 10, "preview_count": 10, - "preview_fullscreen": false, "preview_show_crop": false, "preview_x": -1, "preview_y": -1, diff --git a/gtk/src/main.c b/gtk/src/main.c index 4f2a80579..6a2ea0e46 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -751,9 +751,10 @@ GtkEntry { \n\ background-color: alpha(@gray18, 0.8); \n\ color: @white; \n\ } \n\ + \n\ #live_preview_play, \n\ #live_duration, \n\ -#preview_fullscreen \n\ +#preview_reset \n\ { \n\ background: @black; \n\ background-color: @gray18; \n\ @@ -776,21 +777,21 @@ GtkEntry { \n\ color: @white; \n\ } \n\ \n\ -#preview_fullscreen:prelight \n\ +#preview_reset:prelight \n\ { \n\ background: @black; \n\ background-color: @gray32; \n\ color: @white; \n\ } \n\ \n\ -#preview_fullscreen:active \n\ +#preview_reset:active \n\ { \n\ background: @black; \n\ background-color: @gray32; \n\ color: @white; \n\ } \n\ \n\ -#preview_fullscreen:active \n\ +#preview_reset:active \n\ { \n\ background: @black; \n\ background-color: @gray32; \n\ @@ -937,7 +938,7 @@ main(int argc, char *argv[]) gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_encode_progress"), "live_encode_progress"); gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_duration"), "live_duration"); gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_show_crop"), "preview_show_crop"); - gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_fullscreen"), "preview_fullscreen"); + gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_reset"), "preview_reset"); gtk_widget_set_name(GHB_WIDGET(ud->builder, "activity_view"), "activity_view"); // Redirect stderr to the activity window @@ -1197,6 +1198,7 @@ main(int argc, char *argv[]) g_list_free(stack_switcher_children); gtk_window_resize(GTK_WINDOW(ghb_window), window_width, window_height); + gtk_widget_show(ghb_window); // Everything should be go-to-go. Lets rock! diff --git a/gtk/src/preview.c b/gtk/src/preview.c index 361a5e09d..a32ca8570 100644 --- a/gtk/src/preview.c +++ b/gtk/src/preview.c @@ -59,8 +59,11 @@ struct preview_s gboolean progress_lock; gint width; gint height; + gint render_width; + gint render_height; GtkWidget * view; GdkPixbuf * pix; + GdkPixbuf * scaled_pix; gint button_width; gint button_height; gint frame; @@ -111,15 +114,30 @@ ghb_par_scale(signal_user_data_t *ud, gint *width, gint *height, gint par_n, gin void preview_set_size(signal_user_data_t *ud, int width, int height) { - GtkWidget *widget; + ud->preview->width = width; + ud->preview->height = height; +} + +void +preview_set_render_size(signal_user_data_t *ud, int width, int height) +{ + GtkWidget * widget; + GtkWindow * window; + GdkGeometry geo; widget = GHB_WIDGET (ud->builder, "preview_image"); gtk_widget_set_size_request(widget, width, height); - widget = GHB_WIDGET (ud->builder, "preview_hud_box"); - gtk_widget_set_size_request(widget, width, height); - - ud->preview->width = width; - ud->preview->height = height; + window = GTK_WINDOW(GHB_WIDGET(ud->builder, "preview_window")); + gtk_window_unmaximize(window); + gtk_window_resize(window, width, height); + geo.min_aspect = (double)width / height; + geo.max_aspect = (double)width / height; + geo.width_inc = geo.height_inc = 2; + gtk_window_set_geometry_hints(window, NULL, &geo, + GDK_HINT_ASPECT|GDK_HINT_RESIZE_INC); + + ud->preview->render_width = width; + ud->preview->render_height = height; } void @@ -306,6 +324,7 @@ caps_set(GstCaps *caps, signal_user_data_t *ud) else height = gst_util_uint64_scale_int(width, den, num); + preview_set_size(ud, width, height); if (ghb_dict_get_bool(ud->prefs, "reduce_hd_preview")) { GdkScreen *ss; @@ -326,11 +345,6 @@ caps_set(GstCaps *caps, signal_user_data_t *ud) width = gst_util_uint64_scale_int(height, num, den); } } - - if (width != ud->preview->width || height != ud->preview->height) - { - preview_set_size(ud, width, height); - } } } @@ -486,29 +500,51 @@ live_preview_cb(GstBus *bus, GstMessage *msg, gpointer data) val = gst_structure_get_value(gstStruct, "pixbuf"); if (val != NULL) { - GdkPixbuf *pixbuf; + GdkPixbuf * pix; GtkWidget *widget; int width, height; - pixbuf = GDK_PIXBUF(g_value_dup_object(val)); - width = gdk_pixbuf_get_width(pixbuf); - height = gdk_pixbuf_get_height(pixbuf); + if (ud->preview->pix != NULL) + g_object_unref(ud->preview->pix); + if (ud->preview->scaled_pix != NULL) + g_object_unref(ud->preview->scaled_pix); + pix = GDK_PIXBUF(g_value_dup_object(val)); + width = gdk_pixbuf_get_width(pix); + height = gdk_pixbuf_get_height(pix); if (width != ud->preview->width || - height != ud->preview->height) + height != ud->preview->height || + width != ud->preview->render_width || + height != ud->preview->render_height) { - GdkPixbuf *tmp; - tmp = gdk_pixbuf_scale_simple(pixbuf, - ud->preview->width, - ud->preview->height, - GDK_INTERP_BILINEAR); - g_object_unref(pixbuf); - pixbuf = tmp; + double xscale, yscale; + + xscale = (double)ud->preview->render_width / + ud->preview->width; + yscale = (double)ud->preview->render_height / + ud->preview->height; + if (xscale <= yscale) + { + width = ud->preview->render_width; + height = ud->preview->height * xscale; + } + else + { + width = ud->preview->width * yscale; + height = ud->preview->render_height; + } + + ud->preview->scaled_pix = + gdk_pixbuf_scale_simple(pix, + width, height, + GDK_INTERP_BILINEAR); + g_object_ref(pix); } - if (ud->preview->pix != NULL) + else { - g_object_unref(ud->preview->pix); + ud->preview->scaled_pix = pix; } - ud->preview->pix = pixbuf; + ud->preview->pix = ud->preview->scaled_pix; + g_object_ref(ud->preview->pix); widget = GHB_WIDGET (ud->builder, "preview_image"); gtk_widget_queue_draw(widget); } @@ -764,17 +800,119 @@ live_preview_seek_cb(GtkWidget *widget, signal_user_data_t *ud) #endif } -static void _draw_pixbuf(cairo_t *cr, GdkPixbuf *pixbuf) +static void _draw_pixbuf(signal_user_data_t * ud, cairo_t *cr, GdkPixbuf *pix) { - gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0); + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_rectangle(cr, 0, 0, ud->preview->render_width, + ud->preview->render_height); + cairo_fill(cr); + cairo_rectangle(cr, 0, 0, ud->preview->render_width, + ud->preview->render_height); + cairo_clip(cr); + gdk_cairo_set_source_pixbuf(cr, pix, 0, 0); cairo_paint(cr); } +static void set_mini_preview_image(signal_user_data_t *ud, GdkPixbuf * pix) +{ + int preview_width, preview_height, width, height; + GdkPixbuf * scaled_preview; + + if (pix == NULL) + { + return; + } + + preview_width = gdk_pixbuf_get_width(pix); + preview_height = gdk_pixbuf_get_height(pix); + + // Scale and display the mini-preview + height = MIN(ud->preview->button_height, 200); + width = preview_width * height / preview_height; + if (width > 400) + { + width = 400; + height = preview_height * width / preview_width; + } + if ((height >= 16) && (width >= 16)) + { + scaled_preview = gdk_pixbuf_scale_simple(pix, width, height, + GDK_INTERP_NEAREST); + if (scaled_preview != NULL) + { + GtkWidget * widget; + + widget = GHB_WIDGET (ud->builder, "preview_button_image"); + gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview); + g_object_unref(scaled_preview); + } + } +} + +GdkPixbuf * do_preview_scaling(signal_user_data_t *ud, GdkPixbuf *pix) +{ + int preview_width, preview_height, width, height; + GdkPixbuf * scaled_preview; + + if (pix == NULL) + { + return NULL; + } + + preview_width = gdk_pixbuf_get_width(pix); + preview_height = gdk_pixbuf_get_height(pix); + + if (ud->preview->render_width < 0 || ud->preview->render_height < 0) + { + // resize preview window to fit preview + preview_set_render_size(ud, preview_width, preview_height); + g_object_ref(pix); + return pix; + } + + // Scale if necessary + if (preview_width != ud->preview->render_width || + preview_height != ud->preview->render_height) + { + double xscale, yscale; + + xscale = (double)ud->preview->render_width / preview_width; + yscale = (double)ud->preview->render_height / preview_height; + if (xscale <= yscale) + { + width = ud->preview->render_width; + height = preview_height * xscale; + } + else + { + width = preview_width * yscale; + height = ud->preview->render_height; + } + // Allow some slop in aspect ratio so that we fill the window + int delta = ud->preview->render_width - width; + if (delta > 0 && delta <= 6) + width = ud->preview->render_width; + + delta = ud->preview->render_height - height; + if (delta > 0 && delta <= 6) + height = ud->preview->render_height; + + scaled_preview = gdk_pixbuf_scale_simple(pix, width, height, + GDK_INTERP_BILINEAR); + return scaled_preview; + } + else + { + g_object_ref(pix); + } + return pix; +} + void -ghb_set_preview_image(signal_user_data_t *ud) +init_preview_image(signal_user_data_t *ud) { GtkWidget *widget; - gint preview_width, preview_height, target_height, width, height; + gint width, height; g_debug("set_preview_button_image ()"); gint title_id, titleindex; @@ -806,47 +944,75 @@ ghb_set_preview_image(signal_user_data_t *ud) } if (ud->preview->pix != NULL) g_object_unref(ud->preview->pix); + if (ud->preview->scaled_pix != NULL) + g_object_unref(ud->preview->scaled_pix); - ud->preview->pix = - ghb_get_preview_image(title, ud->preview->frame, ud, &width, &height); - if (ud->preview->pix == NULL) return; - preview_width = gdk_pixbuf_get_width(ud->preview->pix); - preview_height = gdk_pixbuf_get_height(ud->preview->pix); - widget = GHB_WIDGET (ud->builder, "preview_image"); - if (preview_width != ud->preview->width || - preview_height != ud->preview->height) - { - preview_set_size(ud, preview_width, preview_height); - } - gtk_widget_queue_draw(widget); + ud->preview->pix = ghb_get_preview_image(title, ud->preview->frame, + ud, &width, &height); + if (ud->preview->pix == NULL) + return; + + int pix_width, pix_height; + pix_width = gdk_pixbuf_get_width(ud->preview->pix); + pix_height = gdk_pixbuf_get_height(ud->preview->pix); + preview_set_size(ud, pix_width, pix_height); gchar *text = g_strdup_printf("%d x %d", width, height); - widget = GHB_WIDGET (ud->builder, "preview_dims"); + widget = GHB_WIDGET(ud->builder, "preview_dims"); gtk_label_set_text(GTK_LABEL(widget), text); g_free(text); +} - g_debug("preview %d x %d", preview_width, preview_height); - target_height = MIN(ud->preview->button_height, 200); - height = target_height; - width = preview_width * height / preview_height; - if (width > 400) - { - width = 400; - height = preview_height * width / preview_width; - } +void +ghb_set_preview_image(signal_user_data_t *ud) +{ + init_preview_image(ud); - if ((height >= 16) && (width >= 16)) - { - GdkPixbuf *scaled_preview; - scaled_preview = gdk_pixbuf_scale_simple (ud->preview->pix, width, - height, GDK_INTERP_NEAREST); - if (scaled_preview != NULL) - { - widget = GHB_WIDGET (ud->builder, "preview_button_image"); - gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview); - g_object_unref(scaled_preview); - } - } + // Scale and display the mini-preview + set_mini_preview_image(ud, ud->preview->pix); + + // Scale the full size preview + ud->preview->scaled_pix = do_preview_scaling(ud, ud->preview->pix); + + // Display full size preview + GtkWidget *widget = GHB_WIDGET(ud->builder, "preview_image"); + gtk_widget_queue_draw(widget); +} + +void +ghb_rescale_preview_image(signal_user_data_t *ud) +{ + double scale = (double)ud->preview->render_width / ud->preview->width; + init_preview_image(ud); + preview_set_render_size(ud, ud->preview->width * scale, + ud->preview->height * scale); + + // Scale and display the mini-preview + set_mini_preview_image(ud, ud->preview->pix); + + // Scale the full size preview + ud->preview->scaled_pix = do_preview_scaling(ud, ud->preview->pix); + + // Display full size preview + GtkWidget *widget = GHB_WIDGET(ud->builder, "preview_image"); + gtk_widget_queue_draw(widget); +} + +void +ghb_reset_preview_image(signal_user_data_t *ud) +{ + init_preview_image(ud); + preview_set_render_size(ud, ud->preview->width, ud->preview->height); + + // Scale and display the mini-preview + set_mini_preview_image(ud, ud->preview->pix); + + // Scale the full size preview + ud->preview->scaled_pix = do_preview_scaling(ud, ud->preview->pix); + + // Display full size preview + GtkWidget *widget = GHB_WIDGET(ud->builder, "preview_image"); + gtk_widget_queue_draw(widget); } G_MODULE_EXPORT gboolean @@ -855,9 +1021,9 @@ preview_draw_cb( cairo_t *cr, signal_user_data_t *ud) { - if (ud->preview->pix != NULL) + if (ud->preview->scaled_pix != NULL) { - _draw_pixbuf(cr, ud->preview->pix); + _draw_pixbuf(ud, cr, ud->preview->scaled_pix); } return FALSE; } @@ -877,7 +1043,7 @@ preview_button_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, si ud->preview->button_height); ud->preview->button_width = allocation->width; ud->preview->button_height = allocation->height; - ghb_set_preview_image(ud); + set_mini_preview_image(ud, ud->preview->pix); } void @@ -896,7 +1062,6 @@ ghb_preview_set_visible(signal_user_data_t *ud) title = ghb_lookup_title(title_id, &titleindex); active &= title != NULL; widget = GHB_WIDGET(ud->builder, "preview_window"); - gtk_widget_set_visible(widget, active); if (active) { gint x, y; @@ -904,7 +1069,9 @@ ghb_preview_set_visible(signal_user_data_t *ud) y = ghb_dict_get_int(ud->prefs, "preview_y"); if (x >= 0 && y >= 0) gtk_window_move(GTK_WINDOW(widget), x, y); + gtk_window_deiconify(GTK_WINDOW(widget)); } + gtk_widget_set_visible(widget, active); } static void @@ -950,46 +1117,24 @@ preview_menu_toggled_cb(GtkWidget *xwidget, signal_user_data_t *ud) gtk_toggle_tool_button_set_active(button, active); } -static gboolean -go_full(signal_user_data_t *ud) -{ - GtkWindow *window; - window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window")); - gtk_window_fullscreen(window); - ghb_set_preview_image(ud); - return FALSE; -} - G_MODULE_EXPORT void -fullscreen_clicked_cb(GtkWidget *toggle, signal_user_data_t *ud) +preview_reset_clicked_cb(GtkWidget *toggle, signal_user_data_t *ud) { - gboolean active; - GtkWindow *window; + g_debug("preview_reset_clicked_cb()"); + preview_set_render_size(ud, ud->preview->width, ud->preview->height); - g_debug("fullscreen_clicked_cb()"); - ghb_widget_to_setting (ud->prefs, toggle); - ghb_check_dependency(ud, toggle, NULL); - const gchar *name = ghb_get_setting_key(toggle); - ghb_pref_save(ud->prefs, name); + // On windows, preview_resize_cb does not get called when the size + // is reset above. So assume it got reset and disable the + // "Source Resolution" button. + GtkWidget * widget = GHB_WIDGET(ud->builder, "preview_reset"); + gtk_widget_hide(widget); - window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window")); - active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)); - if (active) - { - gtk_window_set_resizable(window, TRUE); - gtk_button_set_label(GTK_BUTTON(toggle), _("Windowed")); - // Changing resizable property doesn't take effect immediately - // need to delay fullscreen till after this callback returns - // to mainloop - g_idle_add((GSourceFunc)go_full, ud); - } - else - { - gtk_window_unfullscreen(window); - gtk_window_set_resizable(window, FALSE); - gtk_button_set_label(GTK_BUTTON(toggle), _("Fullscreen")); - ghb_set_preview_image(ud); - } + if (ud->preview->scaled_pix != NULL) + g_object_unref(ud->preview->scaled_pix); + ud->preview->scaled_pix = do_preview_scaling(ud, ud->preview->pix); + + widget = GHB_WIDGET(ud->builder, "preview_image"); + gtk_widget_queue_draw(widget); } G_MODULE_EXPORT void @@ -1147,3 +1292,73 @@ preview_configure_cb( return FALSE; } +G_MODULE_EXPORT gboolean +preview_state_cb( + GtkWidget *widget, + GdkEvent *event, + signal_user_data_t *ud) +{ + GdkEventWindowState * wse = (GdkEventWindowState*)event; + if (wse->type == GDK_WINDOW_STATE) + { + // Look for transition to iconified state. + // Toggle "Show Preview" button when iconified. + // I only do this because there seems to be no + // way to reliably disable the iconfy button without + // also disabling the maximize button. + if (wse->changed_mask & wse->new_window_state & + GDK_WINDOW_STATE_ICONIFIED) + { + live_preview_stop(ud); + GtkWidget *widget = GHB_WIDGET(ud->builder, "show_preview"); + gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE); + } + } + return FALSE; +} + +G_MODULE_EXPORT void +preview_resize_cb( + GtkWidget *widget, + GdkRectangle *rect, + signal_user_data_t *ud) +{ + if (ud->preview->render_width != rect->width || + ud->preview->render_height != rect->height) + { + ud->preview->render_width = rect->width; + ud->preview->render_height = rect->height; + if (ud->preview->scaled_pix != NULL) + g_object_unref(ud->preview->scaled_pix); + ud->preview->scaled_pix = do_preview_scaling(ud, ud->preview->pix); + + GtkWidget *widget = GHB_WIDGET(ud->builder, "preview_image"); + gtk_widget_queue_draw(widget); + + if (ABS(ud->preview->render_width - ud->preview->width) <= 2 || + ABS(ud->preview->render_height - ud->preview->height) <= 2) + { + GtkWidget * widget = GHB_WIDGET(ud->builder, "preview_reset"); + gtk_widget_hide(widget); + } + else + { + GtkWidget * widget = GHB_WIDGET(ud->builder, "preview_reset"); + gtk_widget_show(widget); + } + } +} + +G_MODULE_EXPORT void +show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud) +{ + g_debug("show_crop_changed_cb ()"); + ghb_widget_to_setting(ud->prefs, widget); + ghb_check_dependency(ud, widget, NULL); + ghb_live_reset(ud); + if (gtk_widget_is_sensitive(widget)) + ghb_set_scale(ud, GHB_PIC_KEEP_PAR); + ghb_pref_save(ud->prefs, "preview_show_crop"); + ghb_rescale_preview_image(ud); +} + diff --git a/gtk/src/preview.h b/gtk/src/preview.h index 11633334b..7ca3adaf8 100644 --- a/gtk/src/preview.h +++ b/gtk/src/preview.h @@ -27,6 +27,8 @@ #define GHB_PREVIEW_MAX 60 void ghb_preview_init(signal_user_data_t *ud); +void ghb_rescale_preview_image(signal_user_data_t *ud); +void ghb_reset_preview_image(signal_user_data_t *ud); void ghb_set_preview_image(signal_user_data_t *ud); void ghb_live_preview_progress(signal_user_data_t *ud); void ghb_live_encode_done(signal_user_data_t *ud, gboolean success); |