diff options
| -rw-r--r-- | gtk/src/callbacks.c | 7 | ||||
| -rw-r--r-- | gtk/src/ghb.ui | 2 | ||||
| -rw-r--r-- | gtk/src/queuehandler.c | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 2eddda904..4d14b12a6 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -2180,11 +2180,14 @@ working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status) gboolean subtitle_scan = FALSE; qcount = ghb_array_len(ud->queue); + index = find_queue_job(ud->queue, status->unique_id, &js); + if (js != NULL) + { + subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan"); + } if (qcount > 1) { - index = find_queue_job(ud->queue, status->unique_id, &js); job_str = g_strdup_printf("job %d of %d, ", index+1, qcount); - subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan"); } else { diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index 420102674..1376541a6 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -2216,7 +2216,7 @@ audio-volume-medium</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 new audio settings to the list</property> <property name="relief">GTK_RELIEF_NONE</property> - <property name="label">External SRT</property> + <property name="label">Import SRT</property> <property name="image">srt_add_image</property> <signal handler="srt_add_clicked_cb" name="clicked"/> </object> diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index f3640a9e7..c019f2125 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -1046,12 +1046,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) gtk_widget_set_sensitive (widget, TRUE); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Stop"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Stop Encoding"); } else { gtk_widget_set_sensitive (widget, show_start); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Start"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Start Encoding"); } widget = GHB_WIDGET (ud->builder, "queue_start2"); if (show_stop) @@ -1059,12 +1061,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) gtk_widget_set_sensitive (widget, TRUE); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Stop"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Stop Encoding"); } else { gtk_widget_set_sensitive (widget, show_start); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Start"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Start Encoding"); } widget = GHB_WIDGET (ud->builder, "queue_pause1"); if (paused) @@ -1072,12 +1076,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) gtk_widget_set_sensitive (widget, show_stop); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Resume"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Resume Encoding"); } else { gtk_widget_set_sensitive (widget, show_stop); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-pause"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Pause"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Pause Encoding"); } widget = GHB_WIDGET (ud->builder, "queue_pause2"); if (paused) @@ -1085,12 +1091,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) gtk_widget_set_sensitive (widget, show_stop); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-play"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Resume"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Resume Encoding"); } else { gtk_widget_set_sensitive (widget, show_stop); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-pause"); gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Pause"); + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Pause Encoding"); } action = GHB_ACTION (ud->builder, "queue_start_menu"); @@ -1099,12 +1107,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) gtk_action_set_sensitive (action, TRUE); gtk_action_set_icon_name(action, "hb-stop"); gtk_action_set_label(action, "S_top Queue"); + gtk_action_set_tooltip(action, "Stop Encoding"); } else { gtk_action_set_sensitive (action, show_start); gtk_action_set_icon_name(action, "hb-play"); gtk_action_set_label(action, "_Start Queue"); + gtk_action_set_tooltip(action, "Start Encoding"); } action = GHB_ACTION (ud->builder, "queue_pause_menu"); if (paused) @@ -1112,12 +1122,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) gtk_action_set_sensitive (action, show_start); gtk_action_set_icon_name(action, "hb-play"); gtk_action_set_label(action, "_Resume Queue"); + gtk_action_set_tooltip(action, "Resume Encoding"); } else { gtk_action_set_sensitive (action, show_stop); gtk_action_set_icon_name(action, "hb-pause"); gtk_action_set_label(action, "_Pause Queue"); + gtk_action_set_tooltip(action, "Pause Encoding"); } } |