X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fqueuehandler.c;h=8aca1f62695248288b33e041c1b2ac6c7274870a;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=d32cbcf2fb2409dc56ddbfabf791ee02c21a5bd1;hpb=3548036ec5601f2a5033ca7e256ec4fe088482b8;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index d32cbcf2..8aca1f62 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -737,6 +737,7 @@ queue_add(signal_user_data_t *ud)
 	ghb_array_append(ud->queue, settings);
 	add_to_queue_list(ud, settings, NULL);
 	ghb_save_queue(ud->queue);
+	ghb_update_pending(ud);
 
 	return TRUE;
 }
@@ -782,7 +783,7 @@ queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
 		if (status == GHB_QUEUE_RUNNING)
 		{
 			// Ask if wants to stop encode.
-			if (!ghb_cancel_encode(NULL))
+			if (!ghb_cancel_encode2(ud, NULL))
 			{
 				return;
 			}
@@ -801,6 +802,7 @@ queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
 	{	
 		gtk_tree_path_free (treepath);
 	}
+	ghb_update_pending(ud);
 }
 
 static gint
@@ -1015,34 +1017,156 @@ queue_drag_cb(
 }
 
 void
-ghb_queue_buttons_grey(signal_user_data_t *ud, gboolean working)
+ghb_queue_buttons_grey(signal_user_data_t *ud)
 {
 	GtkWidget *widget;
 	GtkAction *action;
 	gint queue_count;
 	gint titleindex;
-	gboolean title_ok;
+	gint queue_state, scan_state;
+	gboolean show_start, show_stop, paused;
 
 	queue_count = ghb_array_len(ud->queue);
 	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	title_ok = (titleindex >= 0);
+
+	queue_state = ghb_get_queue_state();
+	scan_state = ghb_get_scan_state();
+
+	show_stop = queue_state & 
+				(GHB_STATE_WORKING | GHB_STATE_SCANNING | GHB_STATE_MUXING);
+	show_start = !(scan_state & GHB_STATE_SCANNING) && 
+					(titleindex >= 0 || queue_count > 0);
+
+
+	paused = queue_state & GHB_STATE_PAUSED;
 
 	widget = GHB_WIDGET (ud->builder, "queue_start1");
-	gtk_widget_set_sensitive (widget, !working && (title_ok || queue_count));
+	if (show_stop)
+	{
+		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");
-	gtk_widget_set_sensitive (widget, !working && (title_ok || queue_count));
-	action = GHB_ACTION (ud->builder, "queue_start_menu");
-	gtk_action_set_sensitive (action, !working && (title_ok || queue_count));
+	if (show_stop)
+	{
+		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");
-	gtk_widget_set_sensitive (widget, working);
+	if (paused)
+	{
+		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");
-	gtk_widget_set_sensitive (widget, working);
+	if (paused)
+	{
+		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");
+	if (show_stop)
+	{
+		gtk_action_set_sensitive (action, TRUE);
+#if GTK_CHECK_VERSION(2, 16, 0)
+		gtk_action_set_icon_name(action, "hb-stop");
+		gtk_action_set_label(action, "S_top Queue");
+		gtk_action_set_tooltip(action, "Stop Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+											ghb_string_value("hb-stop"));
+		g_object_set_property(G_OBJECT(action), "label",
+											ghb_string_value("S_top Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+											ghb_string_value("Stop Encoding"));
+#endif
+	}
+	else
+	{
+		gtk_action_set_sensitive (action, show_start);
+#if GTK_CHECK_VERSION(2, 16, 0)
+		gtk_action_set_icon_name(action, "hb-play");
+		gtk_action_set_label(action, "_Start Queue");
+		gtk_action_set_tooltip(action, "Start Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+											ghb_string_value("hb-play"));
+		g_object_set_property(G_OBJECT(action), "label",
+											ghb_string_value("_Start Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+											ghb_string_value("Start Encoding"));
+#endif
+	}
 	action = GHB_ACTION (ud->builder, "queue_pause_menu");
-	gtk_action_set_sensitive (action, working);
-	widget = GHB_WIDGET (ud->builder, "queue_stop");
-	gtk_widget_set_sensitive (widget, working);
-	action = GHB_ACTION (ud->builder, "queue_stop_menu");
-	gtk_action_set_sensitive (action, working);
+	if (paused)
+	{
+		gtk_action_set_sensitive (action, show_start);
+#if GTK_CHECK_VERSION(2, 16, 0)
+		gtk_action_set_icon_name(action, "hb-play");
+		gtk_action_set_label(action, "_Resume Queue");
+		gtk_action_set_tooltip(action, "Resume Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+										ghb_string_value("hb-play"));
+		g_object_set_property(G_OBJECT(action), "label",
+										ghb_string_value("_Resume Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+										ghb_string_value("Resume Encoding"));
+#endif
+	}
+	else
+	{
+		gtk_action_set_sensitive (action, show_stop);
+#if GTK_CHECK_VERSION(2, 16, 0)
+		gtk_action_set_icon_name(action, "hb-pause");
+		gtk_action_set_label(action, "_Pause Queue");
+		gtk_action_set_tooltip(action, "Pause Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+										ghb_string_value("hb-pause"));
+		g_object_set_property(G_OBJECT(action), "label",
+										ghb_string_value("_Pause Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+										ghb_string_value("Pause Encoding"));
+#endif
+	}
 }
 
 G_MODULE_EXPORT void
@@ -1069,6 +1193,14 @@ queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 	gint status;
 	gint state;
 
+	state = ghb_get_queue_state();
+	if (state & (GHB_STATE_WORKING | GHB_STATE_SCANNING | GHB_STATE_MUXING))
+	{
+		ghb_cancel_encode(ud, "You are currently encoding.  "
+								"What would you like to do?");
+		return;
+	}
+
 	count = ghb_array_len(ud->queue);
 	for (ii = 0; ii < count; ii++)
 	{
@@ -1088,7 +1220,6 @@ queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 		if (!queue_add(ud))
 			return;
 	}
-	state = ghb_get_queue_state();
 	if (state == GHB_STATE_IDLE)
 	{
 		// Add the first pending queue item and start
@@ -1097,13 +1228,6 @@ queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 }
 
 G_MODULE_EXPORT void
-queue_stop_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-	ud->cancel_encode = TRUE;
-	ghb_cancel_encode(NULL);
-}
-
-G_MODULE_EXPORT void
 queue_pause_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 	ghb_pause_queue();
@@ -1167,7 +1291,7 @@ ghb_reload_queue(signal_user_data_t *ud)
 				ghb_settings_set_int(settings, "job_status", GHB_QUEUE_PENDING);
 				add_to_queue_list(ud, settings, NULL);
 			}
-			ghb_queue_buttons_grey(ud, FALSE);
+			ghb_queue_buttons_grey(ud);
 		}
 		else
 		{
@@ -1221,7 +1345,7 @@ queue_key_press_cb(
 		if (status == GHB_QUEUE_RUNNING)
 		{
 			// Ask if wants to stop encode.
-			if (!ghb_cancel_encode(NULL))
+			if (!ghb_cancel_encode2(ud, NULL))
 			{
 				return TRUE;
 			}