X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fsrc%2Fqueuehandler.c;h=aed2b07909f5922d683c1173cbdca8f056d75d55;hb=546645566708444b0da1942315c42f77d07d6d7f;hp=2039b5e6e720c105f47e582cd60f1ce5b33627bc;hpb=797ac8aa559be7298c602d7842825de9c1015ddb;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 2039b5e6..aed2b079 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -23,7 +23,7 @@
 #include "presets.h"
 #include "ghb-dvd.h"
 
-void
+G_MODULE_EXPORT void
 queue_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
 {
 	GtkTreeModel *store;
@@ -72,7 +72,8 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 	gchar *fps, *vcodec_abbr;
 	gint title, start_chapter, end_chapter, width, height;
 	gint source_width, source_height;
-	gboolean pass2, anamorphic, round_dim, keep_aspect, vqtype, turbo;
+	gboolean pass2, keep_aspect, vqtype, turbo;
+	gint pic_par;
 	gboolean tweaks;
 	gchar *escape;
 	
@@ -186,23 +187,13 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 
 	width = ghb_settings_get_int(settings, "scale_width");
 	height = ghb_settings_get_int(settings, "scale_height");
-	anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
-	round_dim = ghb_settings_get_boolean(settings, "ModDimensions");
+	pic_par = ghb_settings_combo_int(settings, "PicturePAR");
 	keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
 
 	gchar *aspect_desc;
-	if (anamorphic)
+	switch (pic_par)
 	{
-		if (round_dim)
-		{
-			aspect_desc = "(Anamorphic)";
-		}
-		else
-		{
-			aspect_desc = "(Strict Anamorphic)";
-		}
-	}
-	else
+	case 0:
 	{
 		if (keep_aspect)
 		{
@@ -212,6 +203,27 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		{
 			aspect_desc = "(Aspect Lost)";
 		}
+	} break;
+
+	case 1:
+	{
+		aspect_desc = "(Strict Anamorphic)";
+	} break;
+
+	case 2:
+	{
+		aspect_desc = "(Loose Anamorphic)";
+	} break;
+
+	case 3:
+	{
+		aspect_desc = "(Custom Anamorphic)";
+	} break;
+
+	default:
+	{
+		aspect_desc = "(Unknown)";
+	} break;
 	}
 	vqtype = ghb_settings_get_boolean(settings, "vquality_type_constant");
 
@@ -640,6 +652,12 @@ queue_add(signal_user_data_t *ud)
 	{
 		return FALSE;
 	}
+
+	GtkStatusIcon *si;
+
+	si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+	gtk_status_icon_set_from_icon_name(si, "hb-status");
+
 	if (ud->queue == NULL)
 		ud->queue = ghb_array_value_new(32);
 	// Make a copy of current settings to be used for the new job
@@ -656,14 +674,14 @@ queue_add(signal_user_data_t *ud)
 	return TRUE;
 }
 
-void
+G_MODULE_EXPORT void
 queue_add_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	g_debug("queue_add_clicked_cb ()");
 	queue_add(ud);
 }
 
-void
+G_MODULE_EXPORT void
 queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
 {
 	GtkTreeView *treeview;
@@ -743,7 +761,7 @@ find_last_finished(GValue *queue)
 // handler from expanding rows if you hover over them while
 // dragging.
 // Also controls where valid drop locations are
-gboolean
+G_MODULE_EXPORT gboolean
 queue_drag_motion_cb(
 	GtkTreeView *tv,
 	GdkDragContext *ctx,
@@ -821,7 +839,7 @@ queue_drag_motion_cb(
 	return TRUE;
 }
 
-void 
+G_MODULE_EXPORT void 
 queue_drag_cb(
 	GtkTreeView *dstwidget, 
 	GdkDragContext *dc, 
@@ -955,7 +973,7 @@ ghb_queue_buttons_grey(signal_user_data_t *ud, gboolean working)
 	gtk_action_set_sensitive (action, working);
 }
 
-void
+G_MODULE_EXPORT void
 queue_list_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, GtkCellRenderer *cell)
 {
 	GtkTreeViewColumn *column;
@@ -970,7 +988,7 @@ queue_list_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, GtkCel
 		g_object_set(cell, "wrap-width", width-70, NULL);
 }
 
-void
+G_MODULE_EXPORT void
 queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 	GValue *js;
@@ -1006,14 +1024,14 @@ queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 	}
 }
 
-void
+G_MODULE_EXPORT void
 queue_stop_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 	ud->cancel_encode = TRUE;
 	ghb_cancel_encode(NULL);
 }
 
-void
+G_MODULE_EXPORT void
 queue_pause_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 	ghb_pause_queue();
@@ -1089,7 +1107,7 @@ ghb_reload_queue(signal_user_data_t *ud)
 	return FALSE;
 }
 
-gboolean 
+G_MODULE_EXPORT gboolean 
 queue_key_press_cb(
 	GtkWidget *widget, 
 	GdkEventKey *event,
@@ -1152,7 +1170,7 @@ queue_key_press_cb(
 
 GValue *ghb_queue_edit_settings = NULL;
 
-void
+G_MODULE_EXPORT void
 queue_edit_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 	GtkTreeView *treeview;