brasero r1520 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Tue Nov 11 21:29:53 2008
New Revision: 1520
URL: http://svn.gnome.org/viewvc/brasero?rev=1520&view=rev

Log:
	Make \"Please wait\" dialog appear in the task bar when started from nautilus

	* src/brasero-app.c (brasero_app_is_running):
	* src/brasero-app.h:
	* src/brasero-project.c (brasero_project_check_status):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-app.c
   trunk/src/brasero-app.h
   trunk/src/brasero-project.c

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Tue Nov 11 21:29:53 2008
@@ -243,6 +243,15 @@
 	gtk_widget_destroy (GTK_WIDGET (app));
 }
 
+gboolean
+brasero_app_is_running (BraseroApp *app)
+{
+	BraseroAppPrivate *priv;
+
+	priv = BRASERO_APP_PRIVATE (app);
+	return priv->is_running;
+}
+
 void
 brasero_app_run (BraseroApp *app, gboolean load_default_project)
 {

Modified: trunk/src/brasero-app.h
==============================================================================
--- trunk/src/brasero-app.h	(original)
+++ trunk/src/brasero-app.h	Tue Nov 11 21:29:53 2008
@@ -52,7 +52,11 @@
 brasero_app_new (void);
 
 void
-brasero_app_run (BraseroApp *app, gboolean load_default_project);
+brasero_app_run (BraseroApp *app,
+		 gboolean load_default_project);
+
+gboolean
+brasero_app_is_running (BraseroApp *app);
 
 void
 brasero_app_blank (BraseroApp *app,

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Tue Nov 11 21:29:53 2008
@@ -735,17 +735,36 @@
 	 * data or audio has not finished to explore a directory
 	 * or get the metadata of a song or a film */
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (project));
-	dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
-					 GTK_DIALOG_DESTROY_WITH_PARENT |
-					 GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_INFO,
-					 GTK_BUTTONS_CLOSE,
-					 _("Please wait."));
 
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("Some tasks are not completed yet."));
+	/* This dialog will run as a standalone window when run from nautilus
+	 * to burn burn:// URI contents. */
+	if (!brasero_app_is_running (BRASERO_APP (toplevel))) {
+		dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
+						 GTK_DIALOG_DESTROY_WITH_PARENT |
+						 GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_INFO,
+						 GTK_BUTTONS_CANCEL,
+						 _("Please, wait while initializing."));
+
+		gtk_window_set_skip_pager_hint (GTK_WINDOW (dialog), FALSE);
+		gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  _("Some tasks are not completed yet."));
+		gtk_window_set_title (GTK_WINDOW (dialog), _("Initializing"));
+	}
+	else {
+		dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
+						 GTK_DIALOG_DESTROY_WITH_PARENT |
+						 GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_INFO,
+						 GTK_BUTTONS_CLOSE,
+						 _("Please, wait."));
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Ongoing Tasks"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  _("Some tasks are not completed yet."));
+		gtk_window_set_title (GTK_WINDOW (dialog), _("Ongoing Tasks"));
+	}
 
 	progress = gtk_progress_bar_new ();
 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), " ");
@@ -779,7 +798,6 @@
 }
 
 /******************************** cover ****************************************/
-
 void
 brasero_project_set_cover_specifics (BraseroProject *self,
 				     BraseroJacketEdit *cover)