[brasero] Remove joliet option from the burn option dialog (except for nautilus extension) and ask the user in
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Subject: [brasero] Remove joliet option from the burn option dialog (except for nautilus extension) and ask the user in
- Date: Sun, 21 Jun 2009 17:07:02 -0400 (EDT)
commit 4a56cfe04c7eb141872521a1af47f930435accbd
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Tue Jun 2 20:01:56 2009 +0200
Remove joliet option from the burn option dialog (except for nautilus extension) and ask the user in the data project if he wants joliet or not
nautilus/nautilus-burn-extension.c | 15 +++------
src/brasero-data-disc.c | 61 +++++++++++++++++++++++------------
2 files changed, 45 insertions(+), 31 deletions(-)
---
diff --git a/nautilus/nautilus-burn-extension.c b/nautilus/nautilus-burn-extension.c
index 3d14f64..12f1593 100644
--- a/nautilus/nautilus-burn-extension.c
+++ b/nautilus/nautilus-burn-extension.c
@@ -211,12 +211,6 @@ write_activate (GtkWindow *toplevel)
track = brasero_track_data_cfg_new ();
brasero_track_data_cfg_add (track, BURN_URI, NULL);
- session = brasero_session_cfg_new ();
- brasero_burn_session_add_track (BRASERO_BURN_SESSION (session),
- BRASERO_TRACK (track));
- g_object_unref (track);
-
- /* Add option widget */
box = gtk_vbox_new (FALSE, 6);
gtk_widget_show (box);
@@ -234,14 +228,15 @@ write_activate (GtkWindow *toplevel)
gtk_box_pack_start (GTK_BOX (box), options, FALSE, TRUE, 0);
/* create the options box */
- options = brasero_data_options_new (BRASERO_BURN_SESSION (session));
+ options = brasero_data_options_new (BRASERO_BURN_SESSION (priv->session));
gtk_widget_show (options);
+ brasero_burn_options_add_options (self, options);
gtk_box_pack_start (GTK_BOX (box), options, FALSE, TRUE, 0);
/* NOTE: set the disc we're handling */
- launch_brasero_on_window_session (session, options, toplevel);
- g_object_unref (session);
-
+ launch_brasero_on_window_track (BRASERO_TRACK (track),
+ box,
+ toplevel);
/* cleanup */
g_object_unref (session);
}
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 2d74f61..c89c149 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -819,39 +819,58 @@ brasero_data_disc_unknown_uri_cb (BraseroTrackDataCfg *vfs,
}
static void
+brasero_data_disc_use_joliet_response_cb (BraseroDiscMessage *message,
+ GtkResponseType response,
+ BraseroDataDisc *self)
+{
+ BraseroDataDiscPrivate *priv;
+
+ priv = BRASERO_DATA_DISC_PRIVATE (self);
+ if (response == GTK_RESPONSE_YES)
+ brasero_track_data_add_fs (BRASERO_TRACK_DATA (priv->project),
+ BRASERO_IMAGE_FS_JOLIET);
+ else
+ brasero_track_data_rm_fs (BRASERO_TRACK_DATA (priv->project),
+ BRASERO_IMAGE_FS_JOLIET);
+}
+
+static void
brasero_data_disc_joliet_rename_cb (BraseroTrackDataCfg *project,
BraseroDataDisc *self)
{
BraseroDataDiscPrivate *priv;
- GtkWidget *dialog;
+ GtkWidget *message;
gchar *secondary;
- gint answer;
priv = BRASERO_DATA_DISC_PRIVATE (self);
-
- dialog = brasero_app_dialog (brasero_app_get_default (),
- _("Should files be renamed to be fully Windows-compatible?"),
- GTK_BUTTONS_NONE,
- GTK_MESSAGE_WARNING);
secondary = g_strdup_printf ("%s\n%s",
_("Some files don't have a suitable name for a fully Windows-compatible CD."),
_("Those names should be changed and truncated to 64 characters."));
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary);
+ message = brasero_notify_message_add (BRASERO_NOTIFY (priv->message),
+ _("Should files be renamed to be fully Windows-compatible?"),
+ secondary,
+ -1,
+ BRASERO_NOTIFY_CONTEXT_SIZE);
g_free (secondary);
- gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Rename for Full Windows Compatibility"), GTK_RESPONSE_YES);
- gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Disable Full Windows Compatibility"), GTK_RESPONSE_CANCEL);
+ brasero_disc_message_set_image (BRASERO_DISC_MESSAGE (message),
+ GTK_STOCK_DIALOG_WARNING);
- gtk_widget_show_all (dialog);
- answer = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
+ BRASERO_DISC_MESSAGE (message),
+ _("_Rename for Full Windows Compatibility"),
+ NULL,
+ GTK_RESPONSE_YES);
+ brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
+ BRASERO_DISC_MESSAGE (message),
+ _("_Disable Full Windows Compatibility"),
+ NULL,
+ GTK_RESPONSE_CANCEL);
- if (answer == GTK_RESPONSE_YES)
- brasero_track_data_add_fs (BRASERO_TRACK_DATA (priv->project),
- BRASERO_IMAGE_FS_JOLIET);
- else
- brasero_track_data_rm_fs (BRASERO_TRACK_DATA (priv->project),
- BRASERO_IMAGE_FS_JOLIET);
+ g_signal_connect (BRASERO_DISC_MESSAGE (message),
+ "response",
+ G_CALLBACK (brasero_data_disc_use_joliet_response_cb),
+ self);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]