GNOME.org
 

brasero r714 - in trunk: . src

Author: philippr
Date: Mon Apr 14 15:12:26 2008
New Revision: 714
URL: http://svn.gnome.org/viewvc/brasero?rev=714&view=rev

Log:
	Integrate the cover editor a bit further by filling it automatically when it is called
	while an audio project is opened or after a successful burn.

	* src/brasero-burn-dialog.c (brasero_burn_dialog_success_run),
	(brasero_burn_dialog_notify_success):
	* src/brasero-jacket-buffer.c (brasero_jacket_buffer_insert_text),
	(brasero_jacket_buffer_show_default_text):
	* src/brasero-jacket-edit.c (brasero_jacket_edit_print_page),
	(brasero_jacket_edit_set_audio_tracks),
	(brasero_jacket_edit_dialog_new):
	* src/brasero-jacket-edit.h:
	* src/brasero-jacket-view.c (brasero_jacket_view_get_body_buffer),
	(brasero_jacket_view_get_side_buffer):
	* src/brasero-jacket-view.h:
	* src/brasero-menu.h:
	* src/brasero-project-manager.c
	(brasero_project_manager_new_cover_cb):
	* src/brasero-project-manager.h:
	* src/brasero-project.c (brasero_project_set_cover_specifics),
	(brasero_project_switch), (brasero_project_set_none),
	(brasero_project_empty_cb):
	* src/brasero-project.h:
	* src/main.c:

Modified:
   trunk/ChangeLog
   trunk/src/brasero-burn-dialog.c
   trunk/src/brasero-jacket-buffer.c
   trunk/src/brasero-jacket-edit.c
   trunk/src/brasero-jacket-edit.h
   trunk/src/brasero-jacket-view.c
   trunk/src/brasero-jacket-view.h
   trunk/src/brasero-menu.h
   trunk/src/brasero-project-manager.c
   trunk/src/brasero-project-manager.h
   trunk/src/brasero-project.c
   trunk/src/brasero-project.h
   trunk/src/main.c

Modified: trunk/src/brasero-burn-dialog.c
==============================================================================
--- trunk/src/brasero-burn-dialog.c	(original)
+++ trunk/src/brasero-burn-dialog.c	Mon Apr 14 15:12:26 2008
@@ -49,6 +49,8 @@
 #include "brasero-disc.h"
 #include "brasero-tray.h"
 #include "brasero-burn-dialog.h"
+#include "brasero-jacket-edit.h"
+
 #include "burn-basics.h"
 #include "burn-session.h"
 #include "burn-medium.h"
@@ -1597,6 +1599,21 @@
 		g_source_remove (dialog->priv->close_timeout);
 		dialog->priv->close_timeout = 0;
 	}
+
+	if (answer == GTK_RESPONSE_CLOSE) {
+		GtkWidget *contents;
+		GtkWidget *window;
+		const gchar *title;
+		GSList *tracks;
+
+		contents = brasero_jacket_edit_dialog_new (GTK_WIDGET (dialog), &window);
+
+		title = brasero_burn_session_get_label (dialog->priv->session);
+		tracks = brasero_burn_session_get_tracks (dialog->priv->session);
+		brasero_jacket_edit_set_audio_tracks (BRASERO_JACKET_EDIT (contents), title, tracks);
+
+		gtk_dialog_run (GTK_DIALOG (window));
+	}
 }
 
 static void
@@ -1651,6 +1668,19 @@
 	}
 
 	brasero_burn_dialog_activity_stop (dialog, primary);
+
+	if (brasero_burn_session_get_input_type (dialog->priv->session, NULL) == BRASERO_TRACK_TYPE_AUDIO) {
+		GtkWidget *button;
+
+		/* since we succeed offer the possibility to create cover if that's an audio disc */
+		button = brasero_utils_make_button (_("Create cover"),
+						    NULL,
+						    NULL,
+						    GTK_ICON_SIZE_BUTTON);
+		gtk_widget_show (button);
+		gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CLOSE);
+	}
+
 	brasero_burn_dialog_success_run (dialog);
 
 	g_free (primary);

Modified: trunk/src/brasero-jacket-buffer.c
==============================================================================
--- trunk/src/brasero-jacket-buffer.c	(original)
+++ trunk/src/brasero-jacket-buffer.c	Mon Apr 14 15:12:26 2008
@@ -113,6 +113,11 @@
 	start_offset = gtk_text_iter_get_offset (location);
 	priv->inserting_text = TRUE;
 
