Skip to content

Commit

Permalink
LinGui: don't hide foreign audio subtitle options
Browse files Browse the repository at this point in the history 
Make the insensitive when there is not preferred language set.  And
improve the tooltip to indicate that a preferred language is required
for these options.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7396 b64f7644-9d1e-0410-96f1-a4d463321fa5
  • Loading branch information
@jstebbins
jstebbins committed Aug 6, 2015
1 parent 8bea390 commit ac9f0b5
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 13 deletions.
8 changes: 6 additions & 2 deletions gtk/src/ghb-3.12.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4848,7 +4848,9 @@ for determining subtitle selection settings when there is foreign audio.</proper
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Add "Foreign Audio Search" when the default audio track is your preferred language.
This search pass finds short sequences of foreign audio and provides subtitles for them.</property>
This search pass finds short sequences of foreign audio and provides subtitles for them.

This option requires a language to be set in the Selected Languages list.</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
Expand All @@ -4865,7 +4867,9 @@ This search pass finds short sequences of foreign audio and provides subtitles f
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.</property>
<property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.

This option requires a language to be set in the Selected Languages list.</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
Expand Down
8 changes: 6 additions & 2 deletions gtk/src/ghb-3.14.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4849,7 +4849,9 @@ for determining subtitle selection settings when there is foreign audio.</proper
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Add "Foreign Audio Search" when the default audio track is your preferred language.
This search pass finds short sequences of foreign audio and provides subtitles for them.</property>
This search pass finds short sequences of foreign audio and provides subtitles for them.

This option requires a language to be set in the Selected Languages list.</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
Expand All @@ -4866,7 +4868,9 @@ This search pass finds short sequences of foreign audio and provides subtitles f
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.</property>
<property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.

This option requires a language to be set in the Selected Languages list.</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
Expand Down
8 changes: 6 additions & 2 deletions gtk/src/ghb.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4848,7 +4848,9 @@ for determining subtitle selection settings when there is foreign audio.</proper
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Add "Foreign Audio Search" when the default audio track is your preferred language.
This search pass finds short sequences of foreign audio and provides subtitles for them.</property>
This search pass finds short sequences of foreign audio and provides subtitles for them.

This option requires a language to be set in the Selected Languages list.</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
Expand All @@ -4865,7 +4867,9 @@ This search pass finds short sequences of foreign audio and provides subtitles f
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.</property>
<property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.

This option requires a language to be set in the Selected Languages list.</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
Expand Down
22 changes: 15 additions & 7 deletions gtk/src/subtitlehandler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1273,20 +1273,28 @@ subtitle_update_pref_lang(signal_user_data_t *ud, const iso639_lang_t *lang)

ghb_dict_set_string(ud->settings, "PreferredLanguage", code);

// If there is no preferred language, disable options that require
// a preferred language to be set.
gboolean sensitive = !(lang == NULL || !strncmp(code, "und", 4));
button = GTK_BUTTON(GHB_WIDGET(ud->builder,
"SubtitleAddForeignAudioSubtitle"));
str = g_strdup_printf(_("Add %s subtitle track if default audio is not %s"),
name, name);
if (sensitive)
{
str = g_strdup_printf(
_("Add %s subtitle track if default audio is not %s"), name, name);
}
else
{
str = g_strdup_printf(
_("Add subtitle track if default audio is not your preferred language"));
}
gtk_button_set_label(button, str);
g_free(str);

// If there is no preferred language, hide options that require
// a preferred language to be set.
gboolean visible = !(lang == NULL || !strncmp(code, "und", 4));
gtk_widget_set_visible(GTK_WIDGET(button), visible);
gtk_widget_set_sensitive(GTK_WIDGET(button), sensitive);
button = GTK_BUTTON(GHB_WIDGET(ud->builder,
"SubtitleAddForeignAudioSearch"));
gtk_widget_set_visible(GTK_WIDGET(button), visible);
gtk_widget_set_sensitive(GTK_WIDGET(button), sensitive);
}

void
Expand Down

0 comments on commit ac9f0b5

Please sign in to comment.