summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/src/audiohandler.c6
-rw-r--r--gtk/src/ghb.ui364
-rw-r--r--gtk/src/main.c5
-rw-r--r--gtk/src/subtitlehandler.c6
4 files changed, 189 insertions, 192 deletions
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("<small>%d - %s (%.4gkHz)</small>",
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("<small>Passthrough</small>");
}
else
{
- info_dst = g_strdup_printf("%s (%s) (%s)",
+ info_dst = g_strdup_printf("<small>%s (%s) (%s)</small>",
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.</property>
<property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">False</property>
<child>
<object class="GtkBox" id="vbox15">
<property name="orientation">vertical</property>
@@ -2268,36 +2269,6 @@ VFR is not compatible with some players.</property>
<property name="column_spacing">5</property>
<property name="row_spacing">2</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkScale" id="VideoQualitySlider">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2860,7 +2831,7 @@ Colon separated list of x264 options.</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="min_content_height">108</property>
+ <property name="min_content_height">84</property>
<child>
<object class="GtkListBox" id="audio_avail_lang">
<property name="visible">True</property>
@@ -2960,168 +2931,209 @@ Colon separated list of x264 options.</property>
<property name="position">1</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="GtkGrid" id="grid4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkLabel" id="labela3">
- <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>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Auto Passthru Options:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
<child>
- <object class="GtkCheckButton" id="AudioAllowMP3Pass">
- <property name="label" translatable="yes">MP3</property>
+ <object class="GtkCheckButton" id="AudioSecondaryEncoderMode">
+ <property name="label" translatable="yes">Use only first encoder for secondary audio</property>
<property name="visible">True</property>
<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">Enable this if your playback device supports MP3.
-This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="tooltip_text" translatable="yes">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.</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ <signal name="toggled" handler="audio_def_widget_changed_cb" swapped="no"/>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</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="GtkBox" id="auto_pass_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_left">6</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkCheckButton" id="AudioAllowAACPass">
- <property name="label" translatable="yes">AAC</property>
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
- <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">Enable this if your playback device supports AAC.
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkLabel" id="labela3">
+ <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>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Auto Passthru:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowMP3Pass">
+ <property name="label" translatable="yes">MP3</property>
+ <property name="visible">True</property>
+ <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">Enable this if your playback device supports MP3.
+This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowAACPass">
+ <property name="label" translatable="yes">AAC</property>
+ <property name="visible">True</property>
+ <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">Enable this if your playback device supports AAC.
This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowAC3Pass">
- <property name="label" translatable="yes">AC-3</property>
- <property name="visible">True</property>
- <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">Enable this if your playback device supports AC-3.
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowAC3Pass">
+ <property name="label" translatable="yes">AC-3</property>
+ <property name="visible">True</property>
+ <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">Enable this if your playback device supports AC-3.
This permits AC-3 passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowDTSPass">
- <property name="label" translatable="yes">DTS</property>
- <property name="visible">True</property>
- <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">Enable this if your playback device supports DTS.
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowDTSPass">
+ <property name="label" translatable="yes">DTS</property>
+ <property name="visible">True</property>
+ <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">Enable this if your playback device supports DTS.
This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
- <property name="label" translatable="yes">DTS-HD</property>
- <property name="visible">True</property>
- <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">Enable this if your playback device supports DTS-HD.
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
+ <property name="label" translatable="yes">DTS-HD</property>
+ <property name="visible">True</property>
+ <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">Enable this if your playback device supports DTS-HD.
This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labela4">
- <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>
- <property name="xalign">1</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">Passthru Fallback:</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="AudioEncoderFallback">
+ <object class="GtkBox" id="auto_fallback_box">
<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>
- <property name="tooltip_text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property>
- <signal name="changed" handler="audio_fallback_widget_changed_cb" swapped="no"/>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkLabel" id="labela4">
+ <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>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Passthru Fallback:</property>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="AudioEncoderFallback">
+ <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>
+ <property name="tooltip_text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property>
+ <signal name="changed" handler="audio_fallback_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -3136,28 +3148,10 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="AudioSecondaryEncoderMode">
- <property name="label" translatable="yes">Use only first encoder for secondary audio</property>
- <property name="visible">True</property>
- <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">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.</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="audio_def_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="audio_def_settings_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">12</property>
+ <property name="margin_top">6</property>
<property name="xalign">0</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">&lt;b&gt;Audio Encoder Settings:&lt;/b&gt;</property>
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("<small>%s</small>",
+ 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("<small>");
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, "</small>");
info_dst = g_string_free(str, FALSE);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 20:35:45 +0000