+	brasero_jacket_buffer_show_default_text (BRASERO_JACKET_BUFFER (buffer), FALSE);
+
+	/* revalidate iter in case above function caused invalidation */
+	gtk_text_buffer_get_iter_at_offset (buffer, location, start_offset);
+
 	GTK_TEXT_BUFFER_CLASS (brasero_jacket_buffer_parent_class)->insert_text (buffer, location, text, length);
 
 	priv->inserting_text = FALSE;
@@ -156,9 +161,9 @@
 	else if (priv->empty) {
 		gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (self), &start);
 		gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (self), &end);
+		gtk_text_buffer_delete (GTK_TEXT_BUFFER (self), &start, &end);
 		gtk_text_buffer_remove_all_tags (GTK_TEXT_BUFFER (self), &start, &end);
 
-		gtk_text_buffer_set_text (GTK_TEXT_BUFFER (self), "", -1);
 		priv->empty = 0;
 	}
 }

Modified: trunk/src/brasero-jacket-edit.c
==============================================================================
--- trunk/src/brasero-jacket-edit.c	(original)
+++ trunk/src/brasero-jacket-edit.c	Mon Apr 14 15:12:26 2008
@@ -35,6 +35,9 @@
 #include "brasero-jacket-buffer.h"
 #include "brasero-jacket-view.h"
 #include "brasero-jacket-font.h"
+#include "brasero-utils.h"
+
+#include "burn-track.h"
 
 typedef struct _BraseroJacketEditPrivate BraseroJacketEditPrivate;
 struct _BraseroJacketEditPrivate
@@ -75,51 +78,10 @@
 				BraseroJacketEdit *self)
 {
 	BraseroJacketEditPrivate *priv;
-/*	cairo_surface_t *surface;
-	guint height, width;
-	cairo_t *ctx;*/
 	guint y;
 
 	priv = BRASERO_JACKET_EDIT_PRIVATE (self);
 
-/*	ctx = gtk_print_context_get_cairo_context (context); */
-
-	/* front */
-/*	surface = brasero_jacket_view_snapshot (BRASERO_JACKET_VIEW (priv->front),
-						gtk_print_context_get_dpi_x (context));
-
-	width = cairo_image_surface_get_width (surface);
-	height = cairo_image_surface_get_height (surface);
-	cairo_rectangle (ctx,
-			 0, 0,
-			 width, height);
-	cairo_clip (ctx);
-
-	cairo_set_source_surface (ctx, surface, 0, 0);
-	cairo_paint (ctx);
-
-	cairo_surface_destroy (surface);*/
-
-	/* back */
-/*	surface = brasero_jacket_view_snapshot (BRASERO_JACKET_VIEW (priv->back),
-						gtk_print_context_get_dpi_x (context));
-
-	y = height + 20;
-
-	cairo_reset_clip (ctx);
-	width = cairo_image_surface_get_width (surface);
-	height = cairo_image_surface_get_height (surface);
-	cairo_rectangle (ctx,
-			 0, y,
-			 width, height);
-	cairo_clip (ctx);
-
-	cairo_set_source_surface (ctx, surface, 0, y);
-	cairo_paint (ctx);
-
-	cairo_surface_destroy (surface);
-
-	*/
 	y = brasero_jacket_view_print (BRASERO_JACKET_VIEW (priv->front), context, 0, 0);
 	brasero_jacket_view_print (BRASERO_JACKET_VIEW (priv->back), context, 0, y + 20);
 }
@@ -705,6 +667,134 @@
 	gtk_widget_grab_focus (priv->front);
 }
 
