From 113493ed5cc207301b0bd474707ffcf26769a356 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Tue, 25 Feb 2014 06:27:44 +0000 Subject: LinGui: UI layout changes Make some things fit a little better and make room for additional auto passthru options. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6082 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/audiohandler.c | 6 +- gtk/src/ghb.ui | 364 +++++++++++++++++++++++----------------------- gtk/src/main.c | 5 +- gtk/src/subtitlehandler.c | 6 +- 4 files changed, 189 insertions(+), 192 deletions(-) (limited to 'gtk') diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index 456458e29..9fb63a7fa 100644 --- a/gtk/src/audiohandler.c +++ b/gtk/src/audiohandler.c @@ -803,7 +803,7 @@ audio_refresh_list_row_ui( s_track_name = ghb_settings_get_string(settings, "AudioTrackName"); - info_src = g_strdup_printf("%d - %s (%.4gkHz)", + info_src = g_strdup_printf("%d - %s (%.4gkHz)", track + 1, s_track, (double)aconfig->in.samplerate / 1000); if (aconfig->in.bitrate > 0) { @@ -814,11 +814,11 @@ audio_refresh_list_row_ui( if (ghb_audio_is_passthru(encoder->codec)) { - info_dst = g_strdup_printf("Passthrough"); + info_dst = g_strdup_printf("Passthrough"); } else { - info_dst = g_strdup_printf("%s (%s) (%s)", + info_dst = g_strdup_printf("%s (%s) (%s)", encoder->name, mix->name, s_sr); if (s_track_name && s_track_name[0]) { diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index b1aff07ae..d9dbc64a4 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -956,6 +956,7 @@ Here you can adjust cropping, resolution, aspect ratio, and filters. vertical True False + False vertical @@ -2267,36 +2268,6 @@ VFR is not compatible with some players. GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True @@ -2860,7 +2831,7 @@ Colon separated list of x264 options. True GTK_POLICY_NEVER GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 108 + 84 True @@ -2960,168 +2931,209 @@ Colon separated list of x264 options. 1 - - - False - True - 0 - - - - - True - False - 5 - 2 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - Auto Passthru Options: - - - 0 - 0 - 1 - 1 - - - - MP3 + + Use only first encoder for secondary audio True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable this if your playback device supports MP3. -This permits MP3 passthru to be selected when automatic passthru selection is enabled. + Only the primary audio track will be encoded with the full encoder list. + All other secondary audio output tracks will be encoded with first encoder only. 0 True True - + - 1 - 0 - 1 - 1 + 2 + + + False + True + 0 + + + + + True + False + vertical + 6 + 2 - - AAC + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable this if your playback device supports AAC. + False + 5 + 2 + end + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Auto Passthru: + + + 0 + 0 + 1 + 1 + + + + + MP3 + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable this if your playback device supports MP3. +This permits MP3 passthru to be selected when automatic passthru selection is enabled. + start + True + True + + + + 1 + 0 + 1 + 1 + + + + + AAC + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled. - 0 - True - True - - - - 1 - 1 - 1 - 1 - - - - - AC-3 - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable this if your playback device supports AC-3. + start + True + True + + + + 2 + 0 + 1 + 1 + + + + + AC-3 + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable this if your playback device supports AC-3. This permits AC-3 passthru to be selected when automatic passthru selection is enabled. - 0 - True - True - - - - 1 - 2 - 1 - 1 - - - - - DTS - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable this if your playback device supports DTS. + start + True + True + + + + 1 + 1 + 1 + 1 + + + + + DTS + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selection is enabled. - 0 - True - True - - - - 1 - 3 - 1 - 1 - - - - - DTS-HD - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable this if your playback device supports DTS-HD. + start + True + True + + + + 1 + 2 + 1 + 1 + + + + + DTS-HD + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selection is enabled. - 0 - True - True - - - - 1 - 4 - 1 - 1 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - True - Passthru Fallback: + start + True + True + + + + 2 + 2 + 1 + 1 + + - 0 - 5 - 1 - 1 + True + 0 - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Set the audio codec to encode with when a suitable track can not be found for audio passthru. - + horizontal + 6 + end + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + True + Passthru Fallback: + + + True + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Set the audio codec to encode with when a suitable track can not be found for audio passthru. + + + + True + 1 + + - 1 - 5 - 1 - 1 + True + 1 @@ -3135,29 +3147,11 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is 0 - - - Use only first encoder for secondary audio - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Only the primary audio track will be encoded with the full encoder list. -All other secondary audio output tracks will be encoded with first encoder only. - 0 - True - True - - - - 1 - - True False - 12 + 6 0 True <b>Audio Encoder Settings:</b> diff --git a/gtk/src/main.c b/gtk/src/main.c index 6a778c003..8dd89e3ef 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -343,7 +343,7 @@ bind_audio_tree_model(signal_user_data_t *ud) gtk_tree_view_column_set_spacing(column, 12); gtk_tree_view_column_set_title(column, _("Track Information")); gtk_tree_view_column_pack_start(column, source_cell, FALSE); - gtk_tree_view_column_add_attribute(column, source_cell, "text", 0); + gtk_tree_view_column_add_attribute(column, source_cell, "markup", 0); gtk_tree_view_column_add_attribute(column, source_cell, "yalign", 5); gtk_tree_view_column_pack_start(column, arrow_cell, FALSE); gtk_tree_view_column_add_attribute(column, arrow_cell, "text", 1); @@ -352,6 +352,7 @@ bind_audio_tree_model(signal_user_data_t *ud) gtk_tree_view_column_add_attribute(column, output_cell, "yalign", 5); gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column)); gtk_tree_view_column_set_expand(column, TRUE); + gtk_tree_view_column_set_max_width(column, 400); column = gtk_tree_view_column_new_with_attributes( _(""), edit_cell, "icon-name", 3, NULL); @@ -407,7 +408,7 @@ bind_subtitle_tree_model(signal_user_data_t *ud) gtk_tree_view_column_set_spacing(column, 12); gtk_tree_view_column_set_title(column, _("Track Information")); gtk_tree_view_column_pack_start(column, source_cell, FALSE); - gtk_tree_view_column_add_attribute(column, source_cell, "text", 0); + gtk_tree_view_column_add_attribute(column, source_cell, "markup", 0); gtk_tree_view_column_add_attribute(column, source_cell, "yalign", 5); gtk_tree_view_column_pack_start(column, arrow_cell, FALSE); gtk_tree_view_column_add_attribute(column, arrow_cell, "text", 1); diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c index 4d7861acb..2e1318211 100644 --- a/gtk/src/subtitlehandler.c +++ b/gtk/src/subtitlehandler.c @@ -47,7 +47,8 @@ subtitle_refresh_list_row_ui( forced = ghb_settings_get_boolean(subsettings, "SubtitleForced"); burned = ghb_settings_get_boolean(subsettings, "SubtitleBurned"); def = ghb_settings_get_boolean(subsettings, "SubtitleDefaultTrack"); - info_src = ghb_settings_get_string(subsettings, "SubtitleTrackDescription"); + info_src = g_strdup_printf("%s", + ghb_settings_get_const_string(subsettings, "SubtitleTrackDescription")); if (ghb_settings_get_int(subsettings, "SubtitleSource") == SRTSUB) { gint offset; @@ -58,7 +59,7 @@ subtitle_refresh_list_row_ui( } } - GString *str = g_string_new(""); + GString *str = g_string_new(""); g_string_append_printf(str, "%s ", burned ? "Burned Into Video" : "Passthrough"); if (forced) @@ -69,6 +70,7 @@ subtitle_refresh_list_row_ui( { g_string_append_printf(str, "(Default)"); } + g_string_append_printf(str, ""); info_dst = g_string_free(str, FALSE); -- cgit v1.2.3