g_free(text);
g_debug("preview %d x %d", preview_width, preview_height);
- target_height = MIN(ud->preview->button_height, 128);
+ 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;
+ }
if ((height >= 16) && (width >= 16))
{
}
}
-G_MODULE_EXPORT void
-preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+void
+ghb_preview_set_visible(signal_user_data_t *ud)
{
gint titleindex;
+ GtkWidget *widget;
+ gboolean settings_active;
- g_debug("preview_button_clicked_cb()");
+ settings_active = ghb_settings_get_boolean(ud->settings, "show_picture");
+ widget = GHB_WIDGET (ud->builder, "preview_window");
titleindex = ghb_settings_combo_int(ud->settings, "title");
- if (titleindex >= 0)
+ if (settings_active && titleindex >= 0)
{
gint x, y;
- GtkWidget *widget = GHB_WIDGET (ud->builder, "preview_window");
x = ghb_settings_get_int(ud->settings, "preview_x");
y = ghb_settings_get_int(ud->settings, "preview_y");
if (x >= 0 && y >= 0)
gtk_window_move(GTK_WINDOW(widget), x, y);
- set_visible(widget, gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(xwidget)));
+ set_visible(widget,
+ ghb_settings_get_boolean(ud->settings, "show_preview"));
}
+ else
+ {
+ set_visible(widget, FALSE);
+ }
+}
+
+G_MODULE_EXPORT void
+preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+ g_debug("preview_button_clicked_cb()");
ghb_widget_to_setting (ud->settings, xwidget);
- ghb_check_dependency(ud, xwidget);
+ ghb_preview_set_visible(ud);
+ ghb_check_dependency(ud, xwidget, NULL);
const gchar *name = gtk_widget_get_name(xwidget);
ghb_pref_save(ud->settings, name);
}
picture_settings_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GtkWidget *widget;
- gboolean active;
+ gboolean active, hide_settings;
gint x, y;
g_debug("picture_settings_clicked_cb()");
+ ghb_widget_to_setting (ud->settings, xwidget);
+
+ hide_settings = ghb_settings_get_boolean(ud->settings, "hide_settings");
+
+ active = ghb_settings_get_boolean(ud->settings, "show_picture");
widget = GHB_WIDGET (ud->builder, "settings_window");
- active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(xwidget));
x = ghb_settings_get_int(ud->settings, "settings_x");
y = ghb_settings_get_int(ud->settings, "settings_y");
if (x >= 0 && y >= 0)
gtk_window_move(GTK_WINDOW(widget), x, y);
- set_visible(widget, active);
- if (ghb_settings_get_boolean(ud->settings, "show_preview"))
- {
- widget = GHB_WIDGET (ud->builder, "preview_window");
- x = ghb_settings_get_int(ud->settings, "preview_x");
- y = ghb_settings_get_int(ud->settings, "preview_y");
- if (x >= 0 && y >= 0)
- gtk_window_move(GTK_WINDOW(widget), x, y);
- set_visible(widget, active);
- // The window may be hidden behind the main window, raise it
- if (active)
- gtk_window_present(GTK_WINDOW(widget));
- }
+ set_visible(widget, active && !hide_settings);
+ ghb_preview_set_visible(ud);
}
G_MODULE_EXPORT void
g_debug("fullscreen_clicked_cb()");
ghb_widget_to_setting (ud->settings, toggle);
- ghb_check_dependency(ud, toggle);
+ ghb_check_dependency(ud, toggle, NULL);
const gchar *name = gtk_widget_get_name(toggle);
ghb_pref_save(ud->settings, name);
{
GtkWidget *toggle;
gboolean active;
- gint signal_id;
- gint handler_id = 0;
+ GtkWidget *window;
g_debug("picture_settings_alt2_clicked_cb()");
- toggle = GHB_WIDGET (ud->builder, "show_picture");
- active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toggle));
- if (active)
+ ghb_widget_to_setting (ud->settings, xwidget);
+ active = ghb_settings_get_boolean(ud->settings, "hide_settings");
+
+ toggle = GHB_WIDGET (ud->builder, "hide_settings");
+ window = GHB_WIDGET(ud->builder, "settings_window");
+ if (!active)
{
- // I don't want deleting the settings window to also remove the
- // preview window, but changing the toggle will do this, so temporarily
- // ignore the toggled signal
- signal_id = g_signal_lookup("toggled", GTK_TYPE_TOGGLE_TOOL_BUTTON);
- if (signal_id > 0)
- {
- // Valid signal id found. This should always succeed.
- handler_id = g_signal_handler_find((gpointer)toggle,
- G_SIGNAL_MATCH_ID,
- signal_id, 0, 0, 0, 0);
- if (handler_id > 0)
- {
- // This should also always succeed
- g_signal_handler_block ((gpointer)toggle, handler_id);
- }
- }
+ gtk_button_set_label(GTK_BUTTON(toggle), "Hide Settings");
+ gtk_widget_set_tooltip_text(toggle,
+ "Hide the picture settings window while "
+ "leaving the preview visible.");
+ gtk_widget_show(window);
}
-
- GtkWidget *widget = GHB_WIDGET (ud->builder, "settings_window");
- gint x, y;
-
- x = ghb_settings_get_int(ud->settings, "settings_x");
- y = ghb_settings_get_int(ud->settings, "settings_y");
- if (x >= 0 && y >= 0)
- gtk_window_move(GTK_WINDOW(widget), x, y);
- set_visible(widget, !active);
- gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(toggle), !active);
-
- if (handler_id > 0)
+ else
{
- g_signal_handler_unblock ((gpointer)toggle, handler_id);
+ gtk_button_set_label(GTK_BUTTON(toggle), "Show Settings");
+ gtk_widget_set_tooltip_text(toggle, "Show picture settings.");
+ gtk_widget_hide(window);
}
}
signal_user_data_t *ud)
{
live_preview_stop(ud);
- gtk_widget_hide(widget);
+ widget = GHB_WIDGET (ud->builder, "show_picture");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
return TRUE;
}
GdkEvent *event,
signal_user_data_t *ud)
{
- gint signal_id;
- gint handler_id = 0;
-
- gtk_widget_hide(widget);
+ live_preview_stop(ud);
widget = GHB_WIDGET (ud->builder, "show_picture");
-
- // I don't want deleting the settings window to also remove the
- // preview window, but changing the toggle will do this, so temporarily
- // ignore the toggled signal
- signal_id = g_signal_lookup("toggled", GTK_TYPE_TOGGLE_TOOL_BUTTON);
- if (signal_id > 0)
- {
- // Valid signal id found. This should always succeed.
- handler_id = g_signal_handler_find((gpointer)widget, G_SIGNAL_MATCH_ID,
- signal_id, 0, 0, 0, 0);
- if (handler_id > 0)
- {
- // This should also always succeed
- g_signal_handler_block ((gpointer)widget, handler_id);
- }
- }
-
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
- if (handler_id > 0)
- {
- g_signal_handler_unblock ((gpointer)widget, handler_id);
- }
return TRUE;
}
g_debug("preview_duration_changed_cb ()");
ghb_live_reset(ud);
ghb_widget_to_setting (ud->settings, widget);
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
const gchar *name = gtk_widget_get_name(widget);
ghb_pref_save(ud->settings, name);
}
double w, h;
if (!width || !height)
- return NULL;
+ return NULL;
shape = (GdkDrawable *)gdk_pixmap_new (NULL, width, height, 1);
OSDN Git Service