+#define BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT(buffer_MACRO, text_MACRO, tag_MACRO, start_MACRO)	\
+	gtk_text_buffer_insert_with_tags_by_name (buffer_MACRO, start_MACRO, text_MACRO, -1, tag_MACRO, NULL);
+
+void
+brasero_jacket_edit_set_audio_tracks (BraseroJacketEdit *self,
+				      const gchar *label,
+				      GSList *tracks)
+{
+	BraseroJacketEditPrivate *priv;
+	GtkTextBuffer *buffer;
+	GtkTextIter start;
+	GSList *iter;
+
+	priv = BRASERO_JACKET_EDIT_PRIVATE (self);
+
+	buffer = brasero_jacket_view_get_body_buffer (BRASERO_JACKET_VIEW (priv->front));
+
+	/* create the tags */
+	gtk_text_buffer_create_tag (buffer,
+				    "Title",
+				    "justification", GTK_JUSTIFY_CENTER,
+				    "weight", PANGO_WEIGHT_BOLD,
+				    "scale", PANGO_SCALE_X_LARGE,
+				    "stretch", PANGO_STRETCH_ULTRA_EXPANDED,
+				    NULL);
+
+	gtk_text_buffer_get_start_iter (buffer, &start);
+
+	if (label) {
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n\n\n", "Title", &start);
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
+	}
+
+	buffer = brasero_jacket_view_get_body_buffer (BRASERO_JACKET_VIEW (priv->back));
+
+	/* create the tags */
+	gtk_text_buffer_create_tag (buffer,
+				    "Title",
+				    "justification", GTK_JUSTIFY_CENTER,
+				    "weight", PANGO_WEIGHT_BOLD,
+				    "scale", PANGO_SCALE_LARGE,
+				    "stretch", PANGO_STRETCH_ULTRA_EXPANDED,
+				    NULL);
+	gtk_text_buffer_create_tag (buffer,
+				    "Subtitle",
+				    "justification", GTK_JUSTIFY_LEFT,
+				    "weight", PANGO_WEIGHT_NORMAL,
+				    NULL);
+	gtk_text_buffer_create_tag (buffer,
+				    "Artist",
+				    "weight", PANGO_WEIGHT_NORMAL,
+				    "justification", GTK_JUSTIFY_LEFT,
+				    "stretch", PANGO_STRETCH_NORMAL,
+				    "style", PANGO_STYLE_ITALIC,
+				    "scale", PANGO_SCALE_SMALL,
+				    NULL);
+
+	gtk_text_buffer_get_start_iter (buffer, &start);
+
+	if (label) {
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n", "Title", &start);
+	}
+
+	for (iter = tracks; iter; iter = iter->next) {
+		gchar *num;
+		gchar *time;
+		BraseroTrack *track;
+		BraseroSongInfo *info;
+
+		track = iter->data;
+		if (brasero_track_get_type (track, NULL) != BRASERO_TRACK_TYPE_AUDIO)
+			continue;
+
+		num = g_strdup_printf ("%i - ", g_slist_index (tracks, track) + 1);
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, num, "Subtitle", &start);
+		g_free (num);
+
+		info = brasero_track_get_audio_info (track);
+
+		if (info->title) {
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->title, "Subtitle", &start);
+		}
+		else {
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("Unknown song"), "Subtitle", &start);
+		}
+
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\t\t", "Subtitle", &start);
+
+		time = brasero_utils_get_time_string (brasero_track_get_audio_end (track) -
+						      brasero_track_get_audio_start (track),
+						      TRUE,
+						      FALSE);
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, time, "Subtitle", &start);
+		g_free (time);
+
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n", "Subtitle", &start);
+
+		if (info->artist) {
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("by "), "Artist", &start);
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->artist, "Artist", &start);
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
+		}
+
+		if (info->composer)
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->composer, "Subtitle", &start);
+
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n", "Subtitle", &start);
+	}
+
+	/* side */
+	buffer = brasero_jacket_view_get_side_buffer (BRASERO_JACKET_VIEW (priv->back));
+
+	/* create the tags */
+	gtk_text_buffer_create_tag (buffer,
+				    "Title",
+				    "justification", GTK_JUSTIFY_CENTER,
+				    "weight", PANGO_WEIGHT_BOLD,
+				    "stretch", PANGO_STRETCH_ULTRA_EXPANDED,
+				    NULL);
+
+	gtk_text_buffer_get_start_iter (buffer, &start);
+
+	if (label) {
+		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
+	}
+}
+
 static void
 brasero_jacket_edit_finalize (GObject *object)
 {
@@ -726,3 +816,38 @@
 {
 	return g_object_new (BRASERO_TYPE_JACKET_EDIT, NULL);
 }
+
+GtkWidget *
+brasero_jacket_edit_dialog_new (GtkWidget *toplevel,
+				GtkWidget **dialog)
+{
+	GtkWidget *window;
+	GtkWidget *contents;
+
+	window = gtk_dialog_new_with_buttons (_("Cover editor"),
+					      GTK_WINDOW (toplevel),
+					      GTK_DIALOG_MODAL|
+					      GTK_DIALOG_DESTROY_WITH_PARENT|
+					      GTK_DIALOG_NO_SEPARATOR,
+					      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+					      NULL);
+
+	gtk_window_set_default_size (GTK_WINDOW (window), 530, 640);
+	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER_ON_PARENT);
+	g_signal_connect (window,
+			  "response",
+			  G_CALLBACK (gtk_widget_destroy),
+			  NULL);
+
+	contents = brasero_jacket_edit_new ();
+	gtk_widget_show (contents);
+
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), contents, TRUE, TRUE, 0);
+	gtk_widget_show (window);
+
+	if (dialog)
+		*dialog = window;
+
+	return contents;
+}
+

