brasero r1328 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Sep 29 19:59:56 2008
New Revision: 1328
URL: http://svn.gnome.org/viewvc/brasero?rev=1328&view=rev

Log:
	Improved size representation and strings in source and destination choosers

	* src/brasero-dest-selection.c
	(brasero_dest_selection_format_medium_string):
	* src/brasero-medium-selection.c
	(brasero_medium_selection_get_medium_string),
	(brasero_medium_selection_show_type),
	(brasero_medium_selection_medium_removed_cb):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-dest-selection.c
   trunk/src/brasero-medium-selection.c

Modified: trunk/src/brasero-dest-selection.c
==============================================================================
--- trunk/src/brasero-dest-selection.c	(original)
+++ trunk/src/brasero-dest-selection.c	Mon Sep 29 19:59:56 2008
@@ -333,7 +333,7 @@
 	gchar *size_string;
 	BraseroMedia media;
 	BraseroBurnFlag flags;
-	BraseroTrackDataType input;
+	BraseroTrackType input = { 0, };
 	BraseroDestSelectionPrivate *priv;
 
 	priv = BRASERO_DEST_SELECTION_PRIVATE (selection);
@@ -361,11 +361,24 @@
 	if (!priv->session)
 		return NULL;
 
+	brasero_burn_session_get_input_type (priv->session, &input);
+	if (input.type == BRASERO_TRACK_TYPE_DISC) {
+		BraseroMedium *src_medium;
+
+		src_medium = brasero_burn_session_get_src_medium (priv->session);
+		if (src_medium == medium) {
+			label = g_strdup_printf (_("New disc in burner holding source medium"));
+			g_free (medium_name);
+			return label;
+		}
+	}
+
 	media = brasero_medium_get_status (medium);
 	flags = brasero_burn_session_get_flags (priv->session);
 
 	if ((media & BRASERO_MEDIUM_BLANK)
-	||  (flags & BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE)) {
+	|| ((flags & BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE)
+	&&  brasero_burn_caps_can_blank (priv->caps, priv->session) == BRASERO_BURN_OK)) {
 		brasero_medium_get_capacity (medium,
 					     &size,
 					     NULL);
@@ -388,11 +401,12 @@
 	}
 
 	/* format the size */
-	input = brasero_burn_session_get_input_type (priv->session, NULL);
-	if (input == BRASERO_TRACK_TYPE_AUDIO)
-		size_string = brasero_utils_get_size_string (size,
-							     TRUE,
-							     TRUE);
+	if (input.type == BRASERO_TRACK_TYPE_AUDIO
+	|| (input.type == BRASERO_TRACK_TYPE_DISC
+	&& (input.subtype.media & BRASERO_MEDIUM_HAS_AUDIO)))
+		size_string = brasero_utils_get_time_string_from_size (size,
+								       TRUE,
+								       TRUE);
 	else
 		size_string = g_format_size_for_display (size);
 

Modified: trunk/src/brasero-medium-selection.c
==============================================================================
--- trunk/src/brasero-medium-selection.c	(original)
+++ trunk/src/brasero-medium-selection.c	Mon Sep 29 19:59:56 2008
@@ -98,9 +98,9 @@
 	if (media & BRASERO_MEDIUM_HAS_DATA)
 		size_string = g_format_size_for_display (size);
 	else
-		size_string = brasero_utils_get_size_string (size,
-							     TRUE,
-							     TRUE);
+		size_string = brasero_utils_get_time_string_from_size (size,
+								       TRUE,
+								       TRUE);
 
 	/* NOTE for translators: the first %s is the medium name, the second %s
 	 * is the space used by data on the disc. */
@@ -325,7 +325,7 @@
 		/* Nothing's available =(. Say it. */
 		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				    NAME_COL, _("There is no available medium. Please insert one."),
+				    NAME_COL, _("No available medium"),
 				    -1),
 
 		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), &iter);
@@ -437,7 +437,7 @@
 		/* Nothing's available any more =(. Say it. */
 		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				    NAME_COL, _("There is no available medium. Please insert one."),
+				    NAME_COL, _("No available medium"),
 				    -1),
 
 		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), &iter);