From e4a8a2d7fbb5280613de16197524715316522e5e Mon Sep 17 00:00:00 2001 From: jstebbins Date: Thu, 30 Sep 2010 23:39:06 +0000 Subject: LinGui: fix some text alignment issues on the picture summary tab git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3559 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/callbacks.c | 3 + gtk/src/ghb.ui | 932 +++++++++++++++++++++++++-------------------------- gtk/src/hb-backend.c | 1 + gtk/src/hb-backend.h | 1 + 4 files changed, 464 insertions(+), 473 deletions(-) diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index c29d4a8ac..2fb880f18 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -1365,6 +1365,9 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo) gtk_label_set_text (GTK_LABEL(widget), text); g_free(text); + //widget = GHB_WIDGET (ud->builder, "source_interlaced"); + //gtk_label_set_text (GTK_LABEL(widget), tinfo->interlaced ? "Yes" : "No"); + ghb_ui_update(ud, "scale_width", ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3])); // If anamorphic or keep_aspect, the hight will be automatically calculated diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index db2dadd31..bad34710f 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -1179,489 +1179,476 @@ 10 10 - - - vertical - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 14 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 2 - 12 - - - vertical - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Dimensions: - 15 - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- - 15 - - - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Aspect: - 15 - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- - - - 1 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Frame Rate: - 15 - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- - - - 1 - - - - - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Source Picture Parameters</b> - True - - - - - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 2 - 12 - 2 - - - vertical - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - - - True - 0 - Autocrop: - 15 - - - False - - - - - True - On - - - 1 - - - - - - - True - - - True - 0 - Crop: - 15 - - - False - - - - - True - -- - - - 1 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Crop Dimensions: - 15 - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- - - - 1 - - - - - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Cropping</b> - True - - - - - False - 2 - 1 - - - - - vertical - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 2 - 12 - 2 - - - vertical - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - - - True - 0 - Scale Dimensions: - 15 - - - False - - - - - True - -- - - - 1 - - - - - - - True - - - True - 0 - Optimal for Source: - 15 - - - False - - - - - True - On - - - 1 - - - - - 1 - - - - - True - - - True - 0 - Anamorphic: - 15 - - - False - - - - - True - On - - - 1 - - - - - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Scaling</b> - True - - - - - False - 2 - - - - - 2 - - - - + + + vertical + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 14 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 2 + True + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Dimensions: + + + 0 + 1 + 0 + 1 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + -- + + + 1 + 2 + 0 + 1 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Aspect: + + + 0 + 1 + 1 + 2 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + -- + + + 1 + 2 + 1 + 2 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Frame Rate: + + + 0 + 1 + 2 + 3 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + -- + + + 1 + 2 + 2 + 3 + GTK_EXPAND|GTK_FILL + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Source Picture Parameters</b> + True + + + + + False + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 2 + 12 + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 2 + True + + + True + 0 + Autocrop: + + + 0 + 1 + 0 + 1 + GTK_EXPAND|GTK_FILL + + + + + True + On + + + 1 + 2 + 0 + 1 + GTK_EXPAND|GTK_FILL + + + + + True + 0 + Crop: + + + 0 + 1 + 1 + 2 + GTK_EXPAND|GTK_FILL + + + + + True + -- + + + 1 + 2 + 1 + 2 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Crop Dimensions: + + + 0 + 1 + 2 + 3 + GTK_EXPAND|GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + -- + + + 1 + 2 + 2 + 3 + GTK_EXPAND|GTK_FILL + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Cropping</b> + True + + + + + False + 2 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 2 + 12 + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 2 + True + + + True + 0 + Scale Dimensions: + + + 0 + 1 + 0 + 1 + GTK_EXPAND|GTK_FILL + + + + + True + -- + + + 1 + 2 + 0 + 1 + GTK_EXPAND|GTK_FILL + + + + + True + 0 + Optimal for Source: + + + 0 + 1 + 1 + 2 + GTK_EXPAND|GTK_FILL + + + + + True + On + + + 1 + 2 + 1 + 2 + GTK_EXPAND|GTK_FILL + + + + + True + 0 + Anamorphic: + + + 0 + 1 + 2 + 3 + GTK_EXPAND|GTK_FILL + + + + + True + On + + + 1 + 2 + 2 + 3 + GTK_EXPAND|GTK_FILL + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Scaling</b> + True + + + + + False + 2 + + + + + True + True 0 - True 12 12 + + + vertical + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + 0 + none + + + True + 4 + 4 + 4 + + + 400 + 200 + True + hb-icon + 6 + + + + + + + + False + False + 1 + + + + + True + 0 + 0 + + + True + 4 + + + True + Presentation Dimensions: + right + + + False + 0 + + + + + 85 + True + 0.2 + 0 + -- + + + False + 1 + + - - - vertical - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - True - 0 - none - - - True - 4 - 4 - 4 - - - 400 - 200 - True - hb-icon - 6 - - - - - - - - False - False - 1 - - - - - - True - 0 - 0 - - - True - 4 - - - True - Presentation Dimensions: - right - - - False - 0 - - - - - 85 - True - 0.2 - 0 - -- - - - False - 1 - - - - - - - - - False - False - 2 - - - - - - + + + + + False + False + 2 + + + + False @@ -1669,13 +1656,12 @@ 1 - True - Picture + Summary False diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 3683c23e5..d23d3c746 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -3469,6 +3469,7 @@ ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex) tinfo->num_chapters = hb_list_count(title->list_chapter); tinfo->rate_base = title->rate_base; tinfo->rate = title->rate; + tinfo->interlaced = title->detected_interlacing; hb_reduce(&(tinfo->aspect_n), &(tinfo->aspect_d), title->width * title->pixel_aspect_width, title->height * title->pixel_aspect_height); diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h index 4ca04f07b..ff31e90a3 100644 --- a/gtk/src/hb-backend.h +++ b/gtk/src/hb-backend.h @@ -73,6 +73,7 @@ typedef struct gint num_chapters; gint rate; gint rate_base; + gint interlaced; gint aspect_n; gint aspect_d; gint hours; -- cgit v1.2.3