Modified: trunk/src/brasero-jacket-edit.h
==============================================================================
--- trunk/src/brasero-jacket-edit.h	(original)
+++ trunk/src/brasero-jacket-edit.h	Mon Apr 14 15:12:26 2008
@@ -56,6 +56,15 @@
 GtkWidget *
 brasero_jacket_edit_new (void);
 
+GtkWidget *
+brasero_jacket_edit_dialog_new (GtkWidget *toplevel,
+				GtkWidget **dialog);
+
+void
+brasero_jacket_edit_set_audio_tracks (BraseroJacketEdit *self,
+				      const gchar *label,
+				      GSList *tracks);
+
 G_END_DECLS
 
 #endif /* _BRASERO_JACKET_EDIT_H_ */

Modified: trunk/src/brasero-jacket-view.c
==============================================================================
--- trunk/src/brasero-jacket-view.c	(original)
+++ trunk/src/brasero-jacket-view.c	Mon Apr 14 15:12:26 2008
@@ -1161,6 +1161,29 @@
 	return gtk_text_view_get_buffer (GTK_TEXT_VIEW (current));
 }
 
+GtkTextBuffer *
+brasero_jacket_view_get_body_buffer (BraseroJacketView *self)
+{
+	BraseroJacketViewPrivate *priv;
+
+	priv = BRASERO_JACKET_VIEW_PRIVATE (self);
+
+	return gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->edit));	
+}
+
+GtkTextBuffer *
+brasero_jacket_view_get_side_buffer (BraseroJacketView *self)
+{
+	BraseroJacketViewPrivate *priv;
+
+	priv = BRASERO_JACKET_VIEW_PRIVATE (self);
+
+	if (!priv->sides)
+		return NULL;
+
+	return gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->sides));
+}
+
 static gboolean
 brasero_jacket_view_expose (GtkWidget *widget,
 			    GdkEventExpose *event)

Modified: trunk/src/brasero-jacket-view.h
==============================================================================
--- trunk/src/brasero-jacket-view.h	(original)
+++ trunk/src/brasero-jacket-view.h	Mon Apr 14 15:12:26 2008
@@ -115,6 +115,12 @@
 GtkTextBuffer *
 brasero_jacket_view_get_active_buffer (BraseroJacketView *view);
 
+GtkTextBuffer *
+brasero_jacket_view_get_body_buffer (BraseroJacketView *view);
+
+GtkTextBuffer *
+brasero_jacket_view_get_side_buffer (BraseroJacketView *view);
+
 GtkTextAttributes *
 brasero_jacket_view_get_default_attributes (BraseroJacketView *view);
 

Modified: trunk/src/brasero-menu.h
==============================================================================
--- trunk/src/brasero-menu.h	(original)
+++ trunk/src/brasero-menu.h	Mon Apr 14 15:12:26 2008
@@ -41,7 +41,6 @@
 #include "brasero-utils.h"
 #include "brasero-app.h"
 
-void on_cover_cb (GtkAction *action, BraseroApp *app);
 void on_prefs_cb (GtkAction *action, BraseroApp *app);
 void on_eject_cb (GtkAction *action, BraseroApp *app);
 void on_erase_cb (GtkAction *action, BraseroApp *app);
@@ -60,9 +59,6 @@
 	{"ToolMenu", NULL, N_("_Tools")},
 	{"HelpMenu", NULL, N_("_Help")},
 
-	{"Cover", NULL, N_("_Cover editor"), NULL,
-	 N_("Design and print covers for CDs"), G_CALLBACK (on_cover_cb)},
-
 	{"Plugins", NULL, N_("P_lugins"), NULL,
 	 N_("Choose plugins for brasero"), G_CALLBACK (on_prefs_cb)},
 
@@ -108,8 +104,6 @@
 		"<menuitem action='Eject'/>"
 		"<menuitem action='Erase'/>"
 		"<menuitem action='Check'/>"
-		"<separator/>"
-		"<menuitem action='Cover'/>"
 	    "</menu>"
 	    "<menu action='HelpMenu'>"
 		"<menuitem action='About'/>"

Modified: trunk/src/brasero-project-manager.c
==============================================================================
--- trunk/src/brasero-project-manager.c	(original)
+++ trunk/src/brasero-project-manager.c	Mon Apr 14 15:12:26 2008
@@ -78,6 +78,8 @@
 					 BraseroProjectManager *manager);
 
 static void
+brasero_project_manager_new_cover_cb (GtkAction *action, BraseroProjectManager *manager);
+static void
 brasero_project_manager_new_empty_prj_cb (GtkAction *action, BraseroProjectManager *manager);
 static void
 brasero_project_manager_new_audio_prj_cb (GtkAction *action, BraseroProjectManager *manager);
@@ -103,7 +105,9 @@
 
 /* menus */
 static GtkActionEntry entries [] = {
-	{"New", GTK_STOCK_NEW, N_("_New Project"), NULL,
+	{"Cover", NULL, N_("_Cover editor"), NULL,
+	 N_("Design and print covers for CDs"), G_CALLBACK (brasero_project_manager_new_cover_cb)},
+	 {"New", GTK_STOCK_NEW, N_("_New Project"), NULL,
 	 N_("Create a new project"), NULL },
 	{"NewChoose", GTK_STOCK_NEW, N_("_Empty Project"), NULL,
 	 N_("Let you choose your new project"), G_CALLBACK (brasero_project_manager_new_empty_prj_cb)},
@@ -125,13 +129,12 @@
 	    "<menubar name='menubar' >"
 		"<menu action='ProjectMenu'>"
 			"<placeholder name='ProjectPlaceholder'>"
-				"<placeholder name='ViewPlaceholder'/>"
 				"<menu action='New'>"
 					"<menuitem action='NewAudio'/>"
 					"<menuitem action='NewData'/>"
 					"<menuitem action='NewCopy'/>"	
 					"<menuitem action='NewIso'/>"	
-			"</menu>"
+				"</menu>"
 			"</placeholder>"
 
 			"<placeholder name='ProjectPlaceholder'>"
@@ -140,6 +143,17 @@
 			    "<menuitem action='RecentProjects'/>"
 			    "<separator/>"
 			"</placeholder>"
+
+		"</menu>"
+
+		"<menu action='ToolMenu'>"
+
+			"<placeholder name='DiscPlaceholder'>"
+			    "<separator/>"
+			    "<menuitem action='Cover'/>"
+			    "<separator/>"
+			"</placeholder>"
+
 		"</menu>"
 	    "</menubar>"
 	"</ui>"
@@ -195,6 +209,21 @@
 }
 
 static void
+brasero_project_manager_new_cover_cb (GtkAction *action,
+				      BraseroProjectManager *manager)
+{
+	GtkWidget *toplevel;
+	GtkWidget *edit;
+
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (manager));
+	edit = brasero_jacket_edit_dialog_new (toplevel, NULL);
+
+	if (manager->priv->type == BRASERO_PROJECT_TYPE_AUDIO)
+		brasero_project_set_cover_specifics (BRASERO_PROJECT (manager->priv->project),
+						     BRASERO_JACKET_EDIT (edit));
+}
+
+static void
 brasero_project_manager_set_statusbar (BraseroProjectManager *manager,
 				       guint64 files_size,
 				       gint invalid_num,

Modified: trunk/src/brasero-project-manager.h
==============================================================================
--- trunk/src/brasero-project-manager.h	(original)
+++ trunk/src/brasero-project-manager.h	Mon Apr 14 15:12:26 2008
@@ -54,6 +54,7 @@
 GType brasero_project_manager_get_type ();
 GtkWidget *brasero_project_manager_new ();
 
+
 void
 brasero_project_manager_audio (BraseroProjectManager *manager, GSList *uris);
 void

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Mon Apr 14 15:12:26 2008
@@ -54,6 +54,7 @@
 #include "burn-debug.h"
 #include "burn-session.h"
 #include "brasero-project.h"
+#include "brasero-jacket-edit.h"
 #include "brasero-project-size.h"
 #include "brasero-project-type-chooser.h"
 #include "brasero-disc.h"
@@ -145,7 +146,6 @@
 	gchar *project;
 	gint64 sectors;
 	BraseroDisc *current;
-	BraseroBurnFlag flags;
 
 	BraseroURIContainer *current_source;
 
@@ -775,6 +775,26 @@
 	return brasero_disc_get_status (disc);
 }
 
+/******************************** cover ****************************************/
+
+void
+brasero_project_set_cover_specifics (BraseroProject *self,
+				     BraseroJacketEdit *cover)
+{
+	BraseroBurnSession *session;
+
+	if (!BRASERO_IS_AUDIO_DISC (self->priv->current))
+		return;
+
+	session = brasero_burn_session_new ();
+	brasero_disc_set_session_param (BRASERO_DISC (self->priv->current), session);
+	brasero_disc_set_session_contents (BRASERO_DISC (self->priv->current), session);
+	brasero_jacket_edit_set_audio_tracks (BRASERO_JACKET_EDIT (cover),
+					      brasero_burn_session_get_label (session),
+					      brasero_burn_session_get_tracks (session));
+	g_object_unref (session);
+}
+
 /******************************** burning **************************************/
 static void
 brasero_project_no_song_dialog (BraseroProject *project)
@@ -1029,7 +1049,6 @@
 	project->priv->empty = 1;
     	project->priv->burnt = 0;
 	project->priv->modified = 0;
-	project->priv->flags = BRASERO_BURN_FLAG_NONE;
 
 	brasero_project_size_set_sectors (BRASERO_PROJECT_SIZE (project->priv->size_display), 0);
 
@@ -1200,7 +1219,6 @@
 		brasero_disc_reset (project->priv->current);
 
 	project->priv->current = NULL;
-	project->priv->flags = BRASERO_BURN_FLAG_NONE;
 
 	/* update buttons/menus */
 	action = gtk_action_group_get_action (project->priv->project_group, "Add");
@@ -1487,7 +1505,6 @@
 	}
 
 	brasero_disc_reset (BRASERO_DISC (project->priv->current));
-	project->priv->flags = BRASERO_BURN_FLAG_NONE;
 }
 
 static void

Modified: trunk/src/brasero-project.h
==============================================================================
--- trunk/src/brasero-project.h	(original)
+++ trunk/src/brasero-project.h	Mon Apr 14 15:12:26 2008
@@ -35,6 +35,7 @@
 #include "brasero-disc.h"
 #include "brasero-uri-container.h"
 #include "brasero-project-type-chooser.h"
+#include "brasero-jacket-edit.h"
 
 G_BEGIN_DECLS
 
@@ -93,4 +94,8 @@
 brasero_project_register_ui (BraseroProject *project,
 			     GtkUIManager *manager);
 
+void
+brasero_project_set_cover_specifics (BraseroProject *project,
+				     BraseroJacketEdit *cover);
+
 #endif /* PROJECT_H */

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Mon Apr 14 15:12:26 2008
@@ -144,36 +144,6 @@
 	g_slist_free (list);							\
 }
 
-void
-on_cover_cb (GtkAction *action, BraseroApp *app)
-{
-	GtkWidget *window;
-	GtkWidget *toplevel;
-	GtkWidget *contents;
-
-	toplevel = gtk_widget_get_toplevel (app->mainwin);
-	window = gtk_dialog_new_with_buttons (_("Cover editor"),
-					      GTK_WINDOW (toplevel),
-					      GTK_DIALOG_MODAL|
-					      GTK_DIALOG_DESTROY_WITH_PARENT|
-					      GTK_DIALOG_NO_SEPARATOR,
-					      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-					      NULL);
-
-        gtk_window_set_default_size (GTK_WINDOW (window), 530, 640);
-	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER_ON_PARENT);
-        g_signal_connect (window,
-			  "response",
-			  G_CALLBACK (gtk_widget_destroy),
-			  NULL);
-
-        contents = brasero_jacket_edit_new ();
-        gtk_widget_show (contents);
-
-        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), contents, TRUE, TRUE, 0);
-        gtk_widget_show (window);
-}
-
 static gboolean
 on_delete_cb (GtkWidget *window, GdkEvent *event, BraseroApp *app)